ARM: imx35: Do not call mxc_timer_init twice when booting with DT
Subsystems (3)
PATCH v2 1/2 ARM: imx35: Do not call mxc_timer_init twice when booting with DT
mxc_timer_init must not be called from within mx35_clocks_init_dt. It will eventually be called by imx31_timer_init_dt (drivers/clocksource/timer-imx-gpt.c).
This arranges the initialization code similar to clk-imx27.c
---
Change in v2:
* Fix typo
drivers/clk/imx/clk-imx35.c | 49 +++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 22 deletions(-)
drivers/clk/imx/clk-imx35.c +27 -22
@@ -84,7 +84,7 @@ enum mx35_clks {static struct clk *clk[clk_max]; -int __init mx35_clocks_init (void ) +static void __init _mx35_clocks_init (void ) {void __iomem *base;u32 pdr0, consumer_sel, hsp_sel;
@@ -219,6 +219,30 @@ int __init mx35_clocks_init(void)imx_check_clocks (clk,ARRAY_SIZE (clk)); +clk_prepare_enable (clk[spba_gate]); +clk_prepare_enable (clk[gpio1_gate]); +clk_prepare_enable (clk[gpio2_gate]); +clk_prepare_enable (clk[gpio3_gate]); +clk_prepare_enable (clk[iim_gate]); +clk_prepare_enable (clk[emi_gate]); +clk_prepare_enable (clk[max_gate]); +clk_prepare_enable (clk[iomuxc_gate]); + +/* +* SCC is needed to boot via mmc after a watchdog reset. The clock code +* before conversion to common clk also enabled UART1 (which isn't +* handled here and not needed for mmc) and IIM (which is enabled +* unconditionally above). +*/ +clk_prepare_enable (clk[scc_gate]); + +imx_print_silicon_rev ("i.MX35" ,mx35_revision ()); +} + +int __init mx35_clocks_init (void ) +{ +_mx35_clocks_init (); +clk_register_clkdev (clk[pata_gate],NULL ,"pata_imx" );clk_register_clkdev (clk[can1_gate],NULL ,"flexcan.0" );clk_register_clkdev (clk[can2_gate],NULL ,"flexcan.1" );
@@ -275,25 +299,6 @@ int __init mx35_clocks_init(void)clk_register_clkdev (clk[csi_gate],NULL ,"mx3-camera.0" );clk_register_clkdev (clk[admux_gate],"audmux" ,NULL ); -clk_prepare_enable (clk[spba_gate]); -clk_prepare_enable (clk[gpio1_gate]); -clk_prepare_enable (clk[gpio2_gate]); -clk_prepare_enable (clk[gpio3_gate]); -clk_prepare_enable (clk[iim_gate]); -clk_prepare_enable (clk[emi_gate]); -clk_prepare_enable (clk[max_gate]); -clk_prepare_enable (clk[iomuxc_gate]); - -/* -* SCC is needed to boot via mmc after a watchdog reset. The clock code -* before conversion to common clk also enabled UART1 (which isn't -* handled here and not needed for mmc) and IIM (which is enabled -* unconditionally above). -*/ -clk_prepare_enable (clk[scc_gate]); - -imx_print_silicon_rev ("i.MX35" ,mx35_revision ()); -mxc_timer_init (MX35_GPT1_BASE_ADDR ,MX35_INT_GPT ,GPT_TYPE_IMX31 );return 0 ;
@@ -301,10 +306,10 @@ int __init mx35_clocks_init(void)static void __init mx35_clocks_init_dt (struct device_node *ccm_node) { +_mx35_clocks_init (); + clk_data.clks = clk; clk_data.clk_num =ARRAY_SIZE (clk);of_clk_add_provider (ccm_node, of_clk_src_onecell_get, &clk_data); - -mx35_clocks_init (); }CLK_OF_DECLARE (imx35,"fsl,imx35-ccm" , mx35_clocks_init_dt);
Signature · 1 line
2.4.6
PATCH v2 2/2 ARM: imx31: Do not call mxc_timer_init twice when booting with DT
mxc_timer_init must not be called from within mx31_clocks_init_dt. It will eventually be called by imx31_timer_init_dt (drivers/clocksource/timer-imx-gpt.c).
This arranges the initialization code similar to clk-imx27.c
---
* Added in v2
* Compile tested only due to lack of hardware
drivers/clk/imx/clk-imx31.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/clk/imx/clk-imx31.c +13 -8
@@ -62,7 +62,7 @@ enum mx31_clks {static struct clk *clk[clk_max];static struct clk_onecell_data clk_data; -int __init mx31_clocks_init (unsigned long fref) +static void __init _mx31_clocks_init (unsigned long fref) {void __iomem *base;struct device_node *np;
@@ -132,6 +132,12 @@ int __init mx31_clocks_init(unsigned long fref)imx_check_clocks (clk,ARRAY_SIZE (clk)); +clk_set_parent (clk[csi], clk[upll]); +clk_prepare_enable (clk[emi_gate]); +clk_prepare_enable (clk[iim_gate]); +mx31_revision (); +clk_disable_unprepare (clk[iim_gate]); + np =of_find_compatible_node (NULL ,NULL ,"fsl,imx31-ccm" );if (np) {
@@ -139,6 +145,11 @@ int __init mx31_clocks_init(unsigned long fref) clk_data.clk_num =ARRAY_SIZE (clk);of_clk_add_provider (np, of_clk_src_onecell_get, &clk_data); } +} + +int __init mx31_clocks_init (void ) +{ +_mx31_clocks_init ();clk_register_clkdev (clk[gpt_gate],"per" ,"imx-gpt.0" );clk_register_clkdev (clk[ipg],"ipg" ,"imx-gpt.0" );
@@ -193,12 +204,6 @@ int __init mx31_clocks_init(unsigned long fref)clk_register_clkdev (clk[sdma_gate],NULL ,"imx31-sdma" );clk_register_clkdev (clk[iim_gate],"iim" ,NULL ); -clk_set_parent (clk[csi], clk[upll]); -clk_prepare_enable (clk[emi_gate]); -clk_prepare_enable (clk[iim_gate]); -mx31_revision (); -clk_disable_unprepare (clk[iim_gate]); -mxc_timer_init (MX31_GPT1_BASE_ADDR ,MX31_INT_GPT ,GPT_TYPE_IMX31 );return 0 ;
@@ -217,5 +222,5 @@ int __init mx31_clocks_init_dt(void)break ; } -return mx31_clocks_init (fref); +return _mx31_clocks_init (fref); }
Signature · 1 line
2.4.6
PATCH v2 2/2 ARM: imx31: Do not call mxc_timer_init twice when booting with DT
Quoted 9 lines · Alexander Stein
mxc_timer_initmust not be called from withinmx31_clocks_init_dt. It will eventually be called byimx31_timer_init_dt(drivers/clocksource/timer-imx-gpt.c).
This arranges the initialization code similar toclk-imx27.cSigned-off-by Alexander Stein <[email protected]>---
* Added in v2
* Compile tested only due to lack of hardware
Compile tested? I see the following compile issues.
CC drivers/clk/imx/clk-imx31.odrivers/clk/imx/clk-imx31.c: In function ?mx31_clocks_init?:drivers/clk/imx/clk-imx31.c:152:2: error: too few arguments to function ?_mx31_clocks_init? drivers/clk/imx/clk-imx31.c:65:20: note: declared heredrivers/clk/imx/clk-imx31.c: In function ?mx31_clocks_init_dt?:drivers/clk/imx/clk-imx31.c:226:2: error: void value not ignored as it ought to be drivers/clk/imx/clk-imx31.c:227:1: warning: control reaches end of non-void function [-Wreturn-type]
Shawn
Shawn Guo
AppliedPATCH v2 1/2 ARM: imx35: Do not call mxc_timer_init twice when booting with DT
In reply to Alexander SteinQuoted 9 lines · Alexander Stein
mxc_timer_initmust not be called from withinmx35_clocks_init_dt. It will eventually be called byimx31_timer_init_dt(drivers/clocksource/timer-imx-gpt.c).
This arranges the initialization code similar toclk-imx27.cSigned-off-by Alexander Stein <[email protected]>---
Change in v2:
* Fix typo
Applied this one, thanks.
PATCH v2 1/2 ARM: imx35: Do not call mxc_timer_init twice when booting with DT
In reply to Alexander SteinQuoted 5 lines · Alexander Stein
mxc_timer_initmust not be called from withinmx35_clocks_init_dt. It will eventually be called byimx31_timer_init_dt(drivers/clocksource/timer-imx-gpt.c).
This arranges the initialization code similar toclk-imx27.c
Quoted 7 lines
Signed-off-by Alexander Stein <[email protected]>---
Change in v2:
* Fix typodrivers/clk/imx/clk-imx35.c | 49 +++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 22 deletions(-)
Forgot mentioning that patches touching drivers/clk/ should be prefixed with 'clk: ...' in subject. I changed the subject of the patch to 'clk: imx35: ...' when applying.
Shawn