| Message ID | 1360028278-25856-1-git-send-email-b13634@freescale.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Feb 05, 2013 at 09:37:58AM +0800, Gary Zhang wrote: > in imx6q sabresd board, set ahb as CKO1 parent clock sourrce Can we have a comment in the code for what the CKO is used? I don't like this board specific clock tree hacking at all, but having no clue why this is done makes it harder to clean this up properly in the future. Sascha > > Signed-off-by: Gary Zhang <b13634@freescale.com> > --- > arch/arm/mach-imx/mach-imx6q.c | 14 +++++++++++--- > 1 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c > index 4eb1b3a..82c67de 100644 > --- a/arch/arm/mach-imx/mach-imx6q.c > +++ b/arch/arm/mach-imx/mach-imx6q.c > @@ -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,9 @@ 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); > + > put_clk: > if (!IS_ERR(cko1_sel)) > clk_put(cko1_sel); > @@ -148,7 +149,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 +199,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); > > -- > 1.7.0.4 > > >
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 4eb1b3a..82c67de 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -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,9 @@ 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); + put_clk: if (!IS_ERR(cko1_sel)) clk_put(cko1_sel); @@ -148,7 +149,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 +199,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);
in imx6q sabresd board, set ahb as CKO1 parent clock sourrce Signed-off-by: Gary Zhang <b13634@freescale.com> --- arch/arm/mach-imx/mach-imx6q.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)