Re: [PATCH] clk: exynos5250: Fix parent clock for sclk_mmc{0,1,2,3}

[Mike Turquette <mturquette@linaro.org>]

Quoting Tushar Behera (2013-04-22 23:31:51)
> commit 688f7d8c9fef ("clk: exynos5250: Fix divider values for
> sclk_mmc{0,1,2,3}") incorrectly sets the divider for sclk_mmc{0,1,2,3}
> to fix the wrong clock value. Though this fixed issue with Arndale,
> it created regressions for other boards like Snow.
> 
> On Exynos5250, sclk_mmc<n> is generated like below (as per the clock
> names in drivers/clk/samsung/clk-exynos5250.c)
> 
> mout_group1_p ==> mout_mmc<n> ==>
>                 div_mmc<n> ==> div_mmc_pre<n> => sclk_mmc<n>
> 
> Earlier div_mmc<n> was set as the parent for sclk_mmc<n>, hence
> div_mmc_pre<n> was not getting referred in kernel code and depending
> on its value set during preboot, sclk_mmc<n> value was different for
> various boards.
> 
> Setting the correct clock generation path should fix the issues
> reported in above referenced commit. The changes committed during the
> earlier patch has also been reverted here.
> 
> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
> CC: Doug Anderson <dianders@chromium.org>

Change looks good to me.

Regards,
Mike

> ---
> Doug,
> 
> Would you please test whether this patch works for Snow?
> 
> 
>  drivers/clk/samsung/clk-exynos5250.c |   16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c
> index 7290faa..bb54606 100644
> --- a/drivers/clk/samsung/clk-exynos5250.c
> +++ b/drivers/clk/samsung/clk-exynos5250.c
> @@ -276,10 +276,10 @@ struct samsung_div_clock exynos5250_div_clks[] __initdata = {
>         DIV(none, "div_pcm0", "sclk_audio0", DIV_MAU, 4, 8),
>         DIV(none, "div_sata", "mout_sata", DIV_FSYS0, 20, 4),
>         DIV(none, "div_usb3", "mout_usb3", DIV_FSYS0, 24, 4),
> -       DIV(none, "div_mmc0", "mout_mmc0", DIV_FSYS1, 8, 8),
> -       DIV(none, "div_mmc1", "mout_mmc1", DIV_FSYS1, 24, 8),
> -       DIV(none, "div_mmc2", "mout_mmc2", DIV_FSYS2, 8, 8),
> -       DIV(none, "div_mmc3", "mout_mmc3", DIV_FSYS2, 24, 8),
> +       DIV(none, "div_mmc0", "mout_mmc0", DIV_FSYS1, 0, 4),
> +       DIV(none, "div_mmc1", "mout_mmc1", DIV_FSYS1, 16, 4),
> +       DIV(none, "div_mmc2", "mout_mmc2", DIV_FSYS2, 0, 4),
> +       DIV(none, "div_mmc3", "mout_mmc3", DIV_FSYS2, 16, 4),
>         DIV(none, "div_uart0", "mout_uart0", DIV_PERIC0, 0, 4),
>         DIV(none, "div_uart1", "mout_uart1", DIV_PERIC0, 4, 4),
>         DIV(none, "div_uart2", "mout_uart2", DIV_PERIC0, 8, 4),
> @@ -421,13 +421,13 @@ struct samsung_gate_clock exynos5250_gate_clks[] __initdata = {
>                         SRC_MASK_DISP1_0, 20, 0, 0),
>         GATE(sclk_audio0, "sclk_audio0", "div_audio0",
>                         SRC_MASK_MAU, 0, CLK_SET_RATE_PARENT, 0),
> -       GATE(sclk_mmc0, "sclk_mmc0", "div_mmc0",
> +       GATE(sclk_mmc0, "sclk_mmc0", "div_mmc_pre0",
>                         SRC_MASK_FSYS, 0, CLK_SET_RATE_PARENT, 0),
> -       GATE(sclk_mmc1, "sclk_mmc1", "div_mmc1",
> +       GATE(sclk_mmc1, "sclk_mmc1", "div_mmc_pre1",
>                         SRC_MASK_FSYS, 4, CLK_SET_RATE_PARENT, 0),
> -       GATE(sclk_mmc2, "sclk_mmc2", "div_mmc2",
> +       GATE(sclk_mmc2, "sclk_mmc2", "div_mmc_pre2",
>                         SRC_MASK_FSYS, 8, CLK_SET_RATE_PARENT, 0),
> -       GATE(sclk_mmc3, "sclk_mmc3", "div_mmc3",
> +       GATE(sclk_mmc3, "sclk_mmc3", "div_mmc_pre3",
>                         SRC_MASK_FSYS, 12, CLK_SET_RATE_PARENT, 0),
>         GATE(sclk_sata, "sclk_sata", "div_sata",
>                         SRC_MASK_FSYS, 24, CLK_SET_RATE_PARENT, 0),
> -- 
> 1.7.9.5