From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754023AbbE1L5l (ORCPT ); Thu, 28 May 2015 07:57:41 -0400 Received: from down.free-electrons.com ([37.187.137.238]:57875 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753556AbbE1L5e (ORCPT ); Thu, 28 May 2015 07:57:34 -0400 Date: Thu, 28 May 2015 13:57:31 +0200 From: Alexandre Belloni To: Philippe Reynes Cc: shawn.guo@linaro.org, kernel@pengutronix.de, linux@arm.linux.org.uk, a.zummo@towertech.it, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, rtc-linux@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, fabio.estevam@freescale.com Subject: Re: [PATCH 1/2] rtc: mxc: add a second clock Message-ID: <20150528115731.GN2185@piout.net> References: <1431729330-7625-1-git-send-email-tremyfr@gmail.com> <1431729330-7625-2-git-send-email-tremyfr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1431729330-7625-2-git-send-email-tremyfr@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 16/05/2015 at 00:35:29 +0200, Philippe Reynes wrote : > The mxc RTC needs two clocks, one for the input > reference, and one for the IP. But this driver > was only using one clock (for the reference). > This patch add the second clock (for the IP). > > Signed-off-by: Philippe Reynes > --- > arch/arm/mach-imx/clk-imx31.c | 3 ++- > drivers/rtc/rtc-mxc.c | 26 +++++++++++++++++--------- > 2 files changed, 19 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c > index 286ef42..480c54f 100644 > --- a/arch/arm/mach-imx/clk-imx31.c > +++ b/arch/arm/mach-imx/clk-imx31.c > @@ -130,7 +130,8 @@ int __init mx31_clocks_init(unsigned long fref) > clk_register_clkdev(clk[cspi3_gate], NULL, "imx31-cspi.2"); > clk_register_clkdev(clk[pwm_gate], "pwm", NULL); > clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0"); > - clk_register_clkdev(clk[rtc_gate], NULL, "imx21-rtc"); > + clk_register_clkdev(clk[ckil], "rtc", "imx21-rtc"); > + clk_register_clkdev(clk[rtc_gate], "ipg", "imx21-rtc"); > clk_register_clkdev(clk[epit1_gate], "epit", NULL); > clk_register_clkdev(clk[epit2_gate], "epit", NULL); > clk_register_clkdev(clk[nfc], NULL, "imx27-nand.0"); This should probably go in a separate patch so that Shawn can apply it. > diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c > index 09d422b..e916a91 100644 > --- a/drivers/rtc/rtc-mxc.c > +++ b/drivers/rtc/rtc-mxc.c > @@ -79,7 +79,8 @@ struct rtc_plat_data { > struct rtc_device *rtc; > void __iomem *ioaddr; > int irq; > - struct clk *clk; > + struct clk *clk_rtc; > + struct clk *clk_ipg; > struct rtc_time g_rtc_alarm; > enum imx_rtc_type devtype; > }; > @@ -373,17 +374,24 @@ static int mxc_rtc_probe(struct platform_device *pdev) > if (IS_ERR(pdata->ioaddr)) > return PTR_ERR(pdata->ioaddr); > > - pdata->clk = devm_clk_get(&pdev->dev, NULL); > - if (IS_ERR(pdata->clk)) { > - dev_err(&pdev->dev, "unable to get clock!\n"); > - return PTR_ERR(pdata->clk); > + pdata->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); > + if (IS_ERR(pdata->clk_ipg)) { > + dev_err(&pdev->dev, "unable to get ipg clock!\n"); > + return PTR_ERR(pdata->clk_ipg); > } > > - ret = clk_prepare_enable(pdata->clk); > + ret = clk_prepare_enable(pdata->clk_ipg); > if (ret) > return ret; > > - rate = clk_get_rate(pdata->clk); > + pdata->clk_rtc = devm_clk_get(&pdev->dev, "rtc"); > + if (IS_ERR(pdata->clk_rtc)) { > + dev_err(&pdev->dev, "unable to get rtc clock!\n"); > + ret = PTR_ERR(pdata->clk_rtc); > + goto exit_put_clk; > + } > + > + rate = clk_get_rate(pdata->clk_rtc); You are getting the rate but don't you need to clk_prepare_enable()? Also, aren't those devm_clk_get now failing on i.mx35? Maybe it was already failing before that patch as I don't see any rtc clock being registeres in clk-imx35.c > > if (rate == 32768) > reg = RTC_INPUT_CLK_32768HZ; > @@ -432,7 +440,7 @@ static int mxc_rtc_probe(struct platform_device *pdev) > return 0; > > exit_put_clk: > - clk_disable_unprepare(pdata->clk); > + clk_disable_unprepare(pdata->clk_ipg); > > return ret; > } > @@ -441,7 +449,7 @@ static int mxc_rtc_remove(struct platform_device *pdev) > { > struct rtc_plat_data *pdata = platform_get_drvdata(pdev); > > - clk_disable_unprepare(pdata->clk); > + clk_disable_unprepare(pdata->clk_ipg); > > return 0; > } > -- > 1.7.4.4 > -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.free-electrons.com (down.free-electrons.com. [37.187.137.238]) by gmr-mx.google.com with ESMTP id p12si120088wiv.1.2015.05.28.04.57.32 for ; Thu, 28 May 2015 04:57:33 -0700 (PDT) Date: Thu, 28 May 2015 13:57:31 +0200 From: Alexandre Belloni To: Philippe Reynes Cc: shawn.guo@linaro.org, kernel@pengutronix.de, linux@arm.linux.org.uk, a.zummo@towertech.it, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, rtc-linux@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, fabio.estevam@freescale.com Subject: [rtc-linux] Re: [PATCH 1/2] rtc: mxc: add a second clock Message-ID: <20150528115731.GN2185@piout.net> References: <1431729330-7625-1-git-send-email-tremyfr@gmail.com> <1431729330-7625-2-git-send-email-tremyfr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 In-Reply-To: <1431729330-7625-2-git-send-email-tremyfr@gmail.com> Reply-To: rtc-linux@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Hi, On 16/05/2015 at 00:35:29 +0200, Philippe Reynes wrote : > The mxc RTC needs two clocks, one for the input > reference, and one for the IP. But this driver > was only using one clock (for the reference). > This patch add the second clock (for the IP). > > Signed-off-by: Philippe Reynes > --- > arch/arm/mach-imx/clk-imx31.c | 3 ++- > drivers/rtc/rtc-mxc.c | 26 +++++++++++++++++--------- > 2 files changed, 19 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c > index 286ef42..480c54f 100644 > --- a/arch/arm/mach-imx/clk-imx31.c > +++ b/arch/arm/mach-imx/clk-imx31.c > @@ -130,7 +130,8 @@ int __init mx31_clocks_init(unsigned long fref) > clk_register_clkdev(clk[cspi3_gate], NULL, "imx31-cspi.2"); > clk_register_clkdev(clk[pwm_gate], "pwm", NULL); > clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0"); > - clk_register_clkdev(clk[rtc_gate], NULL, "imx21-rtc"); > + clk_register_clkdev(clk[ckil], "rtc", "imx21-rtc"); > + clk_register_clkdev(clk[rtc_gate], "ipg", "imx21-rtc"); > clk_register_clkdev(clk[epit1_gate], "epit", NULL); > clk_register_clkdev(clk[epit2_gate], "epit", NULL); > clk_register_clkdev(clk[nfc], NULL, "imx27-nand.0"); This should probably go in a separate patch so that Shawn can apply it. > diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c > index 09d422b..e916a91 100644 > --- a/drivers/rtc/rtc-mxc.c > +++ b/drivers/rtc/rtc-mxc.c > @@ -79,7 +79,8 @@ struct rtc_plat_data { > struct rtc_device *rtc; > void __iomem *ioaddr; > int irq; > - struct clk *clk; > + struct clk *clk_rtc; > + struct clk *clk_ipg; > struct rtc_time g_rtc_alarm; > enum imx_rtc_type devtype; > }; > @@ -373,17 +374,24 @@ static int mxc_rtc_probe(struct platform_device *pdev) > if (IS_ERR(pdata->ioaddr)) > return PTR_ERR(pdata->ioaddr); > > - pdata->clk = devm_clk_get(&pdev->dev, NULL); > - if (IS_ERR(pdata->clk)) { > - dev_err(&pdev->dev, "unable to get clock!\n"); > - return PTR_ERR(pdata->clk); > + pdata->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); > + if (IS_ERR(pdata->clk_ipg)) { > + dev_err(&pdev->dev, "unable to get ipg clock!\n"); > + return PTR_ERR(pdata->clk_ipg); > } > > - ret = clk_prepare_enable(pdata->clk); > + ret = clk_prepare_enable(pdata->clk_ipg); > if (ret) > return ret; > > - rate = clk_get_rate(pdata->clk); > + pdata->clk_rtc = devm_clk_get(&pdev->dev, "rtc"); > + if (IS_ERR(pdata->clk_rtc)) { > + dev_err(&pdev->dev, "unable to get rtc clock!\n"); > + ret = PTR_ERR(pdata->clk_rtc); > + goto exit_put_clk; > + } > + > + rate = clk_get_rate(pdata->clk_rtc); You are getting the rate but don't you need to clk_prepare_enable()? Also, aren't those devm_clk_get now failing on i.mx35? Maybe it was already failing before that patch as I don't see any rtc clock being registeres in clk-imx35.c > > if (rate == 32768) > reg = RTC_INPUT_CLK_32768HZ; > @@ -432,7 +440,7 @@ static int mxc_rtc_probe(struct platform_device *pdev) > return 0; > > exit_put_clk: > - clk_disable_unprepare(pdata->clk); > + clk_disable_unprepare(pdata->clk_ipg); > > return ret; > } > @@ -441,7 +449,7 @@ static int mxc_rtc_remove(struct platform_device *pdev) > { > struct rtc_plat_data *pdata = platform_get_drvdata(pdev); > > - clk_disable_unprepare(pdata->clk); > + clk_disable_unprepare(pdata->clk_ipg); > > return 0; > } > -- > 1.7.4.4 > -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -- -- You received this message because you are subscribed to "rtc-linux". Membership options at http://groups.google.com/group/rtc-linux . Please read http://groups.google.com/group/rtc-linux/web/checklist before submitting a driver. --- You received this message because you are subscribed to the Google Groups "rtc-linux" group. To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandre Belloni Subject: Re: [PATCH 1/2] rtc: mxc: add a second clock Date: Thu, 28 May 2015 13:57:31 +0200 Message-ID: <20150528115731.GN2185@piout.net> References: <1431729330-7625-1-git-send-email-tremyfr@gmail.com> <1431729330-7625-2-git-send-email-tremyfr@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1431729330-7625-2-git-send-email-tremyfr-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Philippe Reynes Cc: shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org, a.zummo-BfzFCNDTiLLj+vYz1yj4TQ@public.gmane.org, robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, pawel.moll-5wv7dgnIgG8@public.gmane.org, mark.rutland-5wv7dgnIgG8@public.gmane.org, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org, galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org List-Id: devicetree@vger.kernel.org Hi, On 16/05/2015 at 00:35:29 +0200, Philippe Reynes wrote : > The mxc RTC needs two clocks, one for the input > reference, and one for the IP. But this driver > was only using one clock (for the reference). > This patch add the second clock (for the IP). > > Signed-off-by: Philippe Reynes > --- > arch/arm/mach-imx/clk-imx31.c | 3 ++- > drivers/rtc/rtc-mxc.c | 26 +++++++++++++++++--------- > 2 files changed, 19 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c > index 286ef42..480c54f 100644 > --- a/arch/arm/mach-imx/clk-imx31.c > +++ b/arch/arm/mach-imx/clk-imx31.c > @@ -130,7 +130,8 @@ int __init mx31_clocks_init(unsigned long fref) > clk_register_clkdev(clk[cspi3_gate], NULL, "imx31-cspi.2"); > clk_register_clkdev(clk[pwm_gate], "pwm", NULL); > clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0"); > - clk_register_clkdev(clk[rtc_gate], NULL, "imx21-rtc"); > + clk_register_clkdev(clk[ckil], "rtc", "imx21-rtc"); > + clk_register_clkdev(clk[rtc_gate], "ipg", "imx21-rtc"); > clk_register_clkdev(clk[epit1_gate], "epit", NULL); > clk_register_clkdev(clk[epit2_gate], "epit", NULL); > clk_register_clkdev(clk[nfc], NULL, "imx27-nand.0"); This should probably go in a separate patch so that Shawn can apply it. > diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c > index 09d422b..e916a91 100644 > --- a/drivers/rtc/rtc-mxc.c > +++ b/drivers/rtc/rtc-mxc.c > @@ -79,7 +79,8 @@ struct rtc_plat_data { > struct rtc_device *rtc; > void __iomem *ioaddr; > int irq; > - struct clk *clk; > + struct clk *clk_rtc; > + struct clk *clk_ipg; > struct rtc_time g_rtc_alarm; > enum imx_rtc_type devtype; > }; > @@ -373,17 +374,24 @@ static int mxc_rtc_probe(struct platform_device *pdev) > if (IS_ERR(pdata->ioaddr)) > return PTR_ERR(pdata->ioaddr); > > - pdata->clk = devm_clk_get(&pdev->dev, NULL); > - if (IS_ERR(pdata->clk)) { > - dev_err(&pdev->dev, "unable to get clock!\n"); > - return PTR_ERR(pdata->clk); > + pdata->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); > + if (IS_ERR(pdata->clk_ipg)) { > + dev_err(&pdev->dev, "unable to get ipg clock!\n"); > + return PTR_ERR(pdata->clk_ipg); > } > > - ret = clk_prepare_enable(pdata->clk); > + ret = clk_prepare_enable(pdata->clk_ipg); > if (ret) > return ret; > > - rate = clk_get_rate(pdata->clk); > + pdata->clk_rtc = devm_clk_get(&pdev->dev, "rtc"); > + if (IS_ERR(pdata->clk_rtc)) { > + dev_err(&pdev->dev, "unable to get rtc clock!\n"); > + ret = PTR_ERR(pdata->clk_rtc); > + goto exit_put_clk; > + } > + > + rate = clk_get_rate(pdata->clk_rtc); You are getting the rate but don't you need to clk_prepare_enable()? Also, aren't those devm_clk_get now failing on i.mx35? Maybe it was already failing before that patch as I don't see any rtc clock being registeres in clk-imx35.c > > if (rate == 32768) > reg = RTC_INPUT_CLK_32768HZ; > @@ -432,7 +440,7 @@ static int mxc_rtc_probe(struct platform_device *pdev) > return 0; > > exit_put_clk: > - clk_disable_unprepare(pdata->clk); > + clk_disable_unprepare(pdata->clk_ipg); > > return ret; > } > @@ -441,7 +449,7 @@ static int mxc_rtc_remove(struct platform_device *pdev) > { > struct rtc_plat_data *pdata = platform_get_drvdata(pdev); > > - clk_disable_unprepare(pdata->clk); > + clk_disable_unprepare(pdata->clk_ipg); > > return 0; > } > -- > 1.7.4.4 > -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: alexandre.belloni@free-electrons.com (Alexandre Belloni) Date: Thu, 28 May 2015 13:57:31 +0200 Subject: [PATCH 1/2] rtc: mxc: add a second clock In-Reply-To: <1431729330-7625-2-git-send-email-tremyfr@gmail.com> References: <1431729330-7625-1-git-send-email-tremyfr@gmail.com> <1431729330-7625-2-git-send-email-tremyfr@gmail.com> Message-ID: <20150528115731.GN2185@piout.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, On 16/05/2015 at 00:35:29 +0200, Philippe Reynes wrote : > The mxc RTC needs two clocks, one for the input > reference, and one for the IP. But this driver > was only using one clock (for the reference). > This patch add the second clock (for the IP). > > Signed-off-by: Philippe Reynes > --- > arch/arm/mach-imx/clk-imx31.c | 3 ++- > drivers/rtc/rtc-mxc.c | 26 +++++++++++++++++--------- > 2 files changed, 19 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c > index 286ef42..480c54f 100644 > --- a/arch/arm/mach-imx/clk-imx31.c > +++ b/arch/arm/mach-imx/clk-imx31.c > @@ -130,7 +130,8 @@ int __init mx31_clocks_init(unsigned long fref) > clk_register_clkdev(clk[cspi3_gate], NULL, "imx31-cspi.2"); > clk_register_clkdev(clk[pwm_gate], "pwm", NULL); > clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0"); > - clk_register_clkdev(clk[rtc_gate], NULL, "imx21-rtc"); > + clk_register_clkdev(clk[ckil], "rtc", "imx21-rtc"); > + clk_register_clkdev(clk[rtc_gate], "ipg", "imx21-rtc"); > clk_register_clkdev(clk[epit1_gate], "epit", NULL); > clk_register_clkdev(clk[epit2_gate], "epit", NULL); > clk_register_clkdev(clk[nfc], NULL, "imx27-nand.0"); This should probably go in a separate patch so that Shawn can apply it. > diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c > index 09d422b..e916a91 100644 > --- a/drivers/rtc/rtc-mxc.c > +++ b/drivers/rtc/rtc-mxc.c > @@ -79,7 +79,8 @@ struct rtc_plat_data { > struct rtc_device *rtc; > void __iomem *ioaddr; > int irq; > - struct clk *clk; > + struct clk *clk_rtc; > + struct clk *clk_ipg; > struct rtc_time g_rtc_alarm; > enum imx_rtc_type devtype; > }; > @@ -373,17 +374,24 @@ static int mxc_rtc_probe(struct platform_device *pdev) > if (IS_ERR(pdata->ioaddr)) > return PTR_ERR(pdata->ioaddr); > > - pdata->clk = devm_clk_get(&pdev->dev, NULL); > - if (IS_ERR(pdata->clk)) { > - dev_err(&pdev->dev, "unable to get clock!\n"); > - return PTR_ERR(pdata->clk); > + pdata->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); > + if (IS_ERR(pdata->clk_ipg)) { > + dev_err(&pdev->dev, "unable to get ipg clock!\n"); > + return PTR_ERR(pdata->clk_ipg); > } > > - ret = clk_prepare_enable(pdata->clk); > + ret = clk_prepare_enable(pdata->clk_ipg); > if (ret) > return ret; > > - rate = clk_get_rate(pdata->clk); > + pdata->clk_rtc = devm_clk_get(&pdev->dev, "rtc"); > + if (IS_ERR(pdata->clk_rtc)) { > + dev_err(&pdev->dev, "unable to get rtc clock!\n"); > + ret = PTR_ERR(pdata->clk_rtc); > + goto exit_put_clk; > + } > + > + rate = clk_get_rate(pdata->clk_rtc); You are getting the rate but don't you need to clk_prepare_enable()? Also, aren't those devm_clk_get now failing on i.mx35? Maybe it was already failing before that patch as I don't see any rtc clock being registeres in clk-imx35.c > > if (rate == 32768) > reg = RTC_INPUT_CLK_32768HZ; > @@ -432,7 +440,7 @@ static int mxc_rtc_probe(struct platform_device *pdev) > return 0; > > exit_put_clk: > - clk_disable_unprepare(pdata->clk); > + clk_disable_unprepare(pdata->clk_ipg); > > return ret; > } > @@ -441,7 +449,7 @@ static int mxc_rtc_remove(struct platform_device *pdev) > { > struct rtc_plat_data *pdata = platform_get_drvdata(pdev); > > - clk_disable_unprepare(pdata->clk); > + clk_disable_unprepare(pdata->clk_ipg); > > return 0; > } > -- > 1.7.4.4 > -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com