From: <Claudiu.Beznea@microchip.com>
To: <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH 2/2] clk: at91: select parent if main oscillator or bypass is enabled
Date: Mon, 16 Sep 2019 05:25:30 +0000 [thread overview]
Message-ID: <9bef0859-e4b0-1012-60f5-aa919d7fc888@microchip.com> (raw)
In-Reply-To: <1568042692-11784-2-git-send-email-eugen.hristev@microchip.com>
On 09.09.2019 18:30, Eugen.Hristev@microchip.com wrote:
> From: Eugen Hristev <eugen.hristev@microchip.com>
>
> Selecting the right parent for the main clock is done using only
> main oscillator enabled bit.
> In case we have this oscillator bypassed by an external signal (no driving
> on the XOUT line), we still use external clock, but with BYPASS bit set.
> So, in this case we must select the same parent as before.
> Create a macro that will select the right parent considering both bits from
> the MOR register.
> Use this macro when looking for the right parent.
>
> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
> ---
> drivers/clk/at91/clk-main.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
> index ebe9b99..87083b3 100644
> --- a/drivers/clk/at91/clk-main.c
> +++ b/drivers/clk/at91/clk-main.c
> @@ -21,6 +21,10 @@
>
> #define MOR_KEY_MASK (0xff << 16)
>
> +#define clk_main_parent_select(s) (((s) & \
> + (AT91_PMC_MOSCEN | \
> + AT91_PMC_OSCBYPASS)) ? 1 : 0)
> +
> struct clk_main_osc {
> struct clk_hw hw;
> struct regmap *regmap;
> @@ -113,7 +117,7 @@ static int clk_main_osc_is_prepared(struct clk_hw *hw)
>
> regmap_read(regmap, AT91_PMC_SR, &status);
>
> - return (status & AT91_PMC_MOSCS) && (tmp & AT91_PMC_MOSCEN);
> + return (status & AT91_PMC_MOSCS) && clk_main_parent_select(tmp);
> }
>
> static const struct clk_ops main_osc_ops = {
> @@ -450,7 +454,7 @@ static u8 clk_sam9x5_main_get_parent(struct clk_hw *hw)
>
> regmap_read(clkmain->regmap, AT91_CKGR_MOR, &status);
>
> - return status & AT91_PMC_MOSCEN ? 1 : 0;
> + return clk_main_parent_select(status);
> }
>
> static const struct clk_ops sam9x5_main_ops = {
> @@ -492,7 +496,7 @@ at91_clk_register_sam9x5_main(struct regmap *regmap,
> clkmain->hw.init = &init;
> clkmain->regmap = regmap;
> regmap_read(clkmain->regmap, AT91_CKGR_MOR, &status);
> - clkmain->parent = status & AT91_PMC_MOSCEN ? 1 : 0;
> + clkmain->parent = clk_main_parent_select(status);
>
> hw = &clkmain->hw;
> ret = clk_hw_register(NULL, &clkmain->hw);
>
_______________________________________________
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:[~2019-09-16 5:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-09 15:30 [PATCH 1/2] clk: at91: fix update bit maps on CFG_MOR write Eugen.Hristev
2019-09-09 15:30 ` [PATCH 2/2] clk: at91: select parent if main oscillator or bypass is enabled Eugen.Hristev
2019-09-11 12:21 ` Alexandre Belloni
2019-09-16 5:25 ` Claudiu.Beznea [this message]
2019-09-16 20:15 ` Stephen Boyd
2019-09-10 15:16 ` [PATCH 1/2] clk: at91: fix update bit maps on CFG_MOR write Alexandre Belloni
2019-09-16 5:24 ` Claudiu.Beznea
2019-09-16 20:15 ` Stephen Boyd
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=9bef0859-e4b0-1012-60f5-aa919d7fc888@microchip.com \
--to=claudiu.beznea@microchip.com \
--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).