* [PATCH] ARM: at91/tc: fix clock source id for tc block > 1 @ 2013-04-02 16:46 ` Boris BREZILLON 0 siblings, 0 replies; 10+ messages in thread From: Boris BREZILLON @ 2013-04-02 16:46 UTC (permalink / raw) To: linux-arm-kernel This patch fixes wrong clock request for TC block 2. The second block was using t0_clk, t1_clk and t2_clk clks instead of t3_clk, t4_clk and t5_clk clks. Signed-off-by: Boris BREZILLON <linux-arm@overkiz.com> --- drivers/misc/atmel_tclib.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c index c8d8e38..768a988 100644 --- a/drivers/misc/atmel_tclib.c +++ b/drivers/misc/atmel_tclib.c @@ -142,6 +142,8 @@ static int __init tc_probe(struct platform_device *pdev) struct atmel_tc *tc; struct clk *clk; int irq; + char clk_id[7]; + int clk_offset; if (!platform_get_resource(pdev, IORESOURCE_MEM, 0)) return -EINVAL; @@ -156,25 +158,31 @@ static int __init tc_probe(struct platform_device *pdev) tc->pdev = pdev; - clk = clk_get(&pdev->dev, "t0_clk"); - if (IS_ERR(clk)) { - kfree(tc); - return -EINVAL; - } - /* Now take SoC information if available */ if (pdev->dev.of_node) { const struct of_device_id *match; match = of_match_node(atmel_tcb_dt_ids, pdev->dev.of_node); if (match) tc->tcb_config = match->data; + clk_offset = of_alias_get_id(tc->pdev->dev.of_node, "tcb"); + } else + clk_offset = pdev->id; + clk_offset *= 3; + + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); + clk = clk_get(&pdev->dev, clk_id); + if (IS_ERR(clk)) { + kfree(tc); + return -EINVAL; } tc->clk[0] = clk; - tc->clk[1] = clk_get(&pdev->dev, "t1_clk"); + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); + tc->clk[1] = clk_get(&pdev->dev, clk_id); if (IS_ERR(tc->clk[1])) tc->clk[1] = clk; - tc->clk[2] = clk_get(&pdev->dev, "t2_clk"); + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); + tc->clk[2] = clk_get(&pdev->dev, clk_id); if (IS_ERR(tc->clk[2])) tc->clk[2] = clk; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH] ARM: at91/tc: fix clock source id for tc block > 1 @ 2013-04-02 16:46 ` Boris BREZILLON 0 siblings, 0 replies; 10+ messages in thread From: Boris BREZILLON @ 2013-04-02 16:46 UTC (permalink / raw) To: Nicolas Ferre Cc: Arnd Bergmann, Greg Kroah-Hartman, Grant Likely, Rob Herring, linux-arm-kernel, linux-kernel, Andrew Victor, Jean-Christophe Plagniol-Villard, Boris BREZILLON This patch fixes wrong clock request for TC block 2. The second block was using t0_clk, t1_clk and t2_clk clks instead of t3_clk, t4_clk and t5_clk clks. Signed-off-by: Boris BREZILLON <linux-arm@overkiz.com> --- drivers/misc/atmel_tclib.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c index c8d8e38..768a988 100644 --- a/drivers/misc/atmel_tclib.c +++ b/drivers/misc/atmel_tclib.c @@ -142,6 +142,8 @@ static int __init tc_probe(struct platform_device *pdev) struct atmel_tc *tc; struct clk *clk; int irq; + char clk_id[7]; + int clk_offset; if (!platform_get_resource(pdev, IORESOURCE_MEM, 0)) return -EINVAL; @@ -156,25 +158,31 @@ static int __init tc_probe(struct platform_device *pdev) tc->pdev = pdev; - clk = clk_get(&pdev->dev, "t0_clk"); - if (IS_ERR(clk)) { - kfree(tc); - return -EINVAL; - } - /* Now take SoC information if available */ if (pdev->dev.of_node) { const struct of_device_id *match; match = of_match_node(atmel_tcb_dt_ids, pdev->dev.of_node); if (match) tc->tcb_config = match->data; + clk_offset = of_alias_get_id(tc->pdev->dev.of_node, "tcb"); + } else + clk_offset = pdev->id; + clk_offset *= 3; + + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); + clk = clk_get(&pdev->dev, clk_id); + if (IS_ERR(clk)) { + kfree(tc); + return -EINVAL; } tc->clk[0] = clk; - tc->clk[1] = clk_get(&pdev->dev, "t1_clk"); + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); + tc->clk[1] = clk_get(&pdev->dev, clk_id); if (IS_ERR(tc->clk[1])) tc->clk[1] = clk; - tc->clk[2] = clk_get(&pdev->dev, "t2_clk"); + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); + tc->clk[2] = clk_get(&pdev->dev, clk_id); if (IS_ERR(tc->clk[2])) tc->clk[2] = clk; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH] ARM: at91/tc: fix clock source id for tc block > 1 2013-04-02 16:46 ` Boris BREZILLON @ 2013-04-03 4:45 ` Jean-Christophe PLAGNIOL-VILLARD -1 siblings, 0 replies; 10+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-04-03 4:45 UTC (permalink / raw) To: linux-arm-kernel On 18:46 Tue 02 Apr , Boris BREZILLON wrote: > This patch fixes wrong clock request for TC block 2. > The second block was using t0_clk, t1_clk and t2_clk clks instead of > t3_clk, t4_clk and t5_clk clks. > this is intended as we have 3 clock per device Best Regards, J. > > Signed-off-by: Boris BREZILLON <linux-arm@overkiz.com> > --- > drivers/misc/atmel_tclib.c | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c > index c8d8e38..768a988 100644 > --- a/drivers/misc/atmel_tclib.c > +++ b/drivers/misc/atmel_tclib.c > @@ -142,6 +142,8 @@ static int __init tc_probe(struct platform_device *pdev) > struct atmel_tc *tc; > struct clk *clk; > int irq; > + char clk_id[7]; > + int clk_offset; > > if (!platform_get_resource(pdev, IORESOURCE_MEM, 0)) > return -EINVAL; > @@ -156,25 +158,31 @@ static int __init tc_probe(struct platform_device *pdev) > > tc->pdev = pdev; > > - clk = clk_get(&pdev->dev, "t0_clk"); > - if (IS_ERR(clk)) { > - kfree(tc); > - return -EINVAL; > - } > - > /* Now take SoC information if available */ > if (pdev->dev.of_node) { > const struct of_device_id *match; > match = of_match_node(atmel_tcb_dt_ids, pdev->dev.of_node); > if (match) > tc->tcb_config = match->data; > + clk_offset = of_alias_get_id(tc->pdev->dev.of_node, "tcb"); > + } else > + clk_offset = pdev->id; > + clk_offset *= 3; > + > + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); > + clk = clk_get(&pdev->dev, clk_id); > + if (IS_ERR(clk)) { > + kfree(tc); > + return -EINVAL; > } > > tc->clk[0] = clk; > - tc->clk[1] = clk_get(&pdev->dev, "t1_clk"); > + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); > + tc->clk[1] = clk_get(&pdev->dev, clk_id); > if (IS_ERR(tc->clk[1])) > tc->clk[1] = clk; > - tc->clk[2] = clk_get(&pdev->dev, "t2_clk"); > + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); > + tc->clk[2] = clk_get(&pdev->dev, clk_id); > if (IS_ERR(tc->clk[2])) > tc->clk[2] = clk; > > -- > 1.7.9.5 > > > _______________________________________________ > 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] 10+ messages in thread
* Re: [PATCH] ARM: at91/tc: fix clock source id for tc block > 1 @ 2013-04-03 4:45 ` Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 0 replies; 10+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-04-03 4:45 UTC (permalink / raw) To: Boris BREZILLON Cc: Nicolas Ferre, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Rob Herring, Grant Likely, Andrew Victor, linux-arm-kernel On 18:46 Tue 02 Apr , Boris BREZILLON wrote: > This patch fixes wrong clock request for TC block 2. > The second block was using t0_clk, t1_clk and t2_clk clks instead of > t3_clk, t4_clk and t5_clk clks. > this is intended as we have 3 clock per device Best Regards, J. > > Signed-off-by: Boris BREZILLON <linux-arm@overkiz.com> > --- > drivers/misc/atmel_tclib.c | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c > index c8d8e38..768a988 100644 > --- a/drivers/misc/atmel_tclib.c > +++ b/drivers/misc/atmel_tclib.c > @@ -142,6 +142,8 @@ static int __init tc_probe(struct platform_device *pdev) > struct atmel_tc *tc; > struct clk *clk; > int irq; > + char clk_id[7]; > + int clk_offset; > > if (!platform_get_resource(pdev, IORESOURCE_MEM, 0)) > return -EINVAL; > @@ -156,25 +158,31 @@ static int __init tc_probe(struct platform_device *pdev) > > tc->pdev = pdev; > > - clk = clk_get(&pdev->dev, "t0_clk"); > - if (IS_ERR(clk)) { > - kfree(tc); > - return -EINVAL; > - } > - > /* Now take SoC information if available */ > if (pdev->dev.of_node) { > const struct of_device_id *match; > match = of_match_node(atmel_tcb_dt_ids, pdev->dev.of_node); > if (match) > tc->tcb_config = match->data; > + clk_offset = of_alias_get_id(tc->pdev->dev.of_node, "tcb"); > + } else > + clk_offset = pdev->id; > + clk_offset *= 3; > + > + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); > + clk = clk_get(&pdev->dev, clk_id); > + if (IS_ERR(clk)) { > + kfree(tc); > + return -EINVAL; > } > > tc->clk[0] = clk; > - tc->clk[1] = clk_get(&pdev->dev, "t1_clk"); > + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); > + tc->clk[1] = clk_get(&pdev->dev, clk_id); > if (IS_ERR(tc->clk[1])) > tc->clk[1] = clk; > - tc->clk[2] = clk_get(&pdev->dev, "t2_clk"); > + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); > + tc->clk[2] = clk_get(&pdev->dev, clk_id); > if (IS_ERR(tc->clk[2])) > tc->clk[2] = clk; > > -- > 1.7.9.5 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] ARM: at91/tc: fix clock source id for tc block > 1 2013-04-03 4:45 ` Jean-Christophe PLAGNIOL-VILLARD @ 2013-04-03 7:26 ` Nicolas Ferre -1 siblings, 0 replies; 10+ messages in thread From: Nicolas Ferre @ 2013-04-03 7:26 UTC (permalink / raw) To: linux-arm-kernel On 04/03/2013 06:45 AM, Jean-Christophe PLAGNIOL-VILLARD : > On 18:46 Tue 02 Apr , Boris BREZILLON wrote: >> This patch fixes wrong clock request for TC block 2. >> The second block was using t0_clk, t1_clk and t2_clk clks instead of >> t3_clk, t4_clk and t5_clk clks. >> > this is intended as we have 3 clock per device True. Boris, did you hit an issue with former code that your patch is solving? What is the reason for this patch? Thanks, best regards, >> Signed-off-by: Boris BREZILLON <linux-arm@overkiz.com> >> --- >> drivers/misc/atmel_tclib.c | 24 ++++++++++++++++-------- >> 1 file changed, 16 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c >> index c8d8e38..768a988 100644 >> --- a/drivers/misc/atmel_tclib.c >> +++ b/drivers/misc/atmel_tclib.c >> @@ -142,6 +142,8 @@ static int __init tc_probe(struct platform_device *pdev) >> struct atmel_tc *tc; >> struct clk *clk; >> int irq; >> + char clk_id[7]; >> + int clk_offset; >> >> if (!platform_get_resource(pdev, IORESOURCE_MEM, 0)) >> return -EINVAL; >> @@ -156,25 +158,31 @@ static int __init tc_probe(struct platform_device *pdev) >> >> tc->pdev = pdev; >> >> - clk = clk_get(&pdev->dev, "t0_clk"); >> - if (IS_ERR(clk)) { >> - kfree(tc); >> - return -EINVAL; >> - } >> - >> /* Now take SoC information if available */ >> if (pdev->dev.of_node) { >> const struct of_device_id *match; >> match = of_match_node(atmel_tcb_dt_ids, pdev->dev.of_node); >> if (match) >> tc->tcb_config = match->data; >> + clk_offset = of_alias_get_id(tc->pdev->dev.of_node, "tcb"); >> + } else >> + clk_offset = pdev->id; >> + clk_offset *= 3; >> + >> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >> + clk = clk_get(&pdev->dev, clk_id); >> + if (IS_ERR(clk)) { >> + kfree(tc); >> + return -EINVAL; >> } >> >> tc->clk[0] = clk; >> - tc->clk[1] = clk_get(&pdev->dev, "t1_clk"); >> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >> + tc->clk[1] = clk_get(&pdev->dev, clk_id); >> if (IS_ERR(tc->clk[1])) >> tc->clk[1] = clk; >> - tc->clk[2] = clk_get(&pdev->dev, "t2_clk"); >> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >> + tc->clk[2] = clk_get(&pdev->dev, clk_id); >> if (IS_ERR(tc->clk[2])) >> tc->clk[2] = clk; >> >> -- >> 1.7.9.5 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel at lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- Nicolas Ferre ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] ARM: at91/tc: fix clock source id for tc block > 1 @ 2013-04-03 7:26 ` Nicolas Ferre 0 siblings, 0 replies; 10+ messages in thread From: Nicolas Ferre @ 2013-04-03 7:26 UTC (permalink / raw) To: Boris BREZILLON Cc: Jean-Christophe PLAGNIOL-VILLARD, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Rob Herring, Grant Likely, Andrew Victor, linux-arm-kernel On 04/03/2013 06:45 AM, Jean-Christophe PLAGNIOL-VILLARD : > On 18:46 Tue 02 Apr , Boris BREZILLON wrote: >> This patch fixes wrong clock request for TC block 2. >> The second block was using t0_clk, t1_clk and t2_clk clks instead of >> t3_clk, t4_clk and t5_clk clks. >> > this is intended as we have 3 clock per device True. Boris, did you hit an issue with former code that your patch is solving? What is the reason for this patch? Thanks, best regards, >> Signed-off-by: Boris BREZILLON <linux-arm@overkiz.com> >> --- >> drivers/misc/atmel_tclib.c | 24 ++++++++++++++++-------- >> 1 file changed, 16 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c >> index c8d8e38..768a988 100644 >> --- a/drivers/misc/atmel_tclib.c >> +++ b/drivers/misc/atmel_tclib.c >> @@ -142,6 +142,8 @@ static int __init tc_probe(struct platform_device *pdev) >> struct atmel_tc *tc; >> struct clk *clk; >> int irq; >> + char clk_id[7]; >> + int clk_offset; >> >> if (!platform_get_resource(pdev, IORESOURCE_MEM, 0)) >> return -EINVAL; >> @@ -156,25 +158,31 @@ static int __init tc_probe(struct platform_device *pdev) >> >> tc->pdev = pdev; >> >> - clk = clk_get(&pdev->dev, "t0_clk"); >> - if (IS_ERR(clk)) { >> - kfree(tc); >> - return -EINVAL; >> - } >> - >> /* Now take SoC information if available */ >> if (pdev->dev.of_node) { >> const struct of_device_id *match; >> match = of_match_node(atmel_tcb_dt_ids, pdev->dev.of_node); >> if (match) >> tc->tcb_config = match->data; >> + clk_offset = of_alias_get_id(tc->pdev->dev.of_node, "tcb"); >> + } else >> + clk_offset = pdev->id; >> + clk_offset *= 3; >> + >> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >> + clk = clk_get(&pdev->dev, clk_id); >> + if (IS_ERR(clk)) { >> + kfree(tc); >> + return -EINVAL; >> } >> >> tc->clk[0] = clk; >> - tc->clk[1] = clk_get(&pdev->dev, "t1_clk"); >> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >> + tc->clk[1] = clk_get(&pdev->dev, clk_id); >> if (IS_ERR(tc->clk[1])) >> tc->clk[1] = clk; >> - tc->clk[2] = clk_get(&pdev->dev, "t2_clk"); >> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >> + tc->clk[2] = clk_get(&pdev->dev, clk_id); >> if (IS_ERR(tc->clk[2])) >> tc->clk[2] = clk; >> >> -- >> 1.7.9.5 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- Nicolas Ferre ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] ARM: at91/tc: fix clock source id for tc block > 1 2013-04-03 7:26 ` Nicolas Ferre @ 2013-04-03 7:59 ` Boris BREZILLON -1 siblings, 0 replies; 10+ messages in thread From: Boris BREZILLON @ 2013-04-03 7:59 UTC (permalink / raw) To: linux-arm-kernel On 03/04/2013 09:26, Nicolas Ferre wrote: > On 04/03/2013 06:45 AM, Jean-Christophe PLAGNIOL-VILLARD : >> On 18:46 Tue 02 Apr , Boris BREZILLON wrote: >>> This patch fixes wrong clock request for TC block 2. >>> The second block was using t0_clk, t1_clk and t2_clk clks instead of >>> t3_clk, t4_clk and t5_clk clks. >>> >> this is intended as we have 3 clock per device You're right. > > True. > Boris, did you hit an issue with former code that your patch is solving? > What is the reason for this patch? I should have taken a closer look at the code before sending this patch. I mistook clk name for conid devid association. As I am enabling the tc block 1 clocks in the bootstrap code, I thought this was the reason for these clocks to be enabled after the kernel boot. But I tried to disable these clocks in the bootstrap and this works fine. Sorry if I bothered you. Best Regards, Boris > > Thanks, best regards, > > >>> Signed-off-by: Boris BREZILLON <linux-arm@overkiz.com> >>> --- >>> drivers/misc/atmel_tclib.c | 24 ++++++++++++++++-------- >>> 1 file changed, 16 insertions(+), 8 deletions(-) >>> >>> diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c >>> index c8d8e38..768a988 100644 >>> --- a/drivers/misc/atmel_tclib.c >>> +++ b/drivers/misc/atmel_tclib.c >>> @@ -142,6 +142,8 @@ static int __init tc_probe(struct platform_device *pdev) >>> struct atmel_tc *tc; >>> struct clk *clk; >>> int irq; >>> + char clk_id[7]; >>> + int clk_offset; >>> >>> if (!platform_get_resource(pdev, IORESOURCE_MEM, 0)) >>> return -EINVAL; >>> @@ -156,25 +158,31 @@ static int __init tc_probe(struct platform_device *pdev) >>> >>> tc->pdev = pdev; >>> >>> - clk = clk_get(&pdev->dev, "t0_clk"); >>> - if (IS_ERR(clk)) { >>> - kfree(tc); >>> - return -EINVAL; >>> - } >>> - >>> /* Now take SoC information if available */ >>> if (pdev->dev.of_node) { >>> const struct of_device_id *match; >>> match = of_match_node(atmel_tcb_dt_ids, pdev->dev.of_node); >>> if (match) >>> tc->tcb_config = match->data; >>> + clk_offset = of_alias_get_id(tc->pdev->dev.of_node, "tcb"); >>> + } else >>> + clk_offset = pdev->id; >>> + clk_offset *= 3; >>> + >>> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >>> + clk = clk_get(&pdev->dev, clk_id); >>> + if (IS_ERR(clk)) { >>> + kfree(tc); >>> + return -EINVAL; >>> } >>> >>> tc->clk[0] = clk; >>> - tc->clk[1] = clk_get(&pdev->dev, "t1_clk"); >>> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >>> + tc->clk[1] = clk_get(&pdev->dev, clk_id); >>> if (IS_ERR(tc->clk[1])) >>> tc->clk[1] = clk; >>> - tc->clk[2] = clk_get(&pdev->dev, "t2_clk"); >>> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >>> + tc->clk[2] = clk_get(&pdev->dev, clk_id); >>> if (IS_ERR(tc->clk[2])) >>> tc->clk[2] = clk; >>> >>> -- >>> 1.7.9.5 >>> >>> >>> _______________________________________________ >>> 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] 10+ messages in thread
* Re: [PATCH] ARM: at91/tc: fix clock source id for tc block > 1 @ 2013-04-03 7:59 ` Boris BREZILLON 0 siblings, 0 replies; 10+ messages in thread From: Boris BREZILLON @ 2013-04-03 7:59 UTC (permalink / raw) To: Nicolas Ferre Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Rob Herring, Grant Likely, Jean-Christophe PLAGNIOL-VILLARD, Andrew Victor, linux-arm-kernel On 03/04/2013 09:26, Nicolas Ferre wrote: > On 04/03/2013 06:45 AM, Jean-Christophe PLAGNIOL-VILLARD : >> On 18:46 Tue 02 Apr , Boris BREZILLON wrote: >>> This patch fixes wrong clock request for TC block 2. >>> The second block was using t0_clk, t1_clk and t2_clk clks instead of >>> t3_clk, t4_clk and t5_clk clks. >>> >> this is intended as we have 3 clock per device You're right. > > True. > Boris, did you hit an issue with former code that your patch is solving? > What is the reason for this patch? I should have taken a closer look at the code before sending this patch. I mistook clk name for conid devid association. As I am enabling the tc block 1 clocks in the bootstrap code, I thought this was the reason for these clocks to be enabled after the kernel boot. But I tried to disable these clocks in the bootstrap and this works fine. Sorry if I bothered you. Best Regards, Boris > > Thanks, best regards, > > >>> Signed-off-by: Boris BREZILLON <linux-arm@overkiz.com> >>> --- >>> drivers/misc/atmel_tclib.c | 24 ++++++++++++++++-------- >>> 1 file changed, 16 insertions(+), 8 deletions(-) >>> >>> diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c >>> index c8d8e38..768a988 100644 >>> --- a/drivers/misc/atmel_tclib.c >>> +++ b/drivers/misc/atmel_tclib.c >>> @@ -142,6 +142,8 @@ static int __init tc_probe(struct platform_device *pdev) >>> struct atmel_tc *tc; >>> struct clk *clk; >>> int irq; >>> + char clk_id[7]; >>> + int clk_offset; >>> >>> if (!platform_get_resource(pdev, IORESOURCE_MEM, 0)) >>> return -EINVAL; >>> @@ -156,25 +158,31 @@ static int __init tc_probe(struct platform_device *pdev) >>> >>> tc->pdev = pdev; >>> >>> - clk = clk_get(&pdev->dev, "t0_clk"); >>> - if (IS_ERR(clk)) { >>> - kfree(tc); >>> - return -EINVAL; >>> - } >>> - >>> /* Now take SoC information if available */ >>> if (pdev->dev.of_node) { >>> const struct of_device_id *match; >>> match = of_match_node(atmel_tcb_dt_ids, pdev->dev.of_node); >>> if (match) >>> tc->tcb_config = match->data; >>> + clk_offset = of_alias_get_id(tc->pdev->dev.of_node, "tcb"); >>> + } else >>> + clk_offset = pdev->id; >>> + clk_offset *= 3; >>> + >>> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >>> + clk = clk_get(&pdev->dev, clk_id); >>> + if (IS_ERR(clk)) { >>> + kfree(tc); >>> + return -EINVAL; >>> } >>> >>> tc->clk[0] = clk; >>> - tc->clk[1] = clk_get(&pdev->dev, "t1_clk"); >>> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >>> + tc->clk[1] = clk_get(&pdev->dev, clk_id); >>> if (IS_ERR(tc->clk[1])) >>> tc->clk[1] = clk; >>> - tc->clk[2] = clk_get(&pdev->dev, "t2_clk"); >>> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >>> + tc->clk[2] = clk_get(&pdev->dev, clk_id); >>> if (IS_ERR(tc->clk[2])) >>> tc->clk[2] = clk; >>> >>> -- >>> 1.7.9.5 >>> >>> >>> _______________________________________________ >>> linux-arm-kernel mailing list >>> linux-arm-kernel@lists.infradead.org >>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >> > > ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] ARM: at91/tc: fix clock source id for tc block > 1 2013-04-03 7:59 ` Boris BREZILLON @ 2013-04-03 8:32 ` Nicolas Ferre -1 siblings, 0 replies; 10+ messages in thread From: Nicolas Ferre @ 2013-04-03 8:32 UTC (permalink / raw) To: linux-arm-kernel On 04/03/2013 09:59 AM, Boris BREZILLON : > On 03/04/2013 09:26, Nicolas Ferre wrote: >> On 04/03/2013 06:45 AM, Jean-Christophe PLAGNIOL-VILLARD : >>> On 18:46 Tue 02 Apr , Boris BREZILLON wrote: >>>> This patch fixes wrong clock request for TC block 2. >>>> The second block was using t0_clk, t1_clk and t2_clk clks instead of >>>> t3_clk, t4_clk and t5_clk clks. >>>> >>> this is intended as we have 3 clock per device > You're right. >> >> True. >> Boris, did you hit an issue with former code that your patch is solving? >> What is the reason for this patch? > I should have taken a closer look at the code before sending this patch. > I mistook clk name for conid devid association. > > As I am enabling the tc block 1 clocks in the bootstrap code, I thought > this was the reason for these clocks to be enabled after the kernel boot. > > But I tried to disable these clocks in the bootstrap and this works fine. > > Sorry if I bothered you. Not bothered at all Boris! This is exactly how I like to see the community working together. Please feel free to send more and more patches about AT91: this is always valuable for us. Best regards, >>>> Signed-off-by: Boris BREZILLON <linux-arm@overkiz.com> >>>> --- >>>> drivers/misc/atmel_tclib.c | 24 ++++++++++++++++-------- >>>> 1 file changed, 16 insertions(+), 8 deletions(-) >>>> >>>> diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c >>>> index c8d8e38..768a988 100644 >>>> --- a/drivers/misc/atmel_tclib.c >>>> +++ b/drivers/misc/atmel_tclib.c >>>> @@ -142,6 +142,8 @@ static int __init tc_probe(struct >>>> platform_device *pdev) >>>> struct atmel_tc *tc; >>>> struct clk *clk; >>>> int irq; >>>> + char clk_id[7]; >>>> + int clk_offset; >>>> >>>> if (!platform_get_resource(pdev, IORESOURCE_MEM, 0)) >>>> return -EINVAL; >>>> @@ -156,25 +158,31 @@ static int __init tc_probe(struct >>>> platform_device *pdev) >>>> >>>> tc->pdev = pdev; >>>> >>>> - clk = clk_get(&pdev->dev, "t0_clk"); >>>> - if (IS_ERR(clk)) { >>>> - kfree(tc); >>>> - return -EINVAL; >>>> - } >>>> - >>>> /* Now take SoC information if available */ >>>> if (pdev->dev.of_node) { >>>> const struct of_device_id *match; >>>> match = of_match_node(atmel_tcb_dt_ids, pdev->dev.of_node); >>>> if (match) >>>> tc->tcb_config = match->data; >>>> + clk_offset = of_alias_get_id(tc->pdev->dev.of_node, "tcb"); >>>> + } else >>>> + clk_offset = pdev->id; >>>> + clk_offset *= 3; >>>> + >>>> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >>>> + clk = clk_get(&pdev->dev, clk_id); >>>> + if (IS_ERR(clk)) { >>>> + kfree(tc); >>>> + return -EINVAL; >>>> } >>>> >>>> tc->clk[0] = clk; >>>> - tc->clk[1] = clk_get(&pdev->dev, "t1_clk"); >>>> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >>>> + tc->clk[1] = clk_get(&pdev->dev, clk_id); >>>> if (IS_ERR(tc->clk[1])) >>>> tc->clk[1] = clk; >>>> - tc->clk[2] = clk_get(&pdev->dev, "t2_clk"); >>>> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >>>> + tc->clk[2] = clk_get(&pdev->dev, clk_id); >>>> if (IS_ERR(tc->clk[2])) >>>> tc->clk[2] = clk; >>>> >>>> -- >>>> 1.7.9.5 >>>> >>>> >>>> _______________________________________________ >>>> linux-arm-kernel mailing list >>>> linux-arm-kernel at lists.infradead.org >>>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >>> >> >> > > > -- Nicolas Ferre ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] ARM: at91/tc: fix clock source id for tc block > 1 @ 2013-04-03 8:32 ` Nicolas Ferre 0 siblings, 0 replies; 10+ messages in thread From: Nicolas Ferre @ 2013-04-03 8:32 UTC (permalink / raw) To: Boris BREZILLON Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Rob Herring, Grant Likely, Jean-Christophe PLAGNIOL-VILLARD, Andrew Victor, linux-arm-kernel On 04/03/2013 09:59 AM, Boris BREZILLON : > On 03/04/2013 09:26, Nicolas Ferre wrote: >> On 04/03/2013 06:45 AM, Jean-Christophe PLAGNIOL-VILLARD : >>> On 18:46 Tue 02 Apr , Boris BREZILLON wrote: >>>> This patch fixes wrong clock request for TC block 2. >>>> The second block was using t0_clk, t1_clk and t2_clk clks instead of >>>> t3_clk, t4_clk and t5_clk clks. >>>> >>> this is intended as we have 3 clock per device > You're right. >> >> True. >> Boris, did you hit an issue with former code that your patch is solving? >> What is the reason for this patch? > I should have taken a closer look at the code before sending this patch. > I mistook clk name for conid devid association. > > As I am enabling the tc block 1 clocks in the bootstrap code, I thought > this was the reason for these clocks to be enabled after the kernel boot. > > But I tried to disable these clocks in the bootstrap and this works fine. > > Sorry if I bothered you. Not bothered at all Boris! This is exactly how I like to see the community working together. Please feel free to send more and more patches about AT91: this is always valuable for us. Best regards, >>>> Signed-off-by: Boris BREZILLON <linux-arm@overkiz.com> >>>> --- >>>> drivers/misc/atmel_tclib.c | 24 ++++++++++++++++-------- >>>> 1 file changed, 16 insertions(+), 8 deletions(-) >>>> >>>> diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c >>>> index c8d8e38..768a988 100644 >>>> --- a/drivers/misc/atmel_tclib.c >>>> +++ b/drivers/misc/atmel_tclib.c >>>> @@ -142,6 +142,8 @@ static int __init tc_probe(struct >>>> platform_device *pdev) >>>> struct atmel_tc *tc; >>>> struct clk *clk; >>>> int irq; >>>> + char clk_id[7]; >>>> + int clk_offset; >>>> >>>> if (!platform_get_resource(pdev, IORESOURCE_MEM, 0)) >>>> return -EINVAL; >>>> @@ -156,25 +158,31 @@ static int __init tc_probe(struct >>>> platform_device *pdev) >>>> >>>> tc->pdev = pdev; >>>> >>>> - clk = clk_get(&pdev->dev, "t0_clk"); >>>> - if (IS_ERR(clk)) { >>>> - kfree(tc); >>>> - return -EINVAL; >>>> - } >>>> - >>>> /* Now take SoC information if available */ >>>> if (pdev->dev.of_node) { >>>> const struct of_device_id *match; >>>> match = of_match_node(atmel_tcb_dt_ids, pdev->dev.of_node); >>>> if (match) >>>> tc->tcb_config = match->data; >>>> + clk_offset = of_alias_get_id(tc->pdev->dev.of_node, "tcb"); >>>> + } else >>>> + clk_offset = pdev->id; >>>> + clk_offset *= 3; >>>> + >>>> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >>>> + clk = clk_get(&pdev->dev, clk_id); >>>> + if (IS_ERR(clk)) { >>>> + kfree(tc); >>>> + return -EINVAL; >>>> } >>>> >>>> tc->clk[0] = clk; >>>> - tc->clk[1] = clk_get(&pdev->dev, "t1_clk"); >>>> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >>>> + tc->clk[1] = clk_get(&pdev->dev, clk_id); >>>> if (IS_ERR(tc->clk[1])) >>>> tc->clk[1] = clk; >>>> - tc->clk[2] = clk_get(&pdev->dev, "t2_clk"); >>>> + snprintf(clk_id, sizeof(clk_id), "t%d_clk", clk_offset++); >>>> + tc->clk[2] = clk_get(&pdev->dev, clk_id); >>>> if (IS_ERR(tc->clk[2])) >>>> tc->clk[2] = clk; >>>> >>>> -- >>>> 1.7.9.5 >>>> >>>> >>>> _______________________________________________ >>>> linux-arm-kernel mailing list >>>> linux-arm-kernel@lists.infradead.org >>>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >>> >> >> > > > -- Nicolas Ferre ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-04-03 8:32 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-04-02 16:46 [PATCH] ARM: at91/tc: fix clock source id for tc block > 1 Boris BREZILLON 2013-04-02 16:46 ` Boris BREZILLON 2013-04-03 4:45 ` Jean-Christophe PLAGNIOL-VILLARD 2013-04-03 4:45 ` Jean-Christophe PLAGNIOL-VILLARD 2013-04-03 7:26 ` Nicolas Ferre 2013-04-03 7:26 ` Nicolas Ferre 2013-04-03 7:59 ` Boris BREZILLON 2013-04-03 7:59 ` Boris BREZILLON 2013-04-03 8:32 ` Nicolas Ferre 2013-04-03 8:32 ` Nicolas Ferre
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.