common: arm: davinci: Move header file out of common

We should not have an arch-specific header file in common.h. Instead, use
the asm/hardware.h header to provide the required declarations, and drop
the common.h changes.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-davinci/include/mach/davinci_misc.h b/arch/arm/mach-davinci/include/mach/davinci_misc.h
index 03be3882f886323ea2fd5ff72da749e271d11eb1..79090e0671fbcca4cff0c7b002586e7c7bb42e46 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/davinci_misc.h
+++ b/arch/arm/mach-davinci/include/mach/davinci_misc.h
@@ -7,6 +7,8 @@
 #ifndef __MISC_H
 #define __MISC_H
 
+#include <asm/arch/hardware.h>
+
 /* pin muxer definitions */
 #define PIN_MUX_NUM_FIELDS     8       /* Per register */
 #define PIN_MUX_FIELD_SIZE     4       /* n in bits */

diff --git a/arch/arm/mach-davinci/include/mach/hardware.h b/arch/arm/mach-davinci/include/mach/hardware.h
index c31f38c8a275fe57351f8643ffc64cd378016394..e11099cb932768c7018d6adc73f2dfe537e70208 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/hardware.h
+++ b/arch/arm/mach-davinci/include/mach/hardware.h
@@ -14,14 +14,15 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <config.h>
 #include <linux/sizes.h>
 
 #define        REG(addr)       (*(volatile unsigned int *)(addr))
 #define REG_P(addr)    ((volatile unsigned int *)(addr))
 
+#ifndef __ASSEMBLY__
 typedef volatile unsigned int  dv_reg;
 typedef volatile unsigned int *        dv_reg_p;
+#endif
 
 /*
  * Base register addresses
@@ -285,6 +286,7 @@ typedef volatile unsigned int *     dv_reg_p;
 
 #endif /* CONFIG_SOC_DA8XX */
 
+#ifndef __ASSEMBLY__
 void lpsc_on(unsigned int id);
 void lpsc_syncreset(unsigned int id);
 void lpsc_disable(unsigned int id);
@@ -625,5 +627,6 @@ static inline enum davinci_clk_ids get_async3_src(void)
 #define FLAG_FLGOFF            0x00000010
 
 #endif
+#endif /* !__ASSEMBLY__ */
 
 #endif /* __ASM_ARCH_HARDWARE_H */

diff --git a/include/common.h b/include/common.h
index 19839b67f1f1c53fa847476da396b7e867d8414c..b97b61d65d7eab25944a25935461c6252a64703c 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -31,9 +31,6 @@ typedef volatile unsigned char        vu_char;
 #include <stdarg.h>
 #include <linux/kernel.h>
 
-#ifdef CONFIG_SOC_DA8XX
-#include <asm/arch/hardware.h>
-#endif
 #ifdef CONFIG_FSL_LSCH3
 #include <asm/arch/immap_lsch3.h>
 #endif

diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 29d3bdacacbb75ceca848002135e46e6b6c17f23..d43e3314a75823f5377244c0f09d3877195068e5 100644 (file)
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -316,4 +316,6 @@
 int calimain_get_osc_freq(void);
 #endif
 
+#include <asm/arch/hardware.h>
+
 #endif /* __CONFIG_H */

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index f46f46619678635ee959f2fabd630327f5dd472c..b7199bb9e021fabd37870f6e69c7cfa749863af9 100644 (file)
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -330,4 +330,7 @@
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
                                        GENERATED_GBL_DATA_SIZE)
 #endif /* CONFIG_DIRECT_NOR_BOOT */
+
+#include <asm/arch/hardware.h>
+
 #endif /* __CONFIG_H */

diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index fc0f5e60177a59d63a4d00b9ab7eb858072c7fec..6fc6ec90af5c687ad1e837d67f556a404ecc7998 100644 (file)
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -270,4 +270,6 @@
        "ubootupd_nand=echo run load_magic,run load_nand,run upd;\0"    \
        "bootcmd=run net_testrfs\0"
 
+#include <asm/arch/hardware.h>
+
 #endif /* __CONFIG_H */

diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index 127e7e73962246831f68d26d2ac8984c9b977dba..f78aa47ae26669d0829c6a31cb0bfbb0df1ed37d 100644 (file)
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -301,4 +301,6 @@
 #define CONFIG_IPAM390_GPIO_LED_RED    ((16 * 7) + 11)
 #define CONFIG_IPAM390_GPIO_LED_GREEN  ((16 * 7) + 12)
 
+#include <asm/arch/hardware.h>
+
 #endif /* __CONFIG_H */

diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index f230f40d76e9fe51db088d1eb72d1d2147d14754..15da4074f269e32560a7f923e05026c60f0cf124 100644 (file)
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -214,4 +214,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80010000
 
+#include <asm/arch/hardware.h>
+
 #endif /* __CONFIG_H */

diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 8904cd5cc772aa8bd5c0ae7fd1116fe2107bd49e..0a8096cc76f7487f3656c8e3cc5ec5bb2023dd80 100644 (file)
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -341,4 +341,7 @@
 #define CONFIG_SYS_SDRAM_BASE          0xc0000000
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
                                        GENERATED_GBL_DATA_SIZE)
+
+#include <asm/arch/hardware.h>
+
 #endif /* __CONFIG_H */