clk: at91: clk-generated: add mux_table option

Add mux table option. This is necessary for IP versions that has
gaps in the range of available clock sources (e.g. SAMA7G5).

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/1595403506-8209-12-git-send-email-claudiu.beznea@microchip.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c
index f9ca04c..b4fc8d7 100644 (file)
--- a/drivers/clk/at91/clk-generated.c
+++ b/drivers/clk/at91/clk-generated.c
@@ -23,6 +23,7 @@ struct clk_generated {
        struct regmap *regmap;
        struct clk_range range;
        spinlock_t *lock;
+       u32 *mux_table;
        u32 id;
        u32 gckdiv;
        const struct clk_pcr_layout *layout;
@@ -201,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;
 }
 
@@ -273,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,
-                           const struct clk_range *range, int chg_pid)
+                           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;
@@ -300,6 +306,7 @@ at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,
        gck->range = *range;
        gck->chg_pid = chg_pid;
        gck->layout = layout;
+       gck->mux_table = mux_table;
 
        clk_generated_startup(gck);
        hw = &gck->hw;

diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c
index 8a652c4..cc95d42 100644 (file)
--- a/drivers/clk/at91/dt-compat.c
+++ b/drivers/clk/at91/dt-compat.c
@@ -158,8 +158,9 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
 
                hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,
                                                 &dt_pcr_layout, name,
-                                                parent_names, num_parents,
-                                                id, &range, chg_pid);
+                                                parent_names, NULL,
+                                                num_parents, id, &range,
+                                                chg_pid);
                if (IS_ERR(hw))
                        continue;
 

diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
index 949b1a7..2bfe140 100644 (file)
--- a/drivers/clk/at91/pmc.h
+++ b/drivers/clk/at91/pmc.h
@@ -122,7 +122,7 @@ 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,
+                           u32 *mux_table, u8 num_parents, u8 id,
                            const struct clk_range *range, int chg_pid);
 
 struct clk_hw * __init

diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c
index 58661b6..197ffc7 100644 (file)
--- a/drivers/clk/at91/sam9x60.c
+++ b/drivers/clk/at91/sam9x60.c
@@ -288,7 +288,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np)
                hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,
                                                 &sam9x60_pcr_layout,
                                                 sam9x60_gck[i].n,
-                                                parent_names, 6,
+                                                parent_names, NULL, 6,
                                                 sam9x60_gck[i].id,
                                                 &sam9x60_gck[i].r, INT_MIN);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/sama5d2.c b/drivers/clk/at91/sama5d2.c
index 42637d9..6a685d0 100644 (file)
--- a/drivers/clk/at91/sama5d2.c
+++ b/drivers/clk/at91/sama5d2.c
@@ -321,7 +321,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np)
                hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,
                                                 &sama5d2_pcr_layout,
                                                 sama5d2_gck[i].n,
-                                                parent_names, 6,
+                                                parent_names, NULL, 6,
                                                 sama5d2_gck[i].id,
                                                 &sama5d2_gck[i].r,
                                                 sama5d2_gck[i].chg_pid);