From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754982Ab3HLUmw (ORCPT ); Mon, 12 Aug 2013 16:42:52 -0400 Received: from 2.mo2.mail-out.ovh.net ([188.165.53.149]:37083 "EHLO mo2.mail-out.ovh.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754334Ab3HLUmu (ORCPT ); Mon, 12 Aug 2013 16:42:50 -0400 Message-ID: <520948C3.7060008@overkiz.com> Date: Mon, 12 Aug 2013 22:42:43 +0200 From: boris brezillon User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: Nicolas Ferre CC: Felipe Balbi , Greg Kroah-Hartman , Jean-Christophe Plagniol-Villard , Ludovic Desroches , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-Ovh-Mailout: 178.32.228.2 (mo2.mail-out.ovh.net) Subject: Re: [PATCH] usb: gadget: at91_udc: add usb_clk for transition to common clk framework References: <1375337885-2684-1-git-send-email-b.brezillon@overkiz.com> <5208E881.3030205@atmel.com> In-Reply-To: <5208E881.3030205@atmel.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Ovh-Tracer-Id: 5243597341932615788 X-Ovh-Remote: 78.236.240.82 (cha74-5-78-236-240-82.fbx.proxad.net) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: -100 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeikedrudejucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-Spam-Check: DONE|U 0.5/N X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeikedrudejucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello Nicolas, On 12/08/2013 15:52, Nicolas Ferre wrote: > On 01/08/2013 08:18, Boris BREZILLON : >> The AT91 PMC (Power Management Controller) provides an USB clock used by >> USB Full Speed host (ohci) and USB Full Speed device (udc). >> The usb drivers (ohci and udc) must configure this clock to 48Mhz. >> This configuration was formely done in mach-at91/clock.c, but this >> implementation will be removed when moving to common clk framework. >> >> This patch adds support for usb clock retrieval and configuration, >> and is >> backward compatible with the current at91 clk implementation (if usb clk >> is not found, it does not configure/enable it). >> >> Signed-off-by: Boris BREZILLON > > Acked-by: Nicolas Ferre > Is there a reason you acked this version but not the 3rd one (https://lkml.org/lkml/2013/8/2/102). >> --- >> drivers/usb/gadget/at91_udc.c | 17 ++++++++++++++++- >> drivers/usb/gadget/at91_udc.h | 2 +- >> 2 files changed, 17 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/usb/gadget/at91_udc.c >> b/drivers/usb/gadget/at91_udc.c >> index fce8e4e..ae06585 100644 >> --- a/drivers/usb/gadget/at91_udc.c >> +++ b/drivers/usb/gadget/at91_udc.c >> @@ -870,6 +870,11 @@ static void clk_on(struct at91_udc *udc) >> if (udc->clocked) >> return; >> udc->clocked = 1; >> + >> + if (!IS_ERR(udc->uclk)) { >> + clk_set_rate(udc->uclk, 48000000); >> + clk_prepare_enable(udc->uclk); >> + } >> clk_prepare_enable(udc->iclk); >> clk_prepare_enable(udc->fclk); >> } >> @@ -882,6 +887,8 @@ static void clk_off(struct at91_udc *udc) >> udc->gadget.speed = USB_SPEED_UNKNOWN; >> clk_disable_unprepare(udc->fclk); >> clk_disable_unprepare(udc->iclk); >> + if (!IS_ERR(udc->uclk)) >> + clk_disable_unprepare(udc->uclk); >> } >> >> /* >> @@ -1774,10 +1781,10 @@ static int at91udc_probe(struct >> platform_device *pdev) >> /* get interface and function clocks */ >> udc->iclk = clk_get(dev, "udc_clk"); >> udc->fclk = clk_get(dev, "udpck"); >> + udc->uclk = clk_get(dev, "usb_clk"); >> if (IS_ERR(udc->iclk) || IS_ERR(udc->fclk)) { >> DBG("clocks missing\n"); >> retval = -ENODEV; >> - /* NOTE: we "know" here that refcounts on these are NOPs */ >> goto fail1; >> } >> >> @@ -1851,6 +1858,12 @@ fail3: >> fail2: >> free_irq(udc->udp_irq, udc); >> fail1: >> + if (!IS_ERR(udc->uclk)) >> + clk_put(udc->uclk); >> + if (!IS_ERR(udc->fclk)) >> + clk_put(udc->fclk); >> + if (!IS_ERR(udc->iclk)) >> + clk_put(udc->iclk); >> iounmap(udc->udp_baseaddr); >> fail0a: >> if (cpu_is_at91rm9200()) >> @@ -1894,6 +1907,8 @@ static int __exit at91udc_remove(struct >> platform_device *pdev) >> >> clk_put(udc->iclk); >> clk_put(udc->fclk); >> + if (!IS_ERR(udc->uclk)) >> + clk_put(udc->uclk); >> >> return 0; >> } >> diff --git a/drivers/usb/gadget/at91_udc.h >> b/drivers/usb/gadget/at91_udc.h >> index e647d1c..0175246 100644 >> --- a/drivers/usb/gadget/at91_udc.h >> +++ b/drivers/usb/gadget/at91_udc.h >> @@ -126,7 +126,7 @@ struct at91_udc { >> unsigned active_suspend:1; >> u8 addr; >> struct at91_udc_data board; >> - struct clk *iclk, *fclk; >> + struct clk *iclk, *fclk, *uclk; >> struct platform_device *pdev; >> struct proc_dir_entry *pde; >> void __iomem *udp_baseaddr; >> > >