diff mbox

[U-Boot,V5,02/17] common/board_f.c: modify the macro to use get_clocks() more common

Message ID 1444914162-34502-3-git-send-email-Qianyu.Gong@freescale.com
State Superseded
Delegated to: York Sun
Headers show

Commit Message

Gong Qianyu Oct. 15, 2015, 1:02 p.m. UTC
get_clocks() should not be limited by ESDHC.

Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com>
---
V5:
 - No change.
V4:
 - No change.
V3:
 - Removed defines in PPC configs that have no need to use.
V2:
 - No change.

 common/board_f.c                  | 2 +-
 include/configs/colibri_vf.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/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/mx7_common.h      | 1 +
 include/configs/usbarmory.h       | 1 +
 include/configs/vf610twr.h        | 1 +
 include/configs/woodburn_common.h | 1 +
 19 files changed, 19 insertions(+), 1 deletion(-)

Comments

Prabhakar Kushwaha Oct. 16, 2015, 4:07 a.m. UTC | #1
> -----Original Message-----
> From: Gong Qianyu [mailto:Qianyu.Gong@freescale.com]
> Sent: Thursday, October 15, 2015 6:32 PM
> To: u-boot@lists.denx.de
> Cc: Hu Mingkai-B21284 <Mingkai.Hu@freescale.com>; Sun York-R58495
> <yorksun@freescale.com>; Hou Zhiqiang-B48286 <B48286@freescale.com>;
> Xie Shaohui-B21989 <Shaohui.Xie@freescale.com>; Song Wenbin-B53747
> <Wenbin.Song@freescale.com>; Wood Scott-B07421
> <scottwood@freescale.com>; Kushwaha Prabhakar-B32579
> <prabhakar@freescale.com>; Wang Huan-B18965
> <alison.wang@freescale.com>; Gong Qianyu-B52263
> <Qianyu.Gong@freescale.com>
> Subject: [Patch V5 02/17] common/board_f.c: modify the macro to use
> get_clocks() more common
> 
> get_clocks() should not be limited by ESDHC.
> 
> Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com>
> ---
> V5:
>  - No change.
> V4:
>  - No change.
> V3:
>  - Removed defines in PPC configs that have no need to use.
> V2:
>  - No change.
> 
>  common/board_f.c                  | 2 +-
>  include/configs/colibri_vf.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/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/mx7_common.h      | 1 +
>  include/configs/usbarmory.h       | 1 +
>  include/configs/vf610twr.h        | 1 +
>  include/configs/woodburn_common.h | 1 +
>  19 files changed, 19 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

New define CONFIG_FSL_CLK used. Please add its description in README file.

Also, is there no need of  defining CONFIG_FSL_CLK for PowerPC platforms?

--prabhakar
Gong Qianyu Oct. 16, 2015, 6:56 a.m. UTC | #2
> -----Original Message-----
> From: Kushwaha Prabhakar-B32579
> Sent: Friday, October 16, 2015 12:08 PM
> To: Gong Qianyu-B52263; u-boot@lists.denx.de
> Cc: Hu Mingkai-B21284; Sun York-R58495; Hou Zhiqiang-B48286; Xie Shaohui-
> B21989; Song Wenbin-B53747; Wood Scott-B07421; Wang Huan-B18965; Gong
> Qianyu-B52263
> Subject: RE: [Patch V5 02/17] common/board_f.c: modify the macro to use
> get_clocks() more common
> 
> 
> > -----Original Message-----
> > From: Gong Qianyu [mailto:Qianyu.Gong@freescale.com]
> > Sent: Thursday, October 15, 2015 6:32 PM
> > To: u-boot@lists.denx.de
> > Cc: Hu Mingkai-B21284 <Mingkai.Hu@freescale.com>; Sun York-R58495
> > <yorksun@freescale.com>; Hou Zhiqiang-B48286 <B48286@freescale.com>;
> > Xie Shaohui-B21989 <Shaohui.Xie@freescale.com>; Song Wenbin-B53747
> > <Wenbin.Song@freescale.com>; Wood Scott-B07421
> > <scottwood@freescale.com>; Kushwaha Prabhakar-B32579
> > <prabhakar@freescale.com>; Wang Huan-B18965
> > <alison.wang@freescale.com>; Gong Qianyu-B52263
> > <Qianyu.Gong@freescale.com>
> > Subject: [Patch V5 02/17] common/board_f.c: modify the macro to use
> > get_clocks() more common
> >
> > get_clocks() should not be limited by ESDHC.
> >
> > Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com>
> > ---
> > V5:
> >  - No change.
> > V4:
> >  - No change.
> > V3:
> >  - Removed defines in PPC configs that have no need to use.
> > V2:
> >  - No change.
> >
> >  common/board_f.c                  | 2 +-
> >  include/configs/colibri_vf.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/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/mx7_common.h      | 1 +
> >  include/configs/usbarmory.h       | 1 +
> >  include/configs/vf610twr.h        | 1 +
> >  include/configs/woodburn_common.h | 1 +
> >  19 files changed, 19 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
> 
> New define CONFIG_FSL_CLK used. Please add its description in README file.
> 
> Also, is there no need of  defining CONFIG_FSL_CLK for PowerPC platforms?
> 
> --prabhakar

No. They have already called the first get_clocks() in init_sequence_f[] as they define CONFIG_PPC.
CONFIG_FSL_CLK is then used to call the second get_clocks(), which may be redundant for PPC. 

Regards,
Qianyu
diff mbox

Patch

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/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/ls1021aqds.h b/include/configs/ls1021aqds.h
index 9b8b001..42b66b3 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 676c096..8a86473 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 8853d8f..456e5b4 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 0414086..afe2a02 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 6bfdaa6..dca2f86 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/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 b889c25..9ef973d 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 4f304ed..56ef9e6 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 3a65861..7b2917f 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 e46f2ee..5b21dd5 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/mx7_common.h b/include/configs/mx7_common.h
index ea2be49..85c8df8 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -21,6 +21,7 @@ 
 #define CONFIG_MXC_GPT_HCLK
 #define CONFIG_SYSCOUNTER_TIMER
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
+#define CONFIG_FSL_CLK
 
 /* Enable iomux-lpsr support */
 #define CONFIG_IOMUX_LPSR
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 714e3e2..e8cbd8f 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 324ba8f..a7c3e68 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/woodburn_common.h b/include/configs/woodburn_common.h
index fc46565..76d22e7 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