ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h
authorviresh kumar <viresh.kumar@st.com>
Mon, 7 Mar 2011 04:57:02 +0000 (05:57 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 9 Mar 2011 09:49:45 +0000 (09:49 +0000)
This patch makes inclusion of hardware.h and spear.h consistent over all spear
variants. Now we will include hardware.h, wherever we need to use hardware
macros. spear.h will be automatically included by hardware.h

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
22 files changed:
arch/arm/mach-spear3xx/include/mach/entry-macro.S
arch/arm/mach-spear3xx/include/mach/hardware.h
arch/arm/mach-spear3xx/include/mach/misc_regs.h
arch/arm/mach-spear3xx/include/mach/spear.h
arch/arm/mach-spear3xx/spear300.c
arch/arm/mach-spear3xx/spear300_evb.c
arch/arm/mach-spear3xx/spear310.c
arch/arm/mach-spear3xx/spear310_evb.c
arch/arm/mach-spear3xx/spear320.c
arch/arm/mach-spear3xx/spear320_evb.c
arch/arm/mach-spear3xx/spear3xx.c
arch/arm/mach-spear6xx/include/mach/entry-macro.S
arch/arm/mach-spear6xx/include/mach/hardware.h
arch/arm/mach-spear6xx/include/mach/misc_regs.h
arch/arm/mach-spear6xx/include/mach/spear.h
arch/arm/mach-spear6xx/spear600.c
arch/arm/mach-spear6xx/spear600_evb.c
arch/arm/mach-spear6xx/spear6xx.c
arch/arm/plat-spear/include/plat/debug-macro.S
arch/arm/plat-spear/include/plat/system.h
arch/arm/plat-spear/include/plat/uncompress.h
arch/arm/plat-spear/time.c

index e8e7dc05430308e95e62cb7e657a62a918c035b3..53da4224ba3dc76bb7c20b95a41a5e06d2770526 100644 (file)
@@ -13,7 +13,6 @@
 
 #include <asm/hardware/vic.h>
 #include <mach/hardware.h>
-#include <mach/spear.h>
 
                .macro  disable_fiq
                .endm
index 490e86a6b0c7aac9069af30f70758fab7d176859..4660c0d8ec0db16baf592055f18bf9fe45f7089a 100644 (file)
@@ -15,6 +15,7 @@
 #define __MACH_HARDWARE_H
 
 #include <plat/hardware.h>
+#include <mach/spear.h>
 
 /* Vitual to physical translation of statically mapped space */
 #define IO_ADDRESS(x)          (x | 0xF0000000)
index 0b93347c0f116a3bb2a312f018db2f1b773f1d84..5bd8cd8d4852e9fc5d4f214ac47869d46fe392b7 100644 (file)
@@ -14,7 +14,7 @@
 #ifndef __MACH_MISC_REGS_H
 #define __MACH_MISC_REGS_H
 
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 #define MISC_BASE              IOMEM(VA_SPEAR3XX_ICM3_MISC_REG_BASE)
 
index dcca8568a486bc8929718f006fc398e890da7d47..87458020421df25ea42aa37a22f675553e29ae12 100644 (file)
@@ -14,7 +14,6 @@
 #ifndef __MACH_SPEAR3XX_H
 #define __MACH_SPEAR3XX_H
 
-#include <mach/hardware.h>
 #include <mach/spear300.h>
 #include <mach/spear310.h>
 #include <mach/spear320.h>
index 80ca04a80491b27bf62ec8ce713568543c28844d..e15c68480d28de310a030f54bfc83761fc45463d 100644 (file)
@@ -17,7 +17,7 @@
 #include <asm/irq.h>
 #include <plat/shirq.h>
 #include <mach/generic.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 /* pad multiplexing support */
 /* muxing registers */
index cd23c98b2ffd794a614dc069b96c08f8355fbdac..77c9b83acb15ce962290172411e0064ee855b09a 100644 (file)
@@ -14,7 +14,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 #include <mach/generic.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 /* padmux devices to enable */
 static struct pmx_dev *pmx_devs[] = {
index ca1109db555655a34853eea562961901b8c675e2..5bfab14e89bc4b22456a4a319e9c4872ad6b23f5 100644 (file)
@@ -15,7 +15,7 @@
 #include <asm/irq.h>
 #include <plat/shirq.h>
 #include <mach/generic.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 /* pad multiplexing support */
 /* muxing registers */
index 3855431082621ba90776ffffb038a83a29a5a081..2d7f333bd67bc35ad7b2d01a553e1579ff5c3c35 100644 (file)
@@ -14,7 +14,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 #include <mach/generic.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 /* padmux devices to enable */
 static struct pmx_dev *pmx_devs[] = {
index ceb04e813f22e636fe04a923e4c401017b988652..c25f9096ff25557e99c6300550f50601eb368f2c 100644 (file)
@@ -15,7 +15,7 @@
 #include <asm/irq.h>
 #include <plat/shirq.h>
 #include <mach/generic.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 /* pad multiplexing support */
 /* muxing registers */
index 4a7ce35fdf8c4c883bbb33a8de28581b549da195..0b80a1584cc376ea57b3131a5160d4afeaf4de80 100644 (file)
@@ -14,7 +14,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 #include <mach/generic.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 /* padmux devices to enable */
 static struct pmx_dev *pmx_devs[] = {
index e12a06c3b85b5c1f9119d385d4cccf5f17467cc0..634116f6029714459a1feaf72b8d827e81ef5c6f 100644 (file)
@@ -19,7 +19,7 @@
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
 #include <mach/generic.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 /* Add spear3xx machines common devices here */
 /* gpio device registration */
index bc55e8b04d1281ed7de2f894bbf5b8f04e266361..8a0b0ed7b2035606d182541347727a0a9dbdff03 100644 (file)
@@ -13,7 +13,6 @@
 
 #include <asm/hardware/vic.h>
 #include <mach/hardware.h>
-#include <mach/spear.h>
 
                .macro  disable_fiq
                .endm
index 0291476ca6da100af831a12854baccc074f1e6b5..0b3f96ae2848da1c53072865f541ca13643767a2 100644 (file)
@@ -15,6 +15,7 @@
 #define __MACH_HARDWARE_H
 
 #include <plat/hardware.h>
+#include <mach/spear.h>
 
 /* Vitual to physical translation of statically mapped space */
 #define IO_ADDRESS(x)          (x | 0xF0000000)
index 45571c13227a42db423aeb976a4d0e536f27c6b2..68c20a007b0d72019b5fc33ac72764ea95dd1d8d 100644 (file)
@@ -14,7 +14,7 @@
 #ifndef __MACH_MISC_REGS_H
 #define __MACH_MISC_REGS_H
 
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 #define MISC_BASE              IOMEM(VA_SPEAR6XX_ICM3_MISC_REG_BASE)
 
index a835f5b6b1820fd14ddf587a3d695643cff287f4..17ab5aab6b5ddcb173a301e1a30710f7d90e008f 100644 (file)
@@ -14,7 +14,6 @@
 #ifndef __MACH_SPEAR6XX_H
 #define __MACH_SPEAR6XX_H
 
-#include <mach/hardware.h>
 #include <mach/spear600.h>
 
 #define SPEAR6XX_ML_SDRAM_BASE         0x00000000
index 5c484c433dc19c98494a5c27d3980415ec08e292..d0e6eeae9b04e4553027b8d8e0d7a8ce6deb0b9b 100644 (file)
@@ -14,7 +14,7 @@
 #include <linux/ptrace.h>
 #include <asm/irq.h>
 #include <mach/generic.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 /* Add spear600 specific devices here */
 
index b0ed0dfe9b0195716954c2f83718ad99922433fb..f19cefe91a2bd96c65a303014676ab08a1bccab3 100644 (file)
@@ -14,7 +14,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 #include <mach/generic.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 static struct amba_device *amba_devs[] __initdata = {
        &gpio_device[0],
index 2d95715b733ec2174f52da4ecb7e9371d3d0d454..378440bdb1c95d1c7338a531315db0406b1c699e 100644 (file)
@@ -19,8 +19,8 @@
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
 #include <mach/generic.h>
+#include <mach/hardware.h>
 #include <mach/irqs.h>
-#include <mach/spear.h>
 
 /* Add spear6xx machines common devices here */
 /* uart device registration */
index e91270e4f640329ce1424b1ad7c37a89dead7626..8501bbf2c092d9877b9193b1a8d61ac4f5fc7adc 100644 (file)
@@ -12,7 +12,7 @@
  */
 
 #include <linux/amba/serial.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
                .macro  addruart, rp, rv
                mov     \rp, #SPEAR_DBG_UART_BASE               @ Physical base
index d52db6807ce640b24e9ad3f88398e5e53df723a1..a235fa0ca7778e922c39b6eca0426e369dae38de 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <linux/io.h>
 #include <asm/hardware/sp810.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 static inline void arch_idle(void)
 {
index 6dd455bafdfdaf90bf4f13f8a6cc8572a763135c..1bf84527aee4e728b79db3c8242cfbf185ca88c6 100644 (file)
@@ -13,7 +13,7 @@
 
 #include <linux/io.h>
 #include <linux/amba/serial.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 #ifndef __PLAT_UNCOMPRESS_H
 #define __PLAT_UNCOMPRESS_H
index de0a81b33e2ff1657aed82f6e5072935ac7f6286..dbb6e4fff79de78b61429f2359d4e44d2b6d7554 100644 (file)
@@ -23,7 +23,6 @@
 #include <mach/generic.h>
 #include <mach/hardware.h>
 #include <mach/irqs.h>
-#include <mach/spear.h>
 
 /*
  * We would use TIMER0 and TIMER1 as clockevent and clocksource.