diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-09-26 08:40:04 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-10-09 21:04:11 -0400 |
commit | 26a2056eb21fff26caf99d19ad5448e9403db55d (patch) | |
tree | c1bd03e61fcf39f4a61f75437dad19de1cdbedb0 /arch/powerpc/sysdev/mpic.c | |
parent | 5c19c5c6d4f5e1dc0d0e26b683bc820dda01fe06 (diff) |
powerpc: add explicit OF includes
When removing prom.h include by of.h, several OF headers will no longer
be implicitly included. Add explicit includes of of_*.h as needed.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@linaro.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Olof Johansson <olof@lixom.net>
Cc: linuxppc-dev@lists.ozlabs.org
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
-rw-r--r-- | arch/powerpc/sysdev/mpic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 1be54faf60dd..2d30eafc40d8 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
@@ -535,7 +535,7 @@ static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase, | |||
535 | mpic->fixups[irq].data = readl(base + 4) | 0x80000000; | 535 | mpic->fixups[irq].data = readl(base + 4) | 0x80000000; |
536 | } | 536 | } |
537 | } | 537 | } |
538 | 538 | ||
539 | 539 | ||
540 | static void __init mpic_scan_ht_pics(struct mpic *mpic) | 540 | static void __init mpic_scan_ht_pics(struct mpic *mpic) |
541 | { | 541 | { |
@@ -1475,7 +1475,7 @@ struct mpic * __init mpic_alloc(struct device_node *node, | |||
1475 | * as a default instead of the value read from the HW. | 1475 | * as a default instead of the value read from the HW. |
1476 | */ | 1476 | */ |
1477 | last_irq = (greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK) | 1477 | last_irq = (greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK) |
1478 | >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT; | 1478 | >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT; |
1479 | if (isu_size) | 1479 | if (isu_size) |
1480 | last_irq = isu_size * MPIC_MAX_ISU - 1; | 1480 | last_irq = isu_size * MPIC_MAX_ISU - 1; |
1481 | of_property_read_u32(mpic->node, "last-interrupt-source", &last_irq); | 1481 | of_property_read_u32(mpic->node, "last-interrupt-source", &last_irq); |
@@ -1625,7 +1625,7 @@ void __init mpic_init(struct mpic *mpic) | |||
1625 | /* start with vector = source number, and masked */ | 1625 | /* start with vector = source number, and masked */ |
1626 | u32 vecpri = MPIC_VECPRI_MASK | i | | 1626 | u32 vecpri = MPIC_VECPRI_MASK | i | |
1627 | (8 << MPIC_VECPRI_PRIORITY_SHIFT); | 1627 | (8 << MPIC_VECPRI_PRIORITY_SHIFT); |
1628 | 1628 | ||
1629 | /* check if protected */ | 1629 | /* check if protected */ |
1630 | if (mpic->protected && test_bit(i, mpic->protected)) | 1630 | if (mpic->protected && test_bit(i, mpic->protected)) |
1631 | continue; | 1631 | continue; |
@@ -1634,7 +1634,7 @@ void __init mpic_init(struct mpic *mpic) | |||
1634 | mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1 << cpu); | 1634 | mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1 << cpu); |
1635 | } | 1635 | } |
1636 | } | 1636 | } |
1637 | 1637 | ||
1638 | /* Init spurious vector */ | 1638 | /* Init spurious vector */ |
1639 | mpic_write(mpic->gregs, MPIC_INFO(GREG_SPURIOUS), mpic->spurious_vec); | 1639 | mpic_write(mpic->gregs, MPIC_INFO(GREG_SPURIOUS), mpic->spurious_vec); |
1640 | 1640 | ||