[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1593079768-9349-2-git-send-email-claudiu.beznea@microchip.com>
Date: Thu, 25 Jun 2020 13:09:28 +0300
From: Claudiu Beznea <claudiu.beznea@...rochip.com>
To: <mturquette@...libre.com>, <sboyd@...nel.org>,
<nicolas.ferre@...rochip.com>, <alexandre.belloni@...tlin.com>,
<ludovic.desroches@...rochip.com>, <linux-kernel@...r.kernel.org>
CC: <mturquette@...aro.org>, <bbrezillon@...nel.org>,
<linux-clk@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
"Claudiu Beznea" <claudiu.beznea@...rochip.com>
Subject: [PATCH 2/2] clk: at91: main: do not continue if oscillators already prepared
Return in clk_main_osc_prepare()/clk_main_rc_osc_prepare() if
oscillators are already enabled.
Fixes: 27cb1c2083373 ("clk: at91: rework main clk implementation")
Fixes: 1bdf02326b71e ("clk: at91: make use of syscon/regmap internally")
Signed-off-by: Claudiu Beznea <claudiu.beznea@...rochip.com>
---
drivers/clk/at91/clk-main.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index 37c22667e831..46b4d2131989 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -74,13 +74,11 @@ static int clk_main_osc_prepare(struct clk_hw *hw)
regmap_read(regmap, AT91_CKGR_MOR, &tmp);
tmp &= ~MOR_KEY_MASK;
- if (tmp & AT91_PMC_OSCBYPASS)
+ if (tmp & (AT91_PMC_OSCBYPASS | AT91_PMC_MOSCEN))
return 0;
- if (!(tmp & AT91_PMC_MOSCEN)) {
- tmp |= AT91_PMC_MOSCEN | AT91_PMC_KEY;
- regmap_write(regmap, AT91_CKGR_MOR, tmp);
- }
+ tmp |= AT91_PMC_MOSCEN | AT91_PMC_KEY;
+ regmap_write(regmap, AT91_CKGR_MOR, tmp);
while (!clk_main_osc_ready(regmap))
cpu_relax();
@@ -186,10 +184,12 @@ static int clk_main_rc_osc_prepare(struct clk_hw *hw)
regmap_read(regmap, AT91_CKGR_MOR, &mor);
- if (!(mor & AT91_PMC_MOSCRCEN))
- regmap_update_bits(regmap, AT91_CKGR_MOR,
- MOR_KEY_MASK | AT91_PMC_MOSCRCEN,
- AT91_PMC_MOSCRCEN | AT91_PMC_KEY);
+ if (mor & AT91_PMC_MOSCRCEN)
+ return 0;
+
+ regmap_update_bits(regmap, AT91_CKGR_MOR,
+ MOR_KEY_MASK | AT91_PMC_MOSCRCEN,
+ AT91_PMC_MOSCRCEN | AT91_PMC_KEY);
while (!clk_main_rc_osc_ready(regmap))
cpu_relax();
--
2.7.4
Powered by blists - more mailing lists