Skip to contentSkip to conversation

powerpc: add explicit OF includes for ppc4xx

PATCH In review Rob Herring 2 participants 2 messages Nov 11, 2013 – Nov 12, 2013

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: add explicit OF includes for ppc4xx

From: Rob Herring <[email protected]>

Commit b5b4bb3f6a11f9 (of: only include prom.h on sparc) removed implicit includes of of_*.h headers by powerpc's prom.h. Some PPC4xx components were missed in initial clean-up patch, so add the necessary includes to fix ppc4xx builds.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Tejun Heo <[email protected]>
Cc Matt Mackall <[email protected]>
Cc Herbert Xu <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>

---
I intend to send this patch to Linus with the rest of the DT clean-up series.

Rob

 arch/powerpc/sysdev/ppc4xx_ocm.c     | 1 +
 arch/powerpc/sysdev/xilinx_intc.c    | 1 +
 drivers/ata/sata_dwc_460ex.c         | 2 ++
 drivers/char/hw_random/ppc4xx-rng.c  | 1 +
 drivers/crypto/amcc/crypto4xx_core.c | 3 +++
 drivers/dma/ppc4xx/adma.c            | 2 ++
 6 files changed, 10 insertions(+)
arch/powerpc/sysdev/ppc4xx_ocm.c +1 -0
index 1b15f93..b7c4345 100644
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <asm/rheap.h>
 #include <asm/ppc4xx_ocm.h>
 #include <linux/slab.h>
arch/powerpc/sysdev/xilinx_intc.c +1 -0
index f4fdc94..83f943a 100644
@@ -24,6 +24,7 @@
 #include <linux/irq.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/i8259.h>
drivers/ata/sata_dwc_460ex.c +2 -0
index 2e39173..523524b 100644
@@ -31,6 +31,8 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/libata.h>
drivers/char/hw_random/ppc4xx-rng.c +1 -0
index 732c330..521f76b 100644
@@ -13,6 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/hw_random.h>
 #include <linux/delay.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <asm/io.h>
 
drivers/crypto/amcc/crypto4xx_core.c +3 -0
index f88e3d8..efaf630 100644
@@ -27,6 +27,9 @@
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/init.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
 #include <asm/dcr.h>
drivers/dma/ppc4xx/adma.c +2 -0
index 370ff82..e24b5ef 100644
@@ -42,6 +42,8 @@
 #include <linux/uaccess.h>
 #include <linux/proc_fs.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <asm/dcr.h>
 #include <asm/dcr-regs.h>
Signature · 1 line
1.8.1.2
#1 lore raw
Quoted 23 lines · Rob Herring

From: Rob Herring <[email protected]>

Commit b5b4bb3f6a11f9 (of: only include prom.h on sparc) removed implicit includes of of_*.h headers by powerpc's prom.h. Some PPC4xx components were missed in initial clean-up patch, so add the necessary includes to fix ppc4xx builds.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Tejun Heo <[email protected]>
Cc Matt Mackall <[email protected]>
Cc Herbert Xu <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Vinod Koul <[email protected]>
Cc Dan Williams <[email protected]>

---
I intend to send this patch to Linus with the rest of the DT clean-up series.

Quoted 8 lines

Rob

 arch/powerpc/sysdev/ppc4xx_ocm.c     | 1 +
 arch/powerpc/sysdev/xilinx_intc.c    | 1 +
 drivers/ata/sata_dwc_460ex.c         | 2 ++
 drivers/char/hw_random/ppc4xx-rng.c  | 1 +
 drivers/crypto/amcc/crypto4xx_core.c | 3 +++
 drivers/dma/ppc4xx/adma.c            | 2 ++

For this:

Acked-by Vinod Koul <[email protected]>

--
~Vinod

Quoted 81 lines
 6 files changed, 10 insertions(+)
arch/powerpc/sysdev/ppc4xx_ocm.c +1 -0
index 1b15f93..b7c4345 100644
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <asm/rheap.h>
 #include <asm/ppc4xx_ocm.h>
 #include <linux/slab.h>
arch/powerpc/sysdev/xilinx_intc.c +1 -0
index f4fdc94..83f943a 100644
@@ -24,6 +24,7 @@
 #include <linux/irq.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/i8259.h>
drivers/ata/sata_dwc_460ex.c +2 -0
index 2e39173..523524b 100644
@@ -31,6 +31,8 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/libata.h>
drivers/char/hw_random/ppc4xx-rng.c +1 -0
index 732c330..521f76b 100644
@@ -13,6 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/hw_random.h>
 #include <linux/delay.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <asm/io.h>
 
drivers/crypto/amcc/crypto4xx_core.c +3 -0
index f88e3d8..efaf630 100644
@@ -27,6 +27,9 @@
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/init.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
 #include <asm/dcr.h>
drivers/dma/ppc4xx/adma.c +2 -0
index 370ff82..e24b5ef 100644
@@ -42,6 +42,8 @@
 #include <linux/uaccess.h>
 #include <linux/proc_fs.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <asm/dcr.h>
 #include <asm/dcr-regs.h>
Signature · 1 line
1.8.1.2