ARM: imx: set CKO1 parent clock source in imx6q sabresd
Subsystems (3)
PATCH 2/2 ARM: imx: set CKO1 parent clock source in imx6q sabresd
in imx6q sabresd board, set ahb as CKO1 parent clock sourrce
--- arch/arm/mach-imx/mach-imx6q.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-)
arch/arm/mach-imx/mach-imx6q.c +12 -3
@@ -119,7 +119,7 @@ static int ksz9021rn_phy_fixup(struct phy_device *phydev)return 0 ; } -static void __init imx6q_sabrelite_cko1_setup (void ) +static void __init cko1_setup (unsigned long freq) {struct clk *cko1_sel, *ahb, *cko1;unsigned long rate;
@@ -132,8 +132,10 @@ static void __init imx6q_sabrelite_cko1_setup(void) goto put_clk; }clk_set_parent (cko1_sel, ahb); - rate =clk_round_rate (cko1,16000000 ); + rate =clk_round_rate (cko1, freq);clk_set_rate (cko1, rate); + +return ; put_clk:if (!IS_ERR (cko1_sel))clk_put (cko1_sel);
@@ -148,7 +150,12 @@ static void __init imx6q_sabrelite_init(void)if (IS_BUILTIN (CONFIG_PHYLIB ))phy_register_fixup_for_uid (PHY_ID_KSZ9021 ,MICREL_PHY_ID_MASK , ksz9021rn_phy_fixup); -imx6q_sabrelite_cko1_setup (); +cko1_setup (16000000 ); +} + +static void __init imx6q_sabresd_init (void ) +{ +cko1_setup (24000000 ); }static void __init imx6q_1588_init (void )
@@ -193,6 +200,8 @@ static void __init imx6q_init_machine(void) {if (of_machine_is_compatible ("fsl,imx6q-sabrelite" ))imx6q_sabrelite_init (); +else if (of_machine_is_compatible ("fsl,imx6q-sabresd" )) +imx6q_sabresd_init ();of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL );
Signature · 1 line
1.7.0.4
PATCH 2/2 ARM: imx: set CKO1 parent clock source in imx6q sabresd
Quoted 21 lines · Gary Zhang
in imx6q sabresd board, set ahb as CKO1 parent clock sourrce
Signed-off-by Gary Zhang <[email protected]>--- arch/arm/mach-imx/mach-imx6q.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-)arch/arm/mach-imx/mach-imx6q.c +1
-1@@ -119,7 +119,7 @@ static int ksz9021rn_phy_fixup(struct phy_device *phydev)return 0 ; } -static void __init imx6q_sabrelite_cko1_setup (void ) +static void __init cko1_setup (unsigned long freq) {struct clk *cko1_sel, *ahb, *cko1;unsigned long rate;
arch/arm/mach-imx/mach-imx6q.c static void __init imx6q_sabrelite_cko1_setup(void) · line 138
Quoted 8 lines
arch/arm/mach-imx/mach-imx6q.c +3
-1@@ -132,8 +132,10 @@ static void __init imx6q_sabrelite_cko1_setup(void) goto put_clk; }clk_set_parent (cko1_sel, ahb); - rate =clk_round_rate (cko1,16000000 ); + rate =clk_round_rate (cko1, freq);clk_set_rate (cko1, rate); + +return ;
Why does this "return" needs to be added here?
Shawn
Quoted 30 lines
arch/arm/mach-imx/mach-imx6q.c +8
-1put_clk:if (!IS_ERR (cko1_sel))clk_put (cko1_sel);@@ -148,7 +150,12 @@ static void __init imx6q_sabrelite_init(void)if (IS_BUILTIN (CONFIG_PHYLIB ))phy_register_fixup_for_uid (PHY_ID_KSZ9021 ,MICREL_PHY_ID_MASK , ksz9021rn_phy_fixup); -imx6q_sabrelite_cko1_setup (); +cko1_setup (16000000 ); +} + +static void __init imx6q_sabresd_init (void ) +{ +cko1_setup (24000000 ); }static void __init imx6q_1588_init (void )@@ -193,6 +200,8 @@ static void __init imx6q_init_machine(void) {if (of_machine_is_compatible ("fsl,imx6q-sabrelite" ))imx6q_sabrelite_init (); +else if (of_machine_is_compatible ("fsl,imx6q-sabresd" )) +imx6q_sabresd_init ();of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL );Signature · 1 line
1.7.0.4
PATCH 2/2 ARM: imx: set CKO1 parent clock source in imx6q sabresd
Hi Shawn,
Please see the feedback inline
Best Regards
Gary
Quoted 25 lines
-----Original Message-----
From: Shawn Guo [mailto:shawn.guo at linaro.org]
Sent: Sunday, February 03, 2013 18:47
To: Zhang Quan-B13634
Cc: kernel at pengutronix.de; linux at arm.linux.org.uk; linux-arm- kernel at lists.infradead.org
Subject: Re: [PATCH 2/2] ARM: imx: set CKO1 parent clock source in imx6q sabresdQuoted 15 lines · Gary Zhang
in imx6q sabresd board, set ahb as CKO1 parent clock sourrce
Signed-off-by Gary Zhang <[email protected]>--- arch/arm/mach-imx/mach-imx6q.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-)(quoted diff) +0
-0
b/arch/arm/mach-imx/mach-imx6q.cindex 4eb1b3a..860e272 100644arch/arm/mach-imx/mach-imx6q.c +0
-0@@ -119,7 +119,7 @@ static int ksz9021rn_phy_fixup(struct phy_device *phydev)return 0 ; }
Quoted 16 lines
Quoted 6 lines
arch/arm/mach-imx/mach-imx6q.c +1
-1-static void __init imx6q_sabrelite_cko1_setup (void ) +static void __init cko1_setup (unsigned long freq) {struct clk *cko1_sel, *ahb, *cko1;unsigned long rate;arch/arm/mach-imx/mach-imx6q.c static void __init imx6q_sabrelite_cko1_setup(void) · line 138
Quoted 8 lines
arch/arm/mach-imx/mach-imx6q.c +3
-1@@ -132,8 +132,10 @@ static void __init imx6q_sabrelite_cko1_setup(void) goto put_clk; }clk_set_parent (cko1_sel, ahb); - rate =clk_round_rate (cko1,16000000 ); + rate =clk_round_rate (cko1, freq);clk_set_rate (cko1, rate); + +return ;Why does this "return" needs to be added here?
[Gary-b13634] because the codes below may be ignored when execute 'return' , Saving cpu consumption.
Quoted 31 lines
Shawn
Quoted 28 lines
arch/arm/mach-imx/mach-imx6q.c +5
-1put_clk:if (!IS_ERR (cko1_sel))clk_put (cko1_sel);@@ -148,7 +150,12 @@ static void __init imx6q_sabrelite_init(void)if (IS_BUILTIN (CONFIG_PHYLIB ))phy_register_fixup_for_uid (PHY_ID_KSZ9021 ,MICREL_PHY_ID_MASK , ksz9021rn_phy_fixup); -imx6q_sabrelite_cko1_setup (); +cko1_setup (16000000 ); +} + +static void __init imx6q_sabresd_init (void ) { +cko1_setup (24000000 ); } static void __init imx6q_1588_init(void) @@ -193,6 +200,8 @@ staticvoid
__initimx6q_init_machine(void){arch/arm/mach-imx/mach-imx6q.c +2
-1if (of_machine_is_compatible ("fsl,imx6q-sabrelite" ))imx6q_sabrelite_init (); +else if (of_machine_is_compatible ("fsl,imx6q-sabresd" )) +imx6q_sabresd_init ();of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); --1.7.0.4
PATCH 2/2 ARM: imx: set CKO1 parent clock source in imx6q sabresd
Quoted 15 lines · On Mon, Feb 04, 2013 at 03:13:40AM +0000, Zhang Quan-B13634 wrote:
Quoted 15 lines
Quoted 14 lines
arch/arm/mach-imx/mach-imx6q.c +4
-2-static void __init imx6q_sabrelite_cko1_setup (void ) +static void __init cko1_setup (unsigned long freq) {struct clk *cko1_sel, *ahb, *cko1;unsigned long rate;@@ -132,8 +132,10 @@ static void __init imx6q_sabrelite_cko1_setup(void) goto put_clk; }clk_set_parent (cko1_sel, ahb); - rate =clk_round_rate (cko1,16000000 ); + rate =clk_round_rate (cko1, freq);clk_set_rate (cko1, rate); + +return ;
Quoted 3 lines
Quoted 1 line
Why does this "return" needs to be added here?
[Gary-b13634] because the codes below may be ignored when execute 'return' , Saving cpu consumption.
But we haven't finished our job. We need to "put" those clocks before returning to balance the "get" call.
Shawn