* [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk
@ 2016-09-08 9:30 Uwe Kleine-König
2016-09-08 9:30 ` [PATCH 2/2] ARM: clk-imx35: annotate clk enum with number values Uwe Kleine-König
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Uwe Kleine-König @ 2016-09-08 9:30 UTC (permalink / raw)
To: linux-arm-kernel
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(-)
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] ARM: clk-imx35: annotate clk enum with number values
2016-09-08 9:30 [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk Uwe Kleine-König
@ 2016-09-08 9:30 ` Uwe Kleine-König
2016-09-14 18:28 ` Stephen Boyd
2016-09-09 6:16 ` [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk Shawn Guo
2016-09-14 18:28 ` Stephen Boyd
2 siblings, 1 reply; 9+ messages in thread
From: Uwe Kleine-König @ 2016-09-08 9:30 UTC (permalink / raw)
To: linux-arm-kernel
This helps to decode error messages like:
[ 0.000000] i.MX clk 82: register failed with -17
Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
Hello,
maybe it's also sensible to do:
enum mx35_clks {
ckih = 0,
mpll = 1,
...
?
Best regards
Uwe
drivers/clk/imx/clk-imx35.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/drivers/clk/imx/clk-imx35.c b/drivers/clk/imx/clk-imx35.c
index d302ed3b8225..203cad6c9aab 100644
--- a/drivers/clk/imx/clk-imx35.c
+++ b/drivers/clk/imx/clk-imx35.c
@@ -66,20 +66,22 @@ static const char *std_sel[] = {"ppll", "arm"};
static const char *ipg_per_sel[] = {"ahb_per_div", "arm_per_div"};
enum mx35_clks {
- ckih, mpll, ppll, mpll_075, arm, hsp, hsp_div, hsp_sel, ahb, ipg,
- arm_per_div, ahb_per_div, ipg_per, uart_sel, uart_div, esdhc_sel,
- esdhc1_div, esdhc2_div, esdhc3_div, spdif_sel, spdif_div_pre,
- spdif_div_post, ssi_sel, ssi1_div_pre, ssi1_div_post, ssi2_div_pre,
- ssi2_div_post, usb_sel, usb_div, nfc_div, asrc_gate, pata_gate,
- audmux_gate, can1_gate, can2_gate, cspi1_gate, cspi2_gate, ect_gate,
- edio_gate, emi_gate, epit1_gate, epit2_gate, esai_gate, esdhc1_gate,
- esdhc2_gate, esdhc3_gate, fec_gate, gpio1_gate, gpio2_gate, gpio3_gate,
- gpt_gate, i2c1_gate, i2c2_gate, i2c3_gate, iomuxc_gate, ipu_gate,
- kpp_gate, mlb_gate, mshc_gate, owire_gate, pwm_gate, rngc_gate,
- rtc_gate, rtic_gate, scc_gate, sdma_gate, spba_gate, spdif_gate,
- ssi1_gate, ssi2_gate, uart1_gate, uart2_gate, uart3_gate, usbotg_gate,
- wdog_gate, max_gate, admux_gate, csi_gate, csi_div, csi_sel, iim_gate,
- gpu2d_gate, ckil, clk_max
+ /* 0 */ ckih, mpll, ppll, mpll_075, arm, hsp, hsp_div, hsp_sel, ahb,
+ /* 9 */ ipg, arm_per_div, ahb_per_div, ipg_per, uart_sel, uart_div,
+ /* 15 */ esdhc_sel, esdhc1_div, esdhc2_div, esdhc3_div, spdif_sel,
+ /* 20 */ spdif_div_pre, spdif_div_post, ssi_sel, ssi1_div_pre,
+ /* 24 */ ssi1_div_post, ssi2_div_pre, ssi2_div_post, usb_sel, usb_div,
+ /* 29 */ nfc_div, asrc_gate, pata_gate, audmux_gate, can1_gate,
+ /* 34 */ can2_gate, cspi1_gate, cspi2_gate, ect_gate, edio_gate,
+ /* 39 */ emi_gate, epit1_gate, epit2_gate, esai_gate, esdhc1_gate,
+ /* 44 */ esdhc2_gate, esdhc3_gate, fec_gate, gpio1_gate, gpio2_gate,
+ /* 49 */ gpio3_gate, gpt_gate, i2c1_gate, i2c2_gate, i2c3_gate,
+ /* 54 */ iomuxc_gate, ipu_gate, kpp_gate, mlb_gate, mshc_gate,
+ /* 59 */ owire_gate, pwm_gate, rngc_gate, rtc_gate, rtic_gate, scc_gate,
+ /* 65 */ sdma_gate, spba_gate, spdif_gate, ssi1_gate, ssi2_gate,
+ /* 70 */ uart1_gate, uart2_gate, uart3_gate, usbotg_gate, wdog_gate,
+ /* 75 */ max_gate, admux_gate, csi_gate, csi_div, csi_sel, iim_gate,
+ /* 81 */ gpu2d_gate, ckil, clk_max
};
static struct clk *clk[clk_max];
--
2.8.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk
2016-09-08 9:30 [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk Uwe Kleine-König
2016-09-08 9:30 ` [PATCH 2/2] ARM: clk-imx35: annotate clk enum with number values Uwe Kleine-König
@ 2016-09-09 6:16 ` Shawn Guo
2016-09-09 6:20 ` Uwe Kleine-König
2016-09-14 18:28 ` Stephen Boyd
2 siblings, 1 reply; 9+ messages in thread
From: Shawn Guo @ 2016-09-09 6:16 UTC (permalink / raw)
To: linux-arm-kernel
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 at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk
2016-09-09 6:16 ` [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk Shawn Guo
@ 2016-09-09 6:20 ` Uwe Kleine-König
2016-09-09 6:28 ` Shawn Guo
2016-09-09 18:11 ` Stephen Boyd
0 siblings, 2 replies; 9+ messages in thread
From: Uwe Kleine-König @ 2016-09-09 6:20 UTC (permalink / raw)
To: linux-arm-kernel
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
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk
2016-09-09 6:20 ` Uwe Kleine-König
@ 2016-09-09 6:28 ` Shawn Guo
2016-09-09 18:11 ` Stephen Boyd
1 sibling, 0 replies; 9+ messages in thread
From: Shawn Guo @ 2016-09-09 6:28 UTC (permalink / raw)
To: linux-arm-kernel
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 at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk
2016-09-09 6:20 ` Uwe Kleine-König
2016-09-09 6:28 ` Shawn Guo
@ 2016-09-09 18:11 ` Stephen Boyd
2016-09-09 19:15 ` Uwe Kleine-König
1 sibling, 1 reply; 9+ messages in thread
From: Stephen Boyd @ 2016-09-09 18:11 UTC (permalink / raw)
To: linux-arm-kernel
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.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk
2016-09-09 18:11 ` Stephen Boyd
@ 2016-09-09 19:15 ` Uwe Kleine-König
0 siblings, 0 replies; 9+ messages in thread
From: Uwe Kleine-König @ 2016-09-09 19:15 UTC (permalink / raw)
To: linux-arm-kernel
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
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk
2016-09-08 9:30 [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk Uwe Kleine-König
2016-09-08 9:30 ` [PATCH 2/2] ARM: clk-imx35: annotate clk enum with number values Uwe Kleine-König
2016-09-09 6:16 ` [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk Shawn Guo
@ 2016-09-14 18:28 ` Stephen Boyd
2 siblings, 0 replies; 9+ messages in thread
From: Stephen Boyd @ 2016-09-14 18:28 UTC (permalink / raw)
To: linux-arm-kernel
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
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] ARM: clk-imx35: annotate clk enum with number values
2016-09-08 9:30 ` [PATCH 2/2] ARM: clk-imx35: annotate clk enum with number values Uwe Kleine-König
@ 2016-09-14 18:28 ` Stephen Boyd
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Boyd @ 2016-09-14 18:28 UTC (permalink / raw)
To: linux-arm-kernel
On 09/08, Uwe Kleine-K?nig wrote:
> This helps to decode error messages like:
>
> [ 0.000000] i.MX clk 82: register failed with -17
>
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> ---
Applied to clk-next
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-09-14 18:28 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-08 9:30 [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk Uwe Kleine-König
2016-09-08 9:30 ` [PATCH 2/2] ARM: clk-imx35: annotate clk enum with number values Uwe Kleine-König
2016-09-14 18:28 ` Stephen Boyd
2016-09-09 6:16 ` [PATCH 1/2] ARM: clk-imx35: fix name for ckil clk Shawn Guo
2016-09-09 6:20 ` Uwe Kleine-König
2016-09-09 6:28 ` Shawn Guo
2016-09-09 18:11 ` Stephen Boyd
2016-09-09 19:15 ` Uwe Kleine-König
2016-09-14 18:28 ` Stephen Boyd
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).