From: johan@kernel.org (Johan Hovold)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 08/10] rtc: at91sam9: use clk API instead of relying on AT91_SLOW_CLOCK
Date: Tue, 23 Sep 2014 12:33:26 +0200 [thread overview]
Message-ID: <20140923103326.GA404@localhost> (raw)
In-Reply-To: <1411465130-29011-9-git-send-email-boris.brezillon@free-electrons.com>
On Tue, Sep 23, 2014 at 11:38:48AM +0200, Boris BREZILLON wrote:
> @@ -328,6 +328,7 @@ static int at91_rtc_probe(struct platform_device *pdev)
> struct sam9_rtc *rtc;
> int ret, irq;
> u32 mr;
> + unsigned int sclk_rate;
>
> irq = platform_get_irq(pdev, 0);
> if (irq < 0) {
> @@ -385,11 +386,27 @@ static int at91_rtc_probe(struct platform_device *pdev)
> return -ENOMEM;
> }
>
> + rtc->sclk = devm_clk_get(&pdev->dev, NULL);
> + if (IS_ERR(rtc->sclk))
> + return PTR_ERR(rtc->sclk);
> +
> + sclk_rate = clk_get_rate(rtc->sclk);
> + if (!sclk_rate || sclk_rate > AT91_RTT_RTTRST) {
You probably meant AT91_RTT_RTPRES here.
> + dev_err(&pdev->dev, "Invalid slow clock rate");
> + return -EINVAL;
> + }
> +
> + ret = clk_prepare_enable(rtc->sclk);
> + if (ret) {
> + dev_err(&pdev->dev, "Could not enable slow clock");
> + return ret;
> + }
> +
> mr = rtt_readl(rtc, MR);
>
> /* unless RTT is counting at 1 Hz, re-initialize it */
> - if ((mr & AT91_RTT_RTPRES) != AT91_SLOW_CLOCK) {
> - mr = AT91_RTT_RTTRST | (AT91_SLOW_CLOCK & AT91_RTT_RTPRES);
> + if ((mr & AT91_RTT_RTPRES) != sclk_rate) {
> + mr = AT91_RTT_RTTRST | (sclk_rate & AT91_RTT_RTPRES);
> gpbr_writel(rtc, 0);
> }
Johan
next prev parent reply other threads:[~2014-09-23 10:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-23 9:38 [PATCH v7 00/10] rtc: at91sam9: add DT support Boris BREZILLON
2014-09-23 9:38 ` [PATCH v7 01/10] rtc: at91sam9: remove references to mach specific headers Boris BREZILLON
2014-09-23 9:38 ` [PATCH v7 02/10] rtc: at91sam9: use standard readl/writel functions instead of raw versions Boris BREZILLON
2014-09-23 9:38 ` [PATCH v7 03/10] rtc: at91sam9: replace devm_ioremap by devm_ioremap_resource Boris BREZILLON
2014-09-23 9:38 ` [PATCH v7 04/10] rtc: at91sam9: add DT support Boris BREZILLON
2014-09-23 9:38 ` [PATCH v7 05/10] rtc: at91sam9: make use of syscon/regmap to access GPBR registers Boris BREZILLON
2014-09-23 9:38 ` [PATCH v7 06/10] rtc: at91sam9: rework the Kconfig description Boris BREZILLON
2014-09-23 10:08 ` Nicolas Ferre
2014-09-23 10:11 ` Boris BREZILLON
2014-09-23 10:39 ` Johan Hovold
2014-09-23 9:38 ` [PATCH v7 07/10] ARM: at91: add clk_lookup entry for RTT devices Boris BREZILLON
2014-09-23 9:38 ` [PATCH v7 08/10] rtc: at91sam9: use clk API instead of relying on AT91_SLOW_CLOCK Boris BREZILLON
2014-09-23 10:33 ` Johan Hovold [this message]
2014-09-23 11:05 ` Boris BREZILLON
2014-09-23 9:38 ` [PATCH v7 09/10] rtc: at91sam9: add DT bindings documentation Boris BREZILLON
2014-09-23 9:38 ` [PATCH v7 10/10] mfd: syscon: add Atmel GPBR DT bindings documention Boris BREZILLON
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=20140923103326.GA404@localhost \
--to=johan@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).