common: arm: freescale: layerscape: Move header files out of common.h

We should not have an arch-specific header file in common.h. Adjust the
board files a little so it is not needed, and drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h b/arch/arm/include/asm/arch-fsl-layerscape/soc.h
index cc3b079bbfb8516ca8014ada369d545004f4b344..497afe7b15e337b2431f94bb09d3acd39cf5ec17 100644 (file)
--- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h
@@ -8,6 +8,16 @@
 #ifndef _ASM_ARMV8_FSL_LAYERSCAPE_SOC_H_
 #define _ASM_ARMV8_FSL_LAYERSCAPE_SOC_H_
 
+#ifndef __ASSEMBLY__
+#include <linux/types.h>
+#ifdef CONFIG_FSL_LSCH2
+#include <asm/arch/immap_lsch2.h>
+#endif
+#ifdef CONFIG_FSL_LSCH3
+#include <asm/arch/immap_lsch3.h>
+#endif
+#endif
+
 #ifdef CONFIG_SYS_FSL_CCSR_GUR_LE
 #define gur_in32(a)       in_le32(a)
 #define gur_out32(a, v)   out_le32(a, v)
@@ -120,4 +130,5 @@ void erratum_a010315(void);
 bool soc_has_dp_ddr(void);
 bool soc_has_aiop(void);
 #endif
+
 #endif /* _ASM_ARMV8_FSL_LAYERSCAPE_SOC_H_ */

diff --git a/arch/arm/include/asm/arch-ls102xa/clock.h b/arch/arm/include/asm/arch-ls102xa/clock.h
index c1efb9919eb720fc02dddc47d07c2a4282db4c84..a1d6afec9339a49b9a57b1f9f7a0b45d0f50a49c 100644 (file)
--- a/arch/arm/include/asm/arch-ls102xa/clock.h
+++ b/arch/arm/include/asm/arch-ls102xa/clock.h
@@ -19,6 +19,7 @@ enum mxc_clock {
 };
 
 unsigned int mxc_get_clock(enum mxc_clock clk);
+ulong get_ddr_freq(ulong);
 uint get_svr(void);
 
 #endif /* __ASM_ARCH_LS102XA_CLOCK_H_ */

diff --git a/arch/arm/include/asm/arch-ls102xa/soc.h b/arch/arm/include/asm/arch-ls102xa/soc.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index d42dca2f56d6b16f1f00686f40be024a7b0f61b2..c0ee858a02eeabd83981e8364fcc2be9e8218893 100644 (file)
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -16,7 +16,8 @@
 #include <fsl_ddr.h>
 #include <fsl_immap.h>
 #include <asm/io.h>
-#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3)
+#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
+       defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
 

diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c
index a0a25a7b21be9055b2dd440cedcaa7f2cb62460b..3349fc5c3b5907a4195c74b539dbb3002614d4e2 100644 (file)
--- a/drivers/ddr/fsl/fsl_ddr_gen4.c
+++ b/drivers/ddr/fsl/fsl_ddr_gen4.c
@@ -11,7 +11,8 @@
 #include <fsl_immap.h>
 #include <fsl_ddr.h>
 #include <fsl_errata.h>
-#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3)
+#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
+       defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
 

diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index 28b509c966608dc39b9f205127013d03ecf9bec9..20edd2dc28e54b48318af47e8cb9786daf483407 100644 (file)
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -9,7 +9,8 @@
 #include <fsl_ddr_sdram.h>
 
 #include <fsl_ddr.h>
-#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3)
+#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
+       defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
 

diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index f29d49da0e8534845a1f021eba54129c51399e46..0a305b36b8b1a71ad0f9853bb1b4aab3b51d4586 100644 (file)
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -13,7 +13,8 @@
 #include <fsl_ddr.h>
 #include <fsl_immap.h>
 #include <asm/io.h>
-#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3)
+#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
+       defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
 

diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c
index 31d80bb60640b3ff5a5a3e8b7dcfd50e29eceb25..4e642ae435a3be29341b5d61c2e619cbf6129593 100644 (file)
--- a/drivers/usb/common/fsl-errata.c
+++ b/drivers/usb/common/fsl-errata.c
@@ -9,7 +9,8 @@
 #include <common.h>
 #include <fsl_errata.h>
 #include<fsl_usb.h>
-#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3)
+#if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \
+       defined(CONFIG_ARM)
 #include <asm/arch/clock.h>
 #endif
 

diff --git a/include/common.h b/include/common.h
index b97b61d65d7eab25944a25935461c6252a64703c..a413f1ae9ba86725e94952155fa031c53ff684ba 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -31,13 +31,6 @@ typedef volatile unsigned char       vu_char;
 #include <stdarg.h>
 #include <linux/kernel.h>
 
-#ifdef CONFIG_FSL_LSCH3
-#include <asm/arch/immap_lsch3.h>
-#endif
-#ifdef CONFIG_FSL_LSCH2
-#include <asm/arch/immap_lsch2.h>
-#endif
-
 #include <part.h>
 #include <flash.h>
 #include <image.h>

diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index bd9b0d30a5b9348b37601306f806b1fd7c6a9c76..42bbc028d385ce54b7b411b70cf1ac6207be99a8 100644 (file)
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -121,4 +121,6 @@
 #define CONFIG_PANIC_HANG
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
+#include <asm/arch/soc.h>
+
 #endif /* __LS1012A_COMMON_H */

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 7fd3464fa594e9fcef352bfc6d459ee62e91beb7..32f7162bbc4c3d64fa8c631784871d29ef704259 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -300,4 +300,6 @@
 
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
+#include <asm/arch/soc.h>
+
 #endif /* __LS1043A_COMMON_H */

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index b66b8ac72c2369ce636fb2a60e1874c2c1761b5f..1b91676c2d1b1e8bd13b881faec9eb52363fef72 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -237,4 +237,6 @@
 
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
+#include <asm/arch/soc.h>
+
 #endif /* __LS1046A_COMMON_H */

diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index e311d0b149b01acbd9da9f0332256749646d9802..dbca05a3f6278a94bc8194df71175f9ea3367bab 100644 (file)
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -250,4 +250,6 @@ unsigned long long get_qixis_addr(void);
 
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
+#include <asm/arch/soc.h>
+
 #endif /* __LS2_COMMON_H */

diff --git a/include/fsl_ifc.h b/include/fsl_ifc.h
index a86f2162aa884308941eae3d53d8bb36e68b0f85..29aa687507813e950f3f752af6010ccb4b6d2f47 100644 (file)
--- a/include/fsl_ifc.h
+++ b/include/fsl_ifc.h
@@ -11,6 +11,9 @@
 #ifdef CONFIG_FSL_IFC
 #include <config.h>
 #include <common.h>
+#ifdef CONFIG_ARM
+#include <asm/arch/soc.h>
+#endif
 
 #define FSL_IFC_V1_1_0 0x01010000
 #define FSL_IFC_V2_0_0 0x02000000