Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+49 -4
+1
arch/powerpc/kernel/epapr_paravirt.c
··· 18 18 */ 19 19 20 20 #include <linux/of.h> 21 + #include <linux/of_fdt.h> 21 22 #include <asm/epapr_hcalls.h> 22 23 #include <asm/cacheflush.h> 23 24 #include <asm/code-patching.h>
+1
arch/powerpc/platforms/512x/clock.c
··· 24 24 #include <linux/mutex.h> 25 25 #include <linux/io.h> 26 26 27 + #include <linux/of_address.h> 27 28 #include <linux/of_platform.h> 28 29 #include <asm/mpc5xxx.h> 29 30 #include <asm/mpc5121.h>
+2
arch/powerpc/platforms/512x/pdm360ng.c
··· 14 14 15 15 #include <linux/kernel.h> 16 16 #include <linux/io.h> 17 + #include <linux/of_address.h> 18 + #include <linux/of_fdt.h> 17 19 #include <linux/of_platform.h> 18 20 19 21 #include <asm/machdep.h>
+2
arch/powerpc/platforms/82xx/mpc8272_ads.c
··· 16 16 #include <linux/init.h> 17 17 #include <linux/interrupt.h> 18 18 #include <linux/fsl_devices.h> 19 + #include <linux/of_address.h> 20 + #include <linux/of_fdt.h> 19 21 #include <linux/of_platform.h> 20 22 #include <linux/io.h> 21 23
+2
arch/powerpc/platforms/82xx/pq2fads.c
··· 15 15 #include <linux/init.h> 16 16 #include <linux/interrupt.h> 17 17 #include <linux/fsl_devices.h> 18 + #include <linux/of_address.h> 19 + #include <linux/of_fdt.h> 18 20 #include <linux/of_platform.h> 19 21 20 22 #include <asm/io.h>
+2
arch/powerpc/platforms/83xx/suspend.c
··· 20 20 #include <linux/freezer.h> 21 21 #include <linux/suspend.h> 22 22 #include <linux/fsl_devices.h> 23 + #include <linux/of_address.h> 24 + #include <linux/of_irq.h> 23 25 #include <linux/of_platform.h> 24 26 #include <linux/export.h> 25 27
+1
arch/powerpc/platforms/85xx/c293pcie.c
··· 11 11 12 12 #include <linux/stddef.h> 13 13 #include <linux/kernel.h> 14 + #include <linux/of_fdt.h> 14 15 #include <linux/of_platform.h> 15 16 16 17 #include <asm/machdep.h>
+2
arch/powerpc/platforms/85xx/common.c
··· 5 5 * it under the terms of the GNU General Public License version 2 as 6 6 * published by the Free Software Foundation. 7 7 */ 8 + 9 + #include <linux/of_irq.h> 8 10 #include <linux/of_platform.h> 9 11 10 12 #include <sysdev/cpm2_pic.h>
+2
arch/powerpc/platforms/85xx/socrates_fpga_pic.c
··· 9 9 */ 10 10 11 11 #include <linux/irq.h> 12 + #include <linux/of_address.h> 13 + #include <linux/of_irq.h> 12 14 #include <linux/of_platform.h> 13 15 #include <linux/io.h> 14 16
+1
arch/powerpc/platforms/86xx/pic.c
··· 10 10 #include <linux/stddef.h> 11 11 #include <linux/kernel.h> 12 12 #include <linux/interrupt.h> 13 + #include <linux/of_irq.h> 13 14 #include <linux/of_platform.h> 14 15 15 16 #include <asm/mpic.h>
+2
arch/powerpc/platforms/8xx/ep88xc.c
··· 10 10 */ 11 11 12 12 #include <linux/init.h> 13 + #include <linux/of_address.h> 14 + #include <linux/of_fdt.h> 13 15 #include <linux/of_platform.h> 14 16 15 17 #include <asm/machdep.h>
+2
arch/powerpc/platforms/8xx/mpc86xads_setup.c
··· 15 15 */ 16 16 17 17 #include <linux/init.h> 18 + #include <linux/of_address.h> 19 + #include <linux/of_fdt.h> 18 20 #include <linux/of_platform.h> 19 21 20 22 #include <asm/io.h>
+2
arch/powerpc/platforms/8xx/mpc885ads_setup.c
··· 25 25 #include <linux/fs_uart_pd.h> 26 26 #include <linux/fsl_devices.h> 27 27 #include <linux/mii.h> 28 + #include <linux/of_address.h> 29 + #include <linux/of_fdt.h> 28 30 #include <linux/of_platform.h> 29 31 30 32 #include <asm/delay.h>
+1
arch/powerpc/platforms/8xx/tqm8xx_setup.c
··· 28 28 #include <linux/fs_uart_pd.h> 29 29 #include <linux/fsl_devices.h> 30 30 #include <linux/mii.h> 31 + #include <linux/of_fdt.h> 31 32 #include <linux/of_platform.h> 32 33 33 34 #include <asm/delay.h>
+1
arch/powerpc/platforms/embedded6xx/flipper-pic.c
··· 18 18 #include <linux/init.h> 19 19 #include <linux/irq.h> 20 20 #include <linux/of.h> 21 + #include <linux/of_address.h> 21 22 #include <asm/io.h> 22 23 23 24 #include "flipper-pic.h"
+2
arch/powerpc/platforms/embedded6xx/hlwd-pic.c
··· 18 18 #include <linux/init.h> 19 19 #include <linux/irq.h> 20 20 #include <linux/of.h> 21 + #include <linux/of_address.h> 22 + #include <linux/of_irq.h> 21 23 #include <asm/io.h> 22 24 23 25 #include "hlwd-pic.h"
+1
arch/powerpc/platforms/pasemi/gpio_mdio.c
··· 30 30 #include <linux/ioport.h> 31 31 #include <linux/interrupt.h> 32 32 #include <linux/phy.h> 33 + #include <linux/of_address.h> 33 34 #include <linux/of_mdio.h> 34 35 #include <linux/of_platform.h> 35 36
+1
arch/powerpc/platforms/powermac/pfunc_base.c
··· 4 4 #include <linux/kernel.h> 5 5 #include <linux/interrupt.h> 6 6 #include <linux/spinlock.h> 7 + #include <linux/of_irq.h> 7 8 8 9 #include <asm/pmac_feature.h> 9 10 #include <asm/pmac_pfunc.h>
+1
arch/powerpc/platforms/powernv/opal-lpc.c
··· 17 17 #include <asm/firmware.h> 18 18 #include <asm/xics.h> 19 19 #include <asm/opal.h> 20 + #include <asm/prom.h> 20 21 21 22 static int opal_lpc_chip_id = -1; 22 23
+1
arch/powerpc/platforms/powernv/opal.c
··· 13 13 14 14 #include <linux/types.h> 15 15 #include <linux/of.h> 16 + #include <linux/of_fdt.h> 16 17 #include <linux/of_platform.h> 17 18 #include <linux/interrupt.h> 18 19 #include <linux/notifier.h>
+1
arch/powerpc/platforms/powernv/setup.c
··· 23 23 #include <linux/irq.h> 24 24 #include <linux/seq_file.h> 25 25 #include <linux/of.h> 26 + #include <linux/of_fdt.h> 26 27 #include <linux/interrupt.h> 27 28 #include <linux/bug.h> 28 29
+2
arch/powerpc/platforms/pseries/hotplug-memory.c
··· 10 10 */ 11 11 12 12 #include <linux/of.h> 13 + #include <linux/of_address.h> 13 14 #include <linux/memblock.h> 14 15 #include <linux/vmalloc.h> 15 16 #include <linux/memory.h> 16 17 17 18 #include <asm/firmware.h> 18 19 #include <asm/machdep.h> 20 + #include <asm/prom.h> 19 21 #include <asm/sparsemem.h> 20 22 21 23 static unsigned long get_memblock_size(void)
+1
arch/powerpc/sysdev/cpm_common.c
··· 22 22 #include <linux/spinlock.h> 23 23 #include <linux/export.h> 24 24 #include <linux/of.h> 25 + #include <linux/of_address.h> 25 26 #include <linux/slab.h> 26 27 27 28 #include <asm/udbg.h>
+2
arch/powerpc/sysdev/fsl_gtm.c
··· 19 19 #include <linux/list.h> 20 20 #include <linux/io.h> 21 21 #include <linux/of.h> 22 + #include <linux/of_address.h> 23 + #include <linux/of_irq.h> 22 24 #include <linux/spinlock.h> 23 25 #include <linux/bitops.h> 24 26 #include <linux/slab.h>
+1
arch/powerpc/sysdev/fsl_pmc.c
··· 18 18 #include <linux/suspend.h> 19 19 #include <linux/delay.h> 20 20 #include <linux/device.h> 21 + #include <linux/of_address.h> 21 22 #include <linux/of_platform.h> 22 23 23 24 struct pmc_regs {
+2
arch/powerpc/sysdev/fsl_rio.c
··· 28 28 #include <linux/dma-mapping.h> 29 29 #include <linux/interrupt.h> 30 30 #include <linux/device.h> 31 + #include <linux/of_address.h> 32 + #include <linux/of_irq.h> 31 33 #include <linux/of_platform.h> 32 34 #include <linux/delay.h> 33 35 #include <linux/slab.h>
+1
arch/powerpc/sysdev/fsl_rmu.c
··· 27 27 #include <linux/types.h> 28 28 #include <linux/dma-mapping.h> 29 29 #include <linux/interrupt.h> 30 + #include <linux/of_irq.h> 30 31 #include <linux/of_platform.h> 31 32 #include <linux/slab.h> 32 33
+4 -4
arch/powerpc/sysdev/mpic.c
··· 535 535 mpic->fixups[irq].data = readl(base + 4) | 0x80000000; 536 536 } 537 537 } 538 - 538 + 539 539 540 540 static void __init mpic_scan_ht_pics(struct mpic *mpic) 541 541 { ··· 1475 1475 * as a default instead of the value read from the HW. 1476 1476 */ 1477 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 1479 if (isu_size) 1480 1480 last_irq = isu_size * MPIC_MAX_ISU - 1; 1481 1481 of_property_read_u32(mpic->node, "last-interrupt-source", &last_irq); ··· 1625 1625 /* start with vector = source number, and masked */ 1626 1626 u32 vecpri = MPIC_VECPRI_MASK | i | 1627 1627 (8 << MPIC_VECPRI_PRIORITY_SHIFT); 1628 - 1628 + 1629 1629 /* check if protected */ 1630 1630 if (mpic->protected && test_bit(i, mpic->protected)) 1631 1631 continue; ··· 1634 1634 mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1 << cpu); 1635 1635 } 1636 1636 } 1637 - 1637 + 1638 1638 /* Init spurious vector */ 1639 1639 mpic_write(mpic->gregs, MPIC_INFO(GREG_SPURIOUS), mpic->spurious_vec); 1640 1640
+2
arch/powerpc/sysdev/mpic_timer.c
··· 19 19 #include <linux/interrupt.h> 20 20 #include <linux/slab.h> 21 21 #include <linux/of.h> 22 + #include <linux/of_address.h> 22 23 #include <linux/of_device.h> 24 + #include <linux/of_irq.h> 23 25 #include <linux/syscore_ops.h> 24 26 #include <sysdev/fsl_soc.h> 25 27 #include <asm/io.h>
+1
arch/powerpc/sysdev/of_rtc.c
··· 11 11 #include <linux/kernel.h> 12 12 #include <linux/of.h> 13 13 #include <linux/init.h> 14 + #include <linux/of_address.h> 14 15 #include <linux/of_platform.h> 15 16 #include <linux/slab.h> 16 17
+1
arch/powerpc/sysdev/ppc4xx_soc.c
··· 19 19 #include <linux/errno.h> 20 20 #include <linux/interrupt.h> 21 21 #include <linux/irq.h> 22 + #include <linux/of_irq.h> 22 23 #include <linux/of_platform.h> 23 24 24 25 #include <asm/dcr.h>
+1
arch/powerpc/sysdev/xilinx_intc.c
··· 23 23 #include <linux/kernel.h> 24 24 #include <linux/irq.h> 25 25 #include <linux/of.h> 26 + #include <linux/of_address.h> 26 27 #include <asm/io.h> 27 28 #include <asm/processor.h> 28 29 #include <asm/i8259.h>