clk: at91: select parent if main oscillator or bypass is enabled

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>
Link: https://lkml.kernel.org/r/1568042692-11784-2-git-send-email-eugen.hristev@microchip.com
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index ebe9b9998b40f99ff3aff57b5c8d905e96fb12f1..87083b3a2769d2f383f381a1f82cc219a6ac953e 100644 (file)
--- 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);