diff mbox

[1/2] ARM: clk-imx35: fix name for ckil clk

Message ID 1473327022-8065-1-git-send-email-u.kleine-koenig@pengutronix.de
State New
Headers show

Commit Message

Uwe Kleine-König Sept. 8, 2016, 9:30 a.m. UTC
This fixes
	[    0.000000] i.MX clk 82: register failed with -17
because the name is duplicated.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/clk/imx/clk-imx35.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Shawn Guo Sept. 9, 2016, 6:16 a.m. UTC | #1
On Thu, Sep 08, 2016 at 11:30:21AM +0200, Uwe Kleine-König wrote:
> This fixes
> 	[    0.000000] i.MX clk 82: register failed with -17
> because the name is duplicated.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

I did not queue any clock patches for this cycle.  Can you please send
the patches directly to clock maintainers?

Shawn

> ---
>  drivers/clk/imx/clk-imx35.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/imx/clk-imx35.c b/drivers/clk/imx/clk-imx35.c
> index b0978d3b83e2..d302ed3b8225 100644
> --- a/drivers/clk/imx/clk-imx35.c
> +++ b/drivers/clk/imx/clk-imx35.c
> @@ -115,7 +115,7 @@ static void __init _mx35_clocks_init(void)
>  	}
>  
>  	clk[ckih] = imx_clk_fixed("ckih", 24000000);
> -	clk[ckil] = imx_clk_fixed("ckih", 32768);
> +	clk[ckil] = imx_clk_fixed("ckil", 32768);
>  	clk[mpll] = imx_clk_pllv1(IMX_PLLV1_IMX35, "mpll", "ckih", base + MX35_CCM_MPCTL);
>  	clk[ppll] = imx_clk_pllv1(IMX_PLLV1_IMX35, "ppll", "ckih", base + MX35_CCM_PPCTL);
>  
> -- 
> 2.8.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Uwe Kleine-König Sept. 9, 2016, 6:20 a.m. UTC | #2
To += mturquette, sboyd

Hello Shawn, hello Michael, hello Stephen,

On Fri, Sep 09, 2016 at 02:16:31PM +0800, Shawn Guo wrote:
> On Thu, Sep 08, 2016 at 11:30:21AM +0200, Uwe Kleine-König wrote:
> > This fixes
> > 	[    0.000000] i.MX clk 82: register failed with -17
> > because the name is duplicated.
> > 
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> I did not queue any clock patches for this cycle.  Can you please send
> the patches directly to clock maintainers?

@shawnguo: Is this an ack?
@mturquette, sboyd: should I resend? IMHO the first patch should go in
soon.

Best regards
Uwe
Shawn Guo Sept. 9, 2016, 6:28 a.m. UTC | #3
On Fri, Sep 09, 2016 at 08:20:34AM +0200, Uwe Kleine-König wrote:
> To += mturquette, sboyd
> 
> Hello Shawn, hello Michael, hello Stephen,
> 
> On Fri, Sep 09, 2016 at 02:16:31PM +0800, Shawn Guo wrote:
> > On Thu, Sep 08, 2016 at 11:30:21AM +0200, Uwe Kleine-König wrote:
> > > This fixes
> > > 	[    0.000000] i.MX clk 82: register failed with -17
> > > because the name is duplicated.
> > > 
> > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > 
> > I did not queue any clock patches for this cycle.  Can you please send
> > the patches directly to clock maintainers?
> 
> @shawnguo: Is this an ack?

Yes,

Acked-by: Shawn Guo <shawnguo@kernel.org>

> @mturquette, sboyd: should I resend? IMHO the first patch should go in
> soon.
> 
> Best regards
> Uwe
> 
> -- 
> Pengutronix e.K.                           | Uwe Kleine-König            |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Stephen Boyd Sept. 9, 2016, 6:11 p.m. UTC | #4
On 09/09, Uwe Kleine-König wrote:
> To += mturquette, sboyd
> 
> Hello Shawn, hello Michael, hello Stephen,
> 
> On Fri, Sep 09, 2016 at 02:16:31PM +0800, Shawn Guo wrote:
> > On Thu, Sep 08, 2016 at 11:30:21AM +0200, Uwe Kleine-König wrote:
> > > This fixes
> > > 	[    0.000000] i.MX clk 82: register failed with -17
> > > because the name is duplicated.
> > > 
> > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > 
> > I did not queue any clock patches for this cycle.  Can you please send
> > the patches directly to clock maintainers?
> 
> @shawnguo: Is this an ack?
> @mturquette, sboyd: should I resend? IMHO the first patch should go in
> soon.

Does the first patch need a fixes tag? We can apply them
directly.
Uwe Kleine-König Sept. 9, 2016, 7:15 p.m. UTC | #5
On Fri, Sep 09, 2016 at 11:11:38AM -0700, Stephen Boyd wrote:
> On 09/09, Uwe Kleine-König wrote:
> > To += mturquette, sboyd
> > 
> > Hello Shawn, hello Michael, hello Stephen,
> > 
> > On Fri, Sep 09, 2016 at 02:16:31PM +0800, Shawn Guo wrote:
> > > On Thu, Sep 08, 2016 at 11:30:21AM +0200, Uwe Kleine-König wrote:
> > > > This fixes
> > > > 	[    0.000000] i.MX clk 82: register failed with -17
> > > > because the name is duplicated.
> > > > 
> > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > > 
> > > I did not queue any clock patches for this cycle.  Can you please send
> > > the patches directly to clock maintainers?
> > 
> > @shawnguo: Is this an ack?
> > @mturquette, sboyd: should I resend? IMHO the first patch should go in
> > soon.
> 
> Does the first patch need a fixes tag? We can apply them
> directly.

The breakage was introduced by v4.3-rc2~4^2~71^2, i.e.
3713e3f5e927 (clk: imx35: define two clocks for rtc).

Best regards
Uwe
Stephen Boyd Sept. 14, 2016, 6:28 p.m. UTC | #6
On 09/08, Uwe Kleine-König wrote:
> This fixes
> 	[    0.000000] i.MX clk 82: register failed with -17
> because the name is duplicated.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---

Applied to clk-next
diff mbox

Patch

diff --git a/drivers/clk/imx/clk-imx35.c b/drivers/clk/imx/clk-imx35.c
index b0978d3b83e2..d302ed3b8225 100644
--- a/drivers/clk/imx/clk-imx35.c
+++ b/drivers/clk/imx/clk-imx35.c
@@ -115,7 +115,7 @@  static void __init _mx35_clocks_init(void)
 	}
 
 	clk[ckih] = imx_clk_fixed("ckih", 24000000);
-	clk[ckil] = imx_clk_fixed("ckih", 32768);
+	clk[ckil] = imx_clk_fixed("ckil", 32768);
 	clk[mpll] = imx_clk_pllv1(IMX_PLLV1_IMX35, "mpll", "ckih", base + MX35_CCM_MPCTL);
 	clk[ppll] = imx_clk_pllv1(IMX_PLLV1_IMX35, "ppll", "ckih", base + MX35_CCM_PPCTL);