ソースを参照

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
Rob Herring 11 年 前
コミット
26a2056eb2
32 ファイル変更49 行追加4 行削除
  1. 1 0
      arch/powerpc/kernel/epapr_paravirt.c
  2. 1 0
      arch/powerpc/platforms/512x/clock.c
  3. 2 0
      arch/powerpc/platforms/512x/pdm360ng.c
  4. 2 0
      arch/powerpc/platforms/82xx/mpc8272_ads.c
  5. 2 0
      arch/powerpc/platforms/82xx/pq2fads.c
  6. 2 0
      arch/powerpc/platforms/83xx/suspend.c
  7. 1 0
      arch/powerpc/platforms/85xx/c293pcie.c
  8. 2 0
      arch/powerpc/platforms/85xx/common.c
  9. 2 0
      arch/powerpc/platforms/85xx/socrates_fpga_pic.c
  10. 1 0
      arch/powerpc/platforms/86xx/pic.c
  11. 2 0
      arch/powerpc/platforms/8xx/ep88xc.c
  12. 2 0
      arch/powerpc/platforms/8xx/mpc86xads_setup.c
  13. 2 0
      arch/powerpc/platforms/8xx/mpc885ads_setup.c
  14. 1 0
      arch/powerpc/platforms/8xx/tqm8xx_setup.c
  15. 1 0
      arch/powerpc/platforms/embedded6xx/flipper-pic.c
  16. 2 0
      arch/powerpc/platforms/embedded6xx/hlwd-pic.c
  17. 1 0
      arch/powerpc/platforms/pasemi/gpio_mdio.c
  18. 1 0
      arch/powerpc/platforms/powermac/pfunc_base.c
  19. 1 0
      arch/powerpc/platforms/powernv/opal-lpc.c
  20. 1 0
      arch/powerpc/platforms/powernv/opal.c
  21. 1 0
      arch/powerpc/platforms/powernv/setup.c
  22. 2 0
      arch/powerpc/platforms/pseries/hotplug-memory.c
  23. 1 0
      arch/powerpc/sysdev/cpm_common.c
  24. 2 0
      arch/powerpc/sysdev/fsl_gtm.c
  25. 1 0
      arch/powerpc/sysdev/fsl_pmc.c
  26. 2 0
      arch/powerpc/sysdev/fsl_rio.c
  27. 1 0
      arch/powerpc/sysdev/fsl_rmu.c
  28. 4 4
      arch/powerpc/sysdev/mpic.c
  29. 2 0
      arch/powerpc/sysdev/mpic_timer.c
  30. 1 0
      arch/powerpc/sysdev/of_rtc.c
  31. 1 0
      arch/powerpc/sysdev/ppc4xx_soc.c
  32. 1 0
      arch/powerpc/sysdev/xilinx_intc.c

+ 1 - 0
arch/powerpc/kernel/epapr_paravirt.c

@@ -18,6 +18,7 @@
  */
 
 #include <linux/of.h>
+#include <linux/of_fdt.h>
 #include <asm/epapr_hcalls.h>
 #include <asm/cacheflush.h>
 #include <asm/code-patching.h>

+ 1 - 0
arch/powerpc/platforms/512x/clock.c

@@ -24,6 +24,7 @@
 #include <linux/mutex.h>
 #include <linux/io.h>
 
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <asm/mpc5xxx.h>
 #include <asm/mpc5121.h>

+ 2 - 0
arch/powerpc/platforms/512x/pdm360ng.c

@@ -14,6 +14,8 @@
 
 #include <linux/kernel.h>
 #include <linux/io.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/machdep.h>

+ 2 - 0
arch/powerpc/platforms/82xx/mpc8272_ads.c

@@ -16,6 +16,8 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/fsl_devices.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
 

+ 2 - 0
arch/powerpc/platforms/82xx/pq2fads.c

@@ -15,6 +15,8 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/fsl_devices.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/io.h>

+ 2 - 0
arch/powerpc/platforms/83xx/suspend.c

@@ -20,6 +20,8 @@
 #include <linux/freezer.h>
 #include <linux/suspend.h>
 #include <linux/fsl_devices.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/export.h>
 

+ 1 - 0
arch/powerpc/platforms/85xx/c293pcie.c

@@ -11,6 +11,7 @@
 
 #include <linux/stddef.h>
 #include <linux/kernel.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/machdep.h>

+ 2 - 0
arch/powerpc/platforms/85xx/common.c

@@ -5,6 +5,8 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <sysdev/cpm2_pic.h>

+ 2 - 0
arch/powerpc/platforms/85xx/socrates_fpga_pic.c

@@ -9,6 +9,8 @@
  */
 
 #include <linux/irq.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
 

+ 1 - 0
arch/powerpc/platforms/86xx/pic.c

@@ -10,6 +10,7 @@
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <asm/mpic.h>

+ 2 - 0
arch/powerpc/platforms/8xx/ep88xc.c

@@ -10,6 +10,8 @@
  */
 
 #include <linux/init.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/machdep.h>

+ 2 - 0
arch/powerpc/platforms/8xx/mpc86xads_setup.c

@@ -15,6 +15,8 @@
  */
 
 #include <linux/init.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/io.h>

+ 2 - 0
arch/powerpc/platforms/8xx/mpc885ads_setup.c

@@ -25,6 +25,8 @@
 #include <linux/fs_uart_pd.h>
 #include <linux/fsl_devices.h>
 #include <linux/mii.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/delay.h>

