lkml.org 
[lkml]   [2019]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 44/50] clk: at91: select parent if main oscillator or bypass is enabled
    Date
    From: Eugen Hristev <eugen.hristev@microchip.com>

    [ Upstream commit 69a6bcde7fd3fe6f3268ce26f31d9d9378384c98 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 c813c27f2e58c..2f97a843d6d6b 100644
    --- a/drivers/clk/at91/clk-main.c
    +++ b/drivers/clk/at91/clk-main.c
    @@ -27,6 +27,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;
    @@ -119,7 +123,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 = {
    @@ -530,7 +534,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 = {
    @@ -572,7 +576,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);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-09-24 18:56    [W:4.058 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site