[PATCH] ARM: EXYNOS: Fix MSHC clocks instance names

[Thomas Abraham]

Hi Dongjin,

On 14 December 2012 20:29, Dongjin Kim <tobetter at gmail.com> wrote:
> Replace clock instance name of MSHC controller for BIC and CIU of Exynos4412.
>
> Signed-off-by: Dongjin Kim <tobetter at gmail.com>
> ---
>  arch/arm/mach-exynos/clock-exynos4.c |   25 ++++++++++++++-----------
>  1 file changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c
> index efead60..ae83011 100644
> --- a/arch/arm/mach-exynos/clock-exynos4.c
> +++ b/arch/arm/mach-exynos/clock-exynos4.c
> @@ -529,8 +529,8 @@ static struct clk exynos4_init_clocks_off[] = {
>                 .enable         = exynos4_clk_ip_fsys_ctrl,
>                 .ctrlbit        = (1 << 8),
>         }, {
> -               .name           = "dwmmc",
> -               .parent         = &exynos4_clk_aclk_133.clk,
> +               .name           = "biu",
> +               .parent         = &exynos4_clk_aclk_200.clk,
>                 .enable         = exynos4_clk_ip_fsys_ctrl,
>                 .ctrlbit        = (1 << 9),
>         }, {
> @@ -1132,15 +1132,7 @@ static struct clksrc_clk exynos4_clksrcs[] = {
>                 .sources = &exynos4_clkset_mout_mfc,
>                 .reg_src = { .reg = EXYNOS4_CLKSRC_MFC, .shift = 8, .size = 1 },
>                 .reg_div = { .reg = EXYNOS4_CLKDIV_MFC, .shift = 0, .size = 4 },
> -       }, {
> -               .clk    = {
> -                       .name           = "sclk_dwmmc",
> -                       .parent         = &exynos4_clk_dout_mmc4.clk,
> -                       .enable         = exynos4_clksrc_mask_fsys_ctrl,
> -                       .ctrlbit        = (1 << 16),
> -               },
> -               .reg_div = { .reg = EXYNOS4_CLKDIV_FSYS3, .shift = 8, .size = 8 },
> -       }
> +       },
>  };
>
>  static struct clksrc_clk exynos4_clk_sclk_uart0 = {
> @@ -1235,6 +1227,16 @@ static struct clksrc_clk exynos4_clk_sclk_mmc3 = {
>         .reg_div = { .reg = EXYNOS4_CLKDIV_FSYS2, .shift = 24, .size = 8 },
>  };
>
> +static struct clksrc_clk exynos4_clk_sclk_dwmci = {
> +       .clk    = {
> +               .name           = "ciu",
> +               .parent         = &exynos4_clk_dout_mmc4.clk,
> +               .enable         = exynos4_clksrc_mask_fsys_ctrl,
> +               .ctrlbit        = (1 << 16),
> +       },
> +       .reg_div = { .reg = EXYNOS4_CLKDIV_FSYS3, .shift = 8, .size = 8 },
> +};
> +

It is not required to move the above clock instance out of the
exynos4_clksrcs[] array. Just changing the clock name to 'ciu' is
sufficient. And this will avoid the below change as well.

>  static struct clksrc_clk exynos4_clk_mdout_spi0 = {
>         .clk    = {
>                 .name           = "mdout_spi",
> @@ -1348,6 +1350,7 @@ static struct clksrc_clk *exynos4_clksrc_cdev[] = {
>         &exynos4_clk_sclk_mmc1,
>         &exynos4_clk_sclk_mmc2,
>         &exynos4_clk_sclk_mmc3,
> +       &exynos4_clk_sclk_dwmci,
>         &exynos4_clk_sclk_spi0,
>         &exynos4_clk_sclk_spi1,
>         &exynos4_clk_sclk_spi2,
> --
> 1.7.9.5

Thanks,
Thomas.