+ 1 - 0
arch/powerpc/platforms/8xx/tqm8xx_setup.c

@@ -28,6 +28,7 @@
 #include <linux/fs_uart_pd.h>
 #include <linux/fsl_devices.h>
 #include <linux/mii.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/delay.h>

+ 1 - 0
arch/powerpc/platforms/embedded6xx/flipper-pic.c

@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <asm/io.h>
 
 #include "flipper-pic.h"

+ 2 - 0
arch/powerpc/platforms/embedded6xx/hlwd-pic.c

@@ -18,6 +18,8 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <asm/io.h>
 
 #include "hlwd-pic.h"

+ 1 - 0
arch/powerpc/platforms/pasemi/gpio_mdio.c

@@ -30,6 +30,7 @@
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/phy.h>
+#include <linux/of_address.h>
 #include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 

+ 1 - 0
arch/powerpc/platforms/powermac/pfunc_base.c

@@ -4,6 +4,7 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
+#include <linux/of_irq.h>
 
 #include <asm/pmac_feature.h>
 #include <asm/pmac_pfunc.h>

+ 1 - 0
arch/powerpc/platforms/powernv/opal-lpc.c

@@ -17,6 +17,7 @@
 #include <asm/firmware.h>
 #include <asm/xics.h>
 #include <asm/opal.h>
+#include <asm/prom.h>
 
 static int opal_lpc_chip_id = -1;
 

+ 1 - 0
arch/powerpc/platforms/powernv/opal.c

@@ -13,6 +13,7 @@
 
 #include <linux/types.h>
 #include <linux/of.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 #include <linux/interrupt.h>
 #include <linux/notifier.h>

+ 1 - 0
arch/powerpc/platforms/powernv/setup.c

@@ -23,6 +23,7 @@
 #include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/of.h>
+#include <linux/of_fdt.h>
 #include <linux/interrupt.h>
 #include <linux/bug.h>
 

+ 2 - 0
arch/powerpc/platforms/pseries/hotplug-memory.c

@@ -10,12 +10,14 @@
  */
 
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/memblock.h>
 #include <linux/vmalloc.h>
 #include <linux/memory.h>
 
 #include <asm/firmware.h>
 #include <asm/machdep.h>
+#include <asm/prom.h>
 #include <asm/sparsemem.h>
 
 static unsigned long get_memblock_size(void)

+ 1 - 0
arch/powerpc/sysdev/cpm_common.c

@@ -22,6 +22,7 @@
 #include <linux/spinlock.h>
 #include <linux/export.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/slab.h>
 
 #include <asm/udbg.h>

+ 2 - 0
arch/powerpc/sysdev/fsl_gtm.c

@@ -19,6 +19,8 @@
 #include <linux/list.h>
 #include <linux/io.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
 #include <linux/slab.h>

+ 1 - 0
arch/powerpc/sysdev/fsl_pmc.c

@@ -18,6 +18,7 @@
 #include <linux/suspend.h>
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 
 struct pmc_regs {

+ 2 - 0
arch/powerpc/sysdev/fsl_rio.c

@@ -28,6 +28,8 @@
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/delay.h>
 #include <linux/slab.h>

+ 1 - 0
arch/powerpc/sysdev/fsl_rmu.c

@@ -27,6 +27,7 @@
 #include <linux/types.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
 

+ 4 - 4
arch/powerpc/sysdev/mpic.c

@@ -535,7 +535,7 @@ static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase,
 		mpic->fixups[irq].data = readl(base + 4) | 0x80000000;
 	}
 }
- 
+
 
 static void __init mpic_scan_ht_pics(struct mpic *mpic)
 {
@@ -1475,7 +1475,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
 	 * as a default instead of the value read from the HW.
 	 */
 	last_irq = (greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK)
-				>> MPIC_GREG_FEATURE_LAST_SRC_SHIFT;	
+				>> MPIC_GREG_FEATURE_LAST_SRC_SHIFT;
 	if (isu_size)
 		last_irq = isu_size  * MPIC_MAX_ISU - 1;
 	of_property_read_u32(mpic->node, "last-interrupt-source", &last_irq);
@@ -1625,7 +1625,7 @@ void __init mpic_init(struct mpic *mpic)
 			/* start with vector = source number, and masked */
 			u32 vecpri = MPIC_VECPRI_MASK | i |
 				(8 << MPIC_VECPRI_PRIORITY_SHIFT);
-		
+
 			/* check if protected */
 			if (mpic->protected && test_bit(i, mpic->protected))
 				continue;
@@ -1634,7 +1634,7 @@ void __init mpic_init(struct mpic *mpic)
 			mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1 << cpu);
 		}
 	}
-	
+
 	/* Init spurious vector */
 	mpic_write(mpic->gregs, MPIC_INFO(GREG_SPURIOUS), mpic->spurious_vec);
 

+ 2 - 0
arch/powerpc/sysdev/mpic_timer.c

@@ -19,7 +19,9 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include <linux/syscore_ops.h>
 #include <sysdev/fsl_soc.h>
 #include <asm/io.h>

+ 1 - 0
arch/powerpc/sysdev/of_rtc.c

@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/of.h>
 #include <linux/init.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
 

+ 1 - 0
arch/powerpc/sysdev/ppc4xx_soc.c

@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <asm/dcr.h>

+ 1 - 0
arch/powerpc/sysdev/xilinx_intc.c

@@ -23,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/irq.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/i8259.h>