From: Maxime Ripard <maxime@cerno.tech>
To: Jernej Skrabec <jernej.skrabec@siol.net>
Cc: mark.rutland@arm.com, a.zummo@towertech.it,
alexandre.belloni@bootlin.com, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, wens@csie.org, robh+dt@kernel.org,
linux-arm-kernel@lists.infradead.org, linux-rtc@vger.kernel.org
Subject: Re: [PATCH 1/2] rtc: sun6i: Make external 32k oscillator optional
Date: Fri, 14 Feb 2020 09:14:43 +0100 [thread overview]
Message-ID: <20200214081443.ajz2sxh5ztk6qb2i@gilmour.lan> (raw)
In-Reply-To: <20200213211427.33004-2-jernej.skrabec@siol.net>
[-- Attachment #1.1: Type: text/plain, Size: 1978 bytes --]
Hi Jernej,
Thanks for taking care of this
On Thu, Feb 13, 2020 at 10:14:26PM +0100, Jernej Skrabec wrote:
> Some boards, like OrangePi PC2 (H5), OrangePi Plus 2E (H3) and Tanix TX6
> (H6) don't have external 32kHz oscillator. Till H6, it didn't really
> matter if external oscillator was enabled because HW detected error and
> fall back to internal one. H6 has same functionality but it's the first
> SoC which have "auto switch bypass" bit documented and always enabled in
> driver. This prevents RTC to work correctly if external crystal is not
> present on board. There are other side effects - all peripherals which
> depends on this clock also don't work (HDMI CEC for example).
>
> Make clocks property optional. If it is present, select external
> oscillator. If not, stay on internal.
>
> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
> ---
> drivers/rtc/rtc-sun6i.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
> index 852f5f3b3592..538cf7e19034 100644
> --- a/drivers/rtc/rtc-sun6i.c
> +++ b/drivers/rtc/rtc-sun6i.c
> @@ -250,19 +250,17 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
> writel(reg, rtc->base + SUN6I_LOSC_CTRL);
> }
>
> - /* Switch to the external, more precise, oscillator */
> - reg |= SUN6I_LOSC_CTRL_EXT_OSC;
> - if (rtc->data->has_losc_en)
> - reg |= SUN6I_LOSC_CTRL_EXT_LOSC_EN;
> + /* Switch to the external, more precise, oscillator, if present */
> + if (of_get_property(node, "clocks", NULL)) {
> + reg |= SUN6I_LOSC_CTRL_EXT_OSC;
> + if (rtc->data->has_losc_en)
> + reg |= SUN6I_LOSC_CTRL_EXT_LOSC_EN;
> + }
> writel(reg, rtc->base + SUN6I_LOSC_CTRL);
>
> /* Yes, I know, this is ugly. */
> sun6i_rtc = rtc;
>
> - /* Deal with old DTs */
> - if (!of_get_property(node, "clocks", NULL))
> - goto err;
> -
Doesn't that prevent the parents to be properly set if there's an
external crystal?
Maxime
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-02-14 8:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-13 21:14 [PATCH 0/2] rtc: sun6i: Make external oscillator optional Jernej Skrabec
2020-02-13 21:14 ` [PATCH 1/2] rtc: sun6i: Make external 32k " Jernej Skrabec
2020-02-14 8:14 ` Maxime Ripard [this message]
2020-02-14 16:42 ` Jernej Škrabec
2020-02-20 17:47 ` Maxime Ripard
2020-02-20 17:59 ` Jernej Škrabec
2020-02-13 21:14 ` [PATCH 2/2] arm64: dts: allwinner: h6: Move ext. oscillator to board DTs Jernej Skrabec
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=20200214081443.ajz2sxh5ztk6qb2i@gilmour.lan \
--to=maxime@cerno.tech \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=jernej.skrabec@siol.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=wens@csie.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).