diff options
Diffstat (limited to 'arch/powerpc/platforms/powermac/pic.c')
-rw-r--r-- | arch/powerpc/platforms/powermac/pic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index 5e5c0e4add91..ae5097ac0378 100644 --- a/arch/powerpc/platforms/powermac/pic.c +++ b/arch/powerpc/platforms/powermac/pic.c | |||
@@ -482,14 +482,14 @@ static struct mpic * __init pmac_setup_one_mpic(struct device_node *np, | |||
482 | pmac_call_feature(PMAC_FTR_ENABLE_MPIC, np, 0, 0); | 482 | pmac_call_feature(PMAC_FTR_ENABLE_MPIC, np, 0, 0); |
483 | 483 | ||
484 | flags |= MPIC_WANTS_RESET; | 484 | flags |= MPIC_WANTS_RESET; |
485 | if (get_property(np, "big-endian", NULL)) | 485 | if (of_get_property(np, "big-endian", NULL)) |
486 | flags |= MPIC_BIG_ENDIAN; | 486 | flags |= MPIC_BIG_ENDIAN; |
487 | 487 | ||
488 | /* Primary Big Endian means HT interrupts. This is quite dodgy | 488 | /* Primary Big Endian means HT interrupts. This is quite dodgy |
489 | * but works until I find a better way | 489 | * but works until I find a better way |
490 | */ | 490 | */ |
491 | if (master && (flags & MPIC_BIG_ENDIAN)) | 491 | if (master && (flags & MPIC_BIG_ENDIAN)) |
492 | flags |= MPIC_BROKEN_U3; | 492 | flags |= MPIC_U3_HT_IRQS; |
493 | 493 | ||
494 | mpic = mpic_alloc(np, r.start, flags, 0, 0, name); | 494 | mpic = mpic_alloc(np, r.start, flags, 0, 0, name); |
495 | if (mpic == NULL) | 495 | if (mpic == NULL) |
@@ -510,7 +510,7 @@ static int __init pmac_pic_probe_mpic(void) | |||
510 | for (np = NULL; (np = of_find_node_by_type(np, "open-pic")) | 510 | for (np = NULL; (np = of_find_node_by_type(np, "open-pic")) |
511 | != NULL;) { | 511 | != NULL;) { |
512 | if (master == NULL && | 512 | if (master == NULL && |
513 | get_property(np, "interrupts", NULL) == NULL) | 513 | of_get_property(np, "interrupts", NULL) == NULL) |
514 | master = of_node_get(np); | 514 | master = of_node_get(np); |
515 | else if (slave == NULL) | 515 | else if (slave == NULL) |
516 | slave = of_node_get(np); | 516 | slave = of_node_get(np); |
@@ -575,7 +575,7 @@ void __init pmac_pic_init(void) | |||
575 | #ifdef CONFIG_PPC32 | 575 | #ifdef CONFIG_PPC32 |
576 | if (!pmac_newworld) | 576 | if (!pmac_newworld) |
577 | flags |= OF_IMAP_OLDWORLD_MAC; | 577 | flags |= OF_IMAP_OLDWORLD_MAC; |
578 | if (get_property(of_chosen, "linux,bootx", NULL) != NULL) | 578 | if (of_get_property(of_chosen, "linux,bootx", NULL) != NULL) |
579 | flags |= OF_IMAP_NO_PHANDLE; | 579 | flags |= OF_IMAP_NO_PHANDLE; |
580 | #endif /* CONFIG_PPC_32 */ | 580 | #endif /* CONFIG_PPC_32 */ |
581 | 581 | ||