Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / powermac / pic.c

diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 39db12890214e5e905cb69b01bc0c9a6c4bf1ad0..ae5097ac0378118855d2267caa3655acba306d40 100644 (file)
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -305,8 +305,6 @@ static int pmac_pic_host_map(struct irq_host *h, unsigned int virq,
        level = !!(level_mask[hw >> 5] & (1UL << (hw & 0x1f)));
        if (level)
                desc->status |= IRQ_LEVEL;
-       else
-               desc->status |= IRQ_DELAYED_DISABLE;
        set_irq_chip_and_handler(virq, &pmac_pic, level ?
                                 handle_level_irq : handle_edge_irq);
        return 0;
@@ -484,14 +482,14 @@ static struct mpic * __init pmac_setup_one_mpic(struct device_node *np,
        pmac_call_feature(PMAC_FTR_ENABLE_MPIC, np, 0, 0);
 
        flags |= MPIC_WANTS_RESET;
-       if (get_property(np, "big-endian", NULL))
+       if (of_get_property(np, "big-endian", NULL))
                flags |= MPIC_BIG_ENDIAN;
 
        /* Primary Big Endian means HT interrupts. This is quite dodgy
         * but works until I find a better way
         */
        if (master && (flags & MPIC_BIG_ENDIAN))
-               flags |= MPIC_BROKEN_U3;
+               flags |= MPIC_U3_HT_IRQS;
 
        mpic = mpic_alloc(np, r.start, flags, 0, 0, name);
        if (mpic == NULL)
@@ -512,7 +510,7 @@ static int __init pmac_pic_probe_mpic(void)
        for (np = NULL; (np = of_find_node_by_type(np, "open-pic"))
                     != NULL;) {
                if (master == NULL &&
-                   get_property(np, "interrupts", NULL) == NULL)
+                   of_get_property(np, "interrupts", NULL) == NULL)
                        master = of_node_get(np);
                else if (slave == NULL)
                        slave = of_node_get(np);
@@ -577,7 +575,7 @@ void __init pmac_pic_init(void)
 #ifdef CONFIG_PPC32
        if (!pmac_newworld)
                flags |= OF_IMAP_OLDWORLD_MAC;
-       if (get_property(of_chosen, "linux,bootx", NULL) != NULL)
+       if (of_get_property(of_chosen, "linux,bootx", NULL) != NULL)
                flags |= OF_IMAP_NO_PHANDLE;
 #endif /* CONFIG_PPC_32 */