From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Philippe Reynes <tremyfr@gmail.com>
Cc: a.zummo@towertech.it, shawn.guo@linaro.org,
kernel@pengutronix.de, linux@arm.linux.org.uk,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com
Subject: Re: [rtc-linux] [PATCH v4 3/7] rtc: mxc: use a second rtc clock
Date: Tue, 14 Jul 2015 23:49:28 +0200 [thread overview]
Message-ID: <20150714214928.GA24706@piout.net> (raw)
In-Reply-To: <1435965320-1478-4-git-send-email-tremyfr@gmail.com>
On 04/07/2015 at 01:15:16 +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 <tremyfr@gmail.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
I don't really care how the clocks are named, feel free to rename them
and keep that ack.
> ---
> drivers/rtc/rtc-mxc.c | 41 ++++++++++++++++++++++++++++-------------
> 1 files changed, 28 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
> index 5fc292c..4ce7e21 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,28 @@ 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_ipg;
> + }
> +
> + ret = clk_prepare_enable(pdata->clk_rtc);
> + if (ret)
> + goto exit_put_clk_ipg;
> +
> + rate = clk_get_rate(pdata->clk_rtc);
>
> if (rate == 32768)
> reg = RTC_INPUT_CLK_32768HZ;
> @@ -394,7 +406,7 @@ static int mxc_rtc_probe(struct platform_device *pdev)
> else {
> dev_err(&pdev->dev, "rtc clock is not valid (%lu)\n", rate);
> ret = -EINVAL;
> - goto exit_put_clk;
> + goto exit_put_clk_rtc;
> }
>
> reg |= RTC_ENABLE_BIT;
> @@ -402,7 +414,7 @@ static int mxc_rtc_probe(struct platform_device *pdev)
> if (((readw(pdata->ioaddr + RTC_RTCCTL)) & RTC_ENABLE_BIT) == 0) {
> dev_err(&pdev->dev, "hardware module can't be enabled!\n");
> ret = -EIO;
> - goto exit_put_clk;
> + goto exit_put_clk_rtc;
> }
>
> platform_set_drvdata(pdev, pdata);
> @@ -424,15 +436,17 @@ static int mxc_rtc_probe(struct platform_device *pdev)
> THIS_MODULE);
> if (IS_ERR(rtc)) {
> ret = PTR_ERR(rtc);
> - goto exit_put_clk;
> + goto exit_put_clk_rtc;
> }
>
> pdata->rtc = rtc;
>
> return 0;
>
> -exit_put_clk:
> - clk_disable_unprepare(pdata->clk);
> +exit_put_clk_rtc:
> + clk_disable_unprepare(pdata->clk_rtc);
> +exit_put_clk_ipg:
> + clk_disable_unprepare(pdata->clk_ipg);
>
> return ret;
> }
> @@ -441,7 +455,8 @@ 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_rtc);
> + clk_disable_unprepare(pdata->clk_ipg);
>
> return 0;
> }
> --
> 1.7.4.4
>
> --
> --
> 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.
--
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.
WARNING: multiple messages have this Message-ID (diff)
From: alexandre.belloni@free-electrons.com (Alexandre Belloni)
To: linux-arm-kernel@lists.infradead.org
Subject: [rtc-linux] [PATCH v4 3/7] rtc: mxc: use a second rtc clock
Date: Tue, 14 Jul 2015 23:49:28 +0200 [thread overview]
Message-ID: <20150714214928.GA24706@piout.net> (raw)
In-Reply-To: <1435965320-1478-4-git-send-email-tremyfr@gmail.com>
On 04/07/2015 at 01:15:16 +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 <tremyfr@gmail.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
I don't really care how the clocks are named, feel free to rename them
and keep that ack.
> ---
> drivers/rtc/rtc-mxc.c | 41 ++++++++++++++++++++++++++++-------------
> 1 files changed, 28 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
> index 5fc292c..4ce7e21 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,28 @@ 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_ipg;
> + }
> +
> + ret = clk_prepare_enable(pdata->clk_rtc);
> + if (ret)
> + goto exit_put_clk_ipg;
> +
> + rate = clk_get_rate(pdata->clk_rtc);
>
> if (rate == 32768)
> reg = RTC_INPUT_CLK_32768HZ;
> @@ -394,7 +406,7 @@ static int mxc_rtc_probe(struct platform_device *pdev)
> else {
> dev_err(&pdev->dev, "rtc clock is not valid (%lu)\n", rate);
> ret = -EINVAL;
> - goto exit_put_clk;
> + goto exit_put_clk_rtc;
> }
>
> reg |= RTC_ENABLE_BIT;
> @@ -402,7 +414,7 @@ static int mxc_rtc_probe(struct platform_device *pdev)
> if (((readw(pdata->ioaddr + RTC_RTCCTL)) & RTC_ENABLE_BIT) == 0) {
> dev_err(&pdev->dev, "hardware module can't be enabled!\n");
> ret = -EIO;
> - goto exit_put_clk;
> + goto exit_put_clk_rtc;
> }
>
> platform_set_drvdata(pdev, pdata);
> @@ -424,15 +436,17 @@ static int mxc_rtc_probe(struct platform_device *pdev)
> THIS_MODULE);
> if (IS_ERR(rtc)) {
> ret = PTR_ERR(rtc);
> - goto exit_put_clk;
> + goto exit_put_clk_rtc;
> }
>
> pdata->rtc = rtc;
>
> return 0;
>
> -exit_put_clk:
> - clk_disable_unprepare(pdata->clk);
> +exit_put_clk_rtc:
> + clk_disable_unprepare(pdata->clk_rtc);
> +exit_put_clk_ipg:
> + clk_disable_unprepare(pdata->clk_ipg);
>
> return ret;
> }
> @@ -441,7 +455,8 @@ 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_rtc);
> + clk_disable_unprepare(pdata->clk_ipg);
>
> return 0;
> }
> --
> 1.7.4.4
>
> --
> --
> 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 at googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
WARNING: multiple messages have this Message-ID (diff)
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Philippe Reynes <tremyfr@gmail.com>
Cc: a.zummo@towertech.it, shawn.guo@linaro.org,
kernel@pengutronix.de, linux@arm.linux.org.uk,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com
Subject: Re: [rtc-linux] [PATCH v4 3/7] rtc: mxc: use a second rtc clock
Date: Tue, 14 Jul 2015 23:49:28 +0200 [thread overview]
Message-ID: <20150714214928.GA24706@piout.net> (raw)
In-Reply-To: <1435965320-1478-4-git-send-email-tremyfr@gmail.com>
On 04/07/2015 at 01:15:16 +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 <tremyfr@gmail.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
I don't really care how the clocks are named, feel free to rename them
and keep that ack.
> ---
> drivers/rtc/rtc-mxc.c | 41 ++++++++++++++++++++++++++++-------------
> 1 files changed, 28 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
> index 5fc292c..4ce7e21 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,28 @@ 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_ipg;
> + }
> +
> + ret = clk_prepare_enable(pdata->clk_rtc);
> + if (ret)
> + goto exit_put_clk_ipg;
> +
> + rate = clk_get_rate(pdata->clk_rtc);
>
> if (rate == 32768)
> reg = RTC_INPUT_CLK_32768HZ;
> @@ -394,7 +406,7 @@ static int mxc_rtc_probe(struct platform_device *pdev)
> else {
> dev_err(&pdev->dev, "rtc clock is not valid (%lu)\n", rate);
> ret = -EINVAL;
> - goto exit_put_clk;
> + goto exit_put_clk_rtc;
> }
>
> reg |= RTC_ENABLE_BIT;
> @@ -402,7 +414,7 @@ static int mxc_rtc_probe(struct platform_device *pdev)
> if (((readw(pdata->ioaddr + RTC_RTCCTL)) & RTC_ENABLE_BIT) == 0) {
> dev_err(&pdev->dev, "hardware module can't be enabled!\n");
> ret = -EIO;
> - goto exit_put_clk;
> + goto exit_put_clk_rtc;
> }
>
> platform_set_drvdata(pdev, pdata);
> @@ -424,15 +436,17 @@ static int mxc_rtc_probe(struct platform_device *pdev)
> THIS_MODULE);
> if (IS_ERR(rtc)) {
> ret = PTR_ERR(rtc);
> - goto exit_put_clk;
> + goto exit_put_clk_rtc;
> }
>
> pdata->rtc = rtc;
>
> return 0;
>
> -exit_put_clk:
> - clk_disable_unprepare(pdata->clk);
> +exit_put_clk_rtc:
> + clk_disable_unprepare(pdata->clk_rtc);
> +exit_put_clk_ipg:
> + clk_disable_unprepare(pdata->clk_ipg);
>
> return ret;
> }
> @@ -441,7 +455,8 @@ 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_rtc);
> + clk_disable_unprepare(pdata->clk_ipg);
>
> return 0;
> }
> --
> 1.7.4.4
>
> --
> --
> 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.
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
next prev parent reply other threads:[~2015-07-14 21:49 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-03 23:15 [rtc-linux] [PATCH v4 0/7] add device tree support for mxc rtc Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-03 23:15 ` [rtc-linux] [PATCH v4 1/7] imx31: add a second rtc clock Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-03 23:15 ` [rtc-linux] [PATCH v4 2/7] imx35: define two clocks for rtc Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-03 23:15 ` [rtc-linux] [PATCH v4 3/7] rtc: mxc: use a second rtc clock Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-14 21:49 ` Alexandre Belloni [this message]
2015-07-14 21:49 ` [rtc-linux] " Alexandre Belloni
2015-07-14 21:49 ` Alexandre Belloni
2015-07-03 23:15 ` [rtc-linux] [PATCH v4 4/7] rtc: mxc: add support of device tree Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-14 21:52 ` [rtc-linux] " Alexandre Belloni
2015-07-14 21:52 ` Alexandre Belloni
2015-07-03 23:15 ` [rtc-linux] [PATCH v4 5/7] dt-binding: document the binding for mxc rtc Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-09 14:26 ` [rtc-linux] " Shawn Guo
2015-07-09 14:26 ` Shawn Guo
2015-07-09 14:26 ` Shawn Guo
2015-07-09 14:26 ` Shawn Guo
2015-07-10 19:58 ` [rtc-linux] " Rob Herring
2015-07-10 19:58 ` Rob Herring
2015-07-10 19:58 ` Rob Herring
2015-07-10 19:58 ` Rob Herring
2015-07-03 23:15 ` [rtc-linux] [PATCH v4 6/7] imx27: dt: add support of internal rtc Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-09 14:32 ` [rtc-linux] " Shawn Guo
2015-07-09 14:32 ` Shawn Guo
2015-07-09 14:32 ` Shawn Guo
2015-07-03 23:15 ` [rtc-linux] [PATCH v4 7/7] apf27: dt: enable " Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
2015-07-03 23:15 ` Philippe Reynes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150714214928.GA24706@piout.net \
--to=alexandre.belloni@free-electrons.com \
--cc=a.zummo@towertech.it \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=rtc-linux@googlegroups.com \
--cc=shawn.guo@linaro.org \
--cc=tremyfr@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.