get_clocks() should not be limited by ESDHC.

Signed-off-by: Gong Qianyu Qianyu.Gong@freescale.com --- common/board_f.c | 2 +- include/configs/BSC9132QDS.h | 1 + include/configs/MPC8308RDB.h | 1 + include/configs/MPC837XEMDS.h | 1 + include/configs/MPC837XERDB.h | 1 + include/configs/MPC8536DS.h | 1 + include/configs/MPC8569MDS.h | 1 + include/configs/P1010RDB.h | 1 + include/configs/P1022DS.h | 1 + include/configs/P2041RDB.h | 1 + include/configs/T102xQDS.h | 1 + include/configs/T102xRDB.h | 1 + include/configs/T1040QDS.h | 1 + include/configs/T104xRDB.h | 1 + include/configs/T208xQDS.h | 1 + include/configs/T208xRDB.h | 1 + include/configs/T4240QDS.h | 1 + include/configs/T4240RDB.h | 1 + include/configs/UCP1020.h | 1 + include/configs/colibri_vf.h | 1 + include/configs/controlcenterd.h | 1 + include/configs/corenet_ds.h | 1 + include/configs/hrcon.h | 1 + include/configs/ima3-mx53.h | 1 + include/configs/ls1021aqds.h | 1 + include/configs/ls1021atwr.h | 1 + include/configs/ls2085aqds.h | 1 + include/configs/ls2085ardb.h | 1 + include/configs/m53evk.h | 1 + include/configs/mx25pdk.h | 1 + include/configs/mx35pdk.h | 1 + include/configs/mx51_efikamx.h | 1 + include/configs/mx51evk.h | 1 + include/configs/mx53ard.h | 1 + include/configs/mx53evk.h | 1 + include/configs/mx53loco.h | 1 + include/configs/mx53smd.h | 1 + include/configs/mx6_common.h | 1 + include/configs/p1_p2_rdb_pc.h | 1 + include/configs/p1_twr.h | 1 + include/configs/usbarmory.h | 1 + include/configs/vf610twr.h | 1 + include/configs/vision2.h | 1 + include/configs/woodburn_common.h | 1 + 44 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/common/board_f.c b/common/board_f.c index 613332e..1bb84b3 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -806,7 +806,7 @@ static init_fnc_t init_sequence_f[] = { #if defined(CONFIG_BOARD_POSTCLK_INIT) board_postclk_init, #endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_CLK get_clocks, #endif #ifdef CONFIG_M68K diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 804493e..1e42019 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -18,6 +18,7 @@ #define CONFIG_BSC9132 #endif

+#define CONFIG_FSL_CLK #define CONFIG_MISC_INIT_R

#ifdef CONFIG_SDCARD diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 4150d5a..f4040cd 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -11,6 +11,7 @@

#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK

/* * High Level Configuration Options diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index cebd175..46ecada 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -10,6 +10,7 @@

#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK

/* * High Level Configuration Options diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 5c6ad19..3216002 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -17,6 +17,7 @@ #define CONFIG_MPC837XERDB 1 #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK

#define CONFIG_SYS_TEXT_BASE 0xFE000000

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 1312438..fe2f398 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -13,6 +13,7 @@

#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #include "../board/freescale/common/ics307_clk.h"

#ifdef CONFIG_36BIT diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 9e38724..fd8aa68 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -13,6 +13,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO

+#define CONFIG_FSL_CLK /* High Level Configuration Options */ #define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_E500 1 /* BOOKE e500 family */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 8ac7000..bd2cd7f 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -16,6 +16,7 @@ #endif #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK

#define CONFIG_P1010 #define CONFIG_E500 /* BOOKE e500 family */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 06b293f..5c8652c 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -13,6 +13,7 @@

#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK

#ifdef CONFIG_36BIT #define CONFIG_PHYS_64BIT diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 5468495..f86056b 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -16,6 +16,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_PPC_P2041 +#define CONFIG_FSL_CLK

#ifdef CONFIG_RAMBOOT_PBL #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 92f51f6..94c8258 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -21,6 +21,7 @@ #define CONFIG_MP /* support multiple processors */ #define CONFIG_PHYS_64BIT #define CONFIG_ENABLE_36BIT_PHYS +#define CONFIG_FSL_CLK

#ifdef CONFIG_PHYS_64BIT #define CONFIG_ADDR_MAP 1 diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 324f710..640fb9f 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -21,6 +21,7 @@ #define CONFIG_MP /* support multiple processors */ #define CONFIG_PHYS_64BIT #define CONFIG_ENABLE_36BIT_PHYS +#define CONFIG_FSL_CLK

#ifdef CONFIG_PHYS_64BIT #define CONFIG_ADDR_MAP 1 diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 1f46160..1b190e3 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -30,6 +30,7 @@ #define CONFIG_PHYS_64BIT #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK

#ifdef CONFIG_RAMBOOT_PBL #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index cd5b3e2..71ea2ec 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -14,6 +14,7 @@ #define CONFIG_PHYS_64BIT #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK

#define CONFIG_E500 /* BOOKE e500 family */ #include <asm/config_mpc85xx.h> diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 23ca0cf..292cbe9 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -14,6 +14,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ +#define CONFIG_FSL_CLK #define CONFIG_MMC #define CONFIG_USB_EHCI #if defined(CONFIG_PPC_T2080) diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index ef42b88..2cd7260 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -15,6 +15,7 @@ #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_T2080RDB #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ +#define CONFIG_FSL_CLK #define CONFIG_MMC #define CONFIG_USB_EHCI #define CONFIG_FSL_SATA_V2 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 4edb3cb..dd8dd73 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -12,6 +12,7 @@

#define CONFIG_T4240QDS #define CONFIG_PHYS_64BIT +#define CONFIG_FSL_CLK

#define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE4 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index d43f6b7..8be76f7 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -14,6 +14,7 @@ #define CONFIG_PHYS_64BIT #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK

#define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE4 diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 629be99..29c4ad5 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -16,6 +16,7 @@

#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK

#define CONFIG_FSL_ELBC #define CONFIG_PCI diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 2583155..5bd742d 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -18,6 +18,7 @@ #define CONFIG_SYS_THUMB_BUILD #define CONFIG_USE_ARCH_MEMCPY #define CONFIG_USE_ARCH_MEMSET +#define CONFIG_FSL_CLK

#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_ARCH_MISC_INIT diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 9a1f6d0..0e3052d 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -44,6 +44,7 @@ #define CONFIG_P1022 #define CONFIG_CONTROLCENTERD #define CONFIG_MP /* support multiple processors */ +#define CONFIG_FSL_CLK

#define CONFIG_SYS_GENERIC_BOARD

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 2919220..94184d7 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -12,6 +12,7 @@

#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK

#include "../board/freescale/common/ics307_clk.h"

diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 558edfc..fc70d57 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -24,6 +24,7 @@

#define CONFIG_SYS_GENERIC_BOARD

+#define CONFIG_FSL_CLK #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h index 2fa6c3d..c2a5ec3 100644 --- a/include/configs/ima3-mx53.h +++ b/include/configs/ima3-mx53.h @@ -17,6 +17,7 @@

#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK

#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 0234e32..c02cefa 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -12,6 +12,7 @@ #define CONFIG_ARMV7_PSCI

#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK

#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index f561cbe..66f487d 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -12,6 +12,7 @@ #define CONFIG_ARMV7_PSCI

#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK

#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/ls2085aqds.h b/include/configs/ls2085aqds.h index f7f3870..4cfcf98 100644 --- a/include/configs/ls2085aqds.h +++ b/include/configs/ls2085aqds.h @@ -16,6 +16,7 @@ unsigned long get_board_sys_clk(void); unsigned long get_board_ddr_clk(void); #endif

+#define CONFIG_FSL_CLK #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() #define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) diff --git a/include/configs/ls2085ardb.h b/include/configs/ls2085ardb.h index a190bc7..583fed5 100644 --- a/include/configs/ls2085ardb.h +++ b/include/configs/ls2085ardb.h @@ -18,6 +18,7 @@ unsigned long get_board_sys_clk(void); #endif

+#define CONFIG_FSL_CLK #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() #define CONFIG_DDR_CLK_FREQ 133333333 #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 35058e2..4d37785 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -18,6 +18,7 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_REVISION_TAG #define CONFIG_SYS_NO_FLASH +#define CONFIG_FSL_CLK

#define CONFIG_FIT

diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index bd7216e..105ac6d 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -15,6 +15,7 @@ #define CONFIG_SYS_TEXT_BASE 0x81200000 #define CONFIG_MXC_GPIO #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK

#define CONFIG_SYS_TIMER_RATE 32768 #define CONFIG_SYS_TIMER_COUNTER \ diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index c9983f3..97527b6 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -20,6 +20,7 @@

#define CONFIG_DISPLAY_CPUINFO #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK

/* Set TEXT at the beginning of the NOR flash */ #define CONFIG_SYS_TEXT_BASE 0xA0000000 diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h index 373cfcb..b1b83e6 100644 --- a/include/configs/mx51_efikamx.h +++ b/include/configs/mx51_efikamx.h @@ -25,6 +25,7 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO

+#define CONFIG_FSL_CLK #define CONFIG_SYS_TEXT_BASE 0x97800000

#define CONFIG_SYS_ICACHE_OFF diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 2203c15..e3763c1 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -18,6 +18,7 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO

+#define CONFIG_FSL_CLK #define CONFIG_SYS_TEXT_BASE 0x97800000

#include <asm/arch/imx-regs.h> diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 0479195..d57e06d 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -24,6 +24,7 @@ #define CONFIG_REVISION_TAG

#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK

/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 82c8af8..6cae6d5 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -24,6 +24,7 @@ #define CONFIG_REVISION_TAG

#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK

#define CONFIG_OF_LIBFDT

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index ad2629d..540f853 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -23,6 +23,7 @@ #define CONFIG_INITRD_TAG

#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK

/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index bcdb054..0a5f50e 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -24,6 +24,7 @@ #define CONFIG_REVISION_TAG

#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK

/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index ef4cb68..c157e81 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -46,6 +46,7 @@ #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_CPUINFO #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_FSL_CLK

/* ATAGs */ #define CONFIG_CMDLINE_TAG diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index af89e6b..9a387e1 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -12,6 +12,7 @@

#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK

#ifdef CONFIG_36BIT #define CONFIG_PHYS_64BIT diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index e9cc274..190571a 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -12,6 +12,7 @@

#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #if defined(CONFIG_TWR_P1025) #define CONFIG_BOARDNAME "TWR-P1025" #define CONFIG_P1025 diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 4a7702c..6ba5086 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -14,6 +14,7 @@ #define CONFIG_MX53 #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_OF_LIBFDT #define CONFIG_SYS_GENERIC_BOARD diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index c5131af..ba5bc29 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -16,6 +16,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_FSL_CLK

#define CONFIG_MACH_TYPE 4146

diff --git a/include/configs/vision2.h b/include/configs/vision2.h index b43373f..c11c2a9 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -14,6 +14,7 @@

#define CONFIG_MX51 /* in a mx51 */ #define CONFIG_SYS_TEXT_BASE 0x97800000 +#define CONFIG_FSL_CLK

#include <asm/arch/imx-regs.h>

diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 5d9f529..53f91c6 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -16,6 +16,7 @@ /* High Level Configuration Options */ #define CONFIG_MX35 #define CONFIG_MX35_HCLK_FREQ 24000000 +#define CONFIG_FSL_CLK

#define CONFIG_SYS_DCACHE_OFF #define CONFIG_SYS_CACHELINE_SIZE 32