Merge tag 'timers-urgent-2020-08-14' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / clk / at91 / clk-generated.c

diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c
index 44a46dc..b4fc8d7 100644 (file)
--- a/drivers/clk/at91/clk-generated.c
+++ b/drivers/clk/at91/clk-generated.c
@@ -18,18 +18,17 @@
 
 #define GENERATED_MAX_DIV      255
 
-#define GCK_INDEX_DT_AUDIO_PLL 5
-
 struct clk_generated {
        struct clk_hw hw;
        struct regmap *regmap;
        struct clk_range range;
        spinlock_t *lock;
+       u32 *mux_table;
        u32 id;
        u32 gckdiv;
        const struct clk_pcr_layout *layout;
        u8 parent_id;
-       bool audio_pll_allowed;
+       int chg_pid;
 };
 
 #define to_clk_generated(hw) \
@@ -83,7 +82,7 @@ static int clk_generated_is_enabled(struct clk_hw *hw)
        regmap_read(gck->regmap, gck->layout->offset, &status);
        spin_unlock_irqrestore(gck->lock, flags);
 
-       return status & AT91_PMC_PCR_GCKEN ? 1 : 0;
+       return !!(status & AT91_PMC_PCR_GCKEN);
 }
 
 static unsigned long
@@ -109,7 +108,7 @@ static void clk_generated_best_diff(struct clk_rate_request *req,
                tmp_rate = parent_rate / div;
        tmp_diff = abs(req->rate - tmp_rate);
 
-       if (*best_diff < 0 || *best_diff > tmp_diff) {
+       if (*best_diff < 0 || *best_diff >= tmp_diff) {
                *best_rate = tmp_rate;
                *best_diff = tmp_diff;
                req->best_parent_rate = parent_rate;
@@ -129,7 +128,10 @@ static int clk_generated_determine_rate(struct clk_hw *hw,
        int i;
        u32 div;
 
-       for (i = 0; i < clk_hw_get_num_parents(hw) - 1; i++) {
+       for (i = 0; i < clk_hw_get_num_parents(hw); i++) {
+               if (gck->chg_pid == i)
+                       continue;
+
                parent = clk_hw_get_parent_by_index(hw, i);
                if (!parent)
                        continue;
@@ -161,16 +163,17 @@ static int clk_generated_determine_rate(struct clk_hw *hw,
         * that the only clks able to modify gck rate are those of audio IPs.
         */
 
-       if (!gck->audio_pll_allowed)
+       if (gck->chg_pid < 0)
                goto end;
 
-       parent = clk_hw_get_parent_by_index(hw, GCK_INDEX_DT_AUDIO_PLL);
+       parent = clk_hw_get_parent_by_index(hw, gck->chg_pid);
        if (!parent)
                goto end;
 
        for (div = 1; div < GENERATED_MAX_DIV + 2; div++) {
                req_parent.rate = req->rate * div;
-               __clk_determine_rate(parent, &req_parent);
+               if (__clk_determine_rate(parent, &req_parent))
+                       continue;
                clk_generated_best_diff(req, parent, req_parent.rate, div,
                                        &best_diff, &best_rate);
 
@@ -184,8 +187,8 @@ end:
                 __clk_get_name((req->best_parent_hw)->clk),
                 req->best_parent_rate);
 
-       if (best_rate < 0)
-               return best_rate;
+       if (best_rate < 0 || (gck->range.max && best_rate > gck->range.max))
+               return -EINVAL;
 
        req->rate = best_rate;
        return 0;
@@ -199,7 +202,11 @@ static int clk_generated_set_parent(struct clk_hw *hw, u8 index)
        if (index >= clk_hw_get_num_parents(hw))
                return -EINVAL;
 
-       gck->parent_id = index;
+       if (gck->mux_table)
+               gck->parent_id = clk_mux_index_to_val(gck->mux_table, 0, index);
+       else
+               gck->parent_id = index;
+
        return 0;
 }
 
@@ -271,8 +278,9 @@ struct clk_hw * __init
 at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,
                            const struct clk_pcr_layout *layout,
                            const char *name, const char **parent_names,
-                           u8 num_parents, u8 id, bool pll_audio,
-                           const struct clk_range *range)
+                           u32 *mux_table, u8 num_parents, u8 id,
+                           const struct clk_range *range,
+                           int chg_pid)
 {
        struct clk_generated *gck;
        struct clk_init_data init;
@@ -287,16 +295,18 @@ at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,
        init.ops = &generated_ops;
        init.parent_names = parent_names;
        init.num_parents = num_parents;
-       init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE |
-               CLK_SET_RATE_PARENT;
+       init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE;
+       if (chg_pid >= 0)
+               init.flags |= CLK_SET_RATE_PARENT;
 
        gck->id = id;
        gck->hw.init = &init;
        gck->regmap = regmap;
        gck->lock = lock;
        gck->range = *range;
-       gck->audio_pll_allowed = pll_audio;
+       gck->chg_pid = chg_pid;
        gck->layout = layout;
+       gck->mux_table = mux_table;
 
        clk_generated_startup(gck);
        hw = &gck->hw;