Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760995Ab3DCEuD (ORCPT ); Wed, 3 Apr 2013 00:50:03 -0400 Received: from mo2.mail-out.ovh.net ([178.32.228.2]:38522 "EHLO mo2.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760784Ab3DCEuB (ORCPT ); Wed, 3 Apr 2013 00:50:01 -0400 Date: Wed, 3 Apr 2013 06:45:55 +0200 From: Jean-Christophe PLAGNIOL-VILLARD To: Boris BREZILLON Cc: Nicolas Ferre , Arnd Bergmann , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Rob Herring , Grant Likely , Andrew Victor , linux-arm-kernel@lists.infradead.org X-Ovh-Mailout: 178.32.228.2 (mo2.mail-out.ovh.net) Subject: Re: [PATCH] ARM: at91/tc: fix clock source id for tc block > 1 Message-ID: <20130403044555.GN20693@game.jcrosoft.org> References: <1364921211-15756-1-git-send-email-linux-arm@overkiz.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1364921211-15756-1-git-send-email-linux-arm@overkiz.com> X-PGP-Key: http://uboot.jcrosoft.org/plagnioj.asc X-PGP-key-fingerprint: 6309 2BBA 16C8 3A07 1772 CC24 DEFC FFA3 279C CE7C User-Agent: Mutt/1.5.20 (2009-06-14) X-Ovh-Tracer-Id: 13041580096831794101 X-Ovh-Remote: 213.251.161.87 (ns32433.ovh.net) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: -100 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeiuddrkeelucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-Spam-Check: DONE|U 0.5/N X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeiuddrkeelucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2544 Lines: 81 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 > --- > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/