clk: mux: add helper function for index/value translation

Add helper functions for the translation between parent index and
register value in the generic multiplexer function. The purpose of
this change is avoid duplicating the code in other clock providers,
using the same generic logic.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index 39cabe157163b9b0dd3498c65a242fe1614253ee..ac4a042f8658258dbcbfdbc058e8b87c8412a51b 100644 (file)
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -26,35 +26,24 @@
  * parent - parent is adjustable through clk_set_parent
  */
 
-static u8 clk_mux_get_parent(struct clk_hw *hw)
+int clk_mux_val_to_index(struct clk_hw *hw, u32 *table, unsigned int flags,
+                        unsigned int val)
 {
-       struct clk_mux *mux = to_clk_mux(hw);
        int num_parents = clk_hw_get_num_parents(hw);
-       u32 val;
 
-       /*
-        * FIXME need a mux-specific flag to determine if val is bitwise or numeric
-        * e.g. sys_clkin_ck's clksel field is 3 bits wide, but ranges from 0x1
-        * to 0x7 (index starts at one)
-        * OTOH, pmd_trace_clk_mux_ck uses a separate bit for each clock, so
-        * val = 0x4 really means "bit 2, index starts at bit 0"
-        */
-       val = clk_readl(mux->reg) >> mux->shift;
-       val &= mux->mask;
-
-       if (mux->table) {
+       if (table) {
                int i;
 
                for (i = 0; i < num_parents; i++)
-                       if (mux->table[i] == val)
+                       if (table[i] == val)
                                return i;
                return -EINVAL;
        }
 
-       if (val && (mux->flags & CLK_MUX_INDEX_BIT))
+       if (val && (flags & CLK_MUX_INDEX_BIT))
                val = ffs(val) - 1;
 
-       if (val && (mux->flags & CLK_MUX_INDEX_ONE))
+       if (val && (flags & CLK_MUX_INDEX_ONE))
                val--;
 
        if (val >= num_parents)
@@ -62,36 +51,58 @@ static u8 clk_mux_get_parent(struct clk_hw *hw)
 
        return val;
 }
+EXPORT_SYMBOL_GPL(clk_mux_val_to_index);
 
-static int clk_mux_set_parent(struct clk_hw *hw, u8 index)
+unsigned int clk_mux_index_to_val(u32 *table, unsigned int flags, u8 index)
 {
-       struct clk_mux *mux = to_clk_mux(hw);
-       u32 val;
-       unsigned long flags = 0;
+       unsigned int val = index;
 
-       if (mux->table) {
-               index = mux->table[index];
+       if (table) {
+               val = table[index];
        } else {
-               if (mux->flags & CLK_MUX_INDEX_BIT)
-                       index = 1 << index;
+               if (flags & CLK_MUX_INDEX_BIT)
+                       val = 1 << index;
 
-               if (mux->flags & CLK_MUX_INDEX_ONE)
-                       index++;
+               if (flags & CLK_MUX_INDEX_ONE)
+                       val++;
        }
 
+       return val;
+}
+EXPORT_SYMBOL_GPL(clk_mux_index_to_val);
+
+static u8 clk_mux_get_parent(struct clk_hw *hw)
+{
+       struct clk_mux *mux = to_clk_mux(hw);
+       u32 val;
+
+       val = clk_readl(mux->reg) >> mux->shift;
+       val &= mux->mask;
+
+       return clk_mux_val_to_index(hw, mux->table, mux->flags, val);
+}
+
+static int clk_mux_set_parent(struct clk_hw *hw, u8 index)
+{
+       struct clk_mux *mux = to_clk_mux(hw);
+       u32 val = clk_mux_index_to_val(mux->table, mux->flags, index);
+       unsigned long flags = 0;
+       u32 reg;
+
        if (mux->lock)
                spin_lock_irqsave(mux->lock, flags);
        else
                __acquire(mux->lock);
 
        if (mux->flags & CLK_MUX_HIWORD_MASK) {
-               val = mux->mask << (mux->shift + 16);
+               reg = mux->mask << (mux->shift + 16);
        } else {
-               val = clk_readl(mux->reg);
-               val &= ~(mux->mask << mux->shift);
+               reg = clk_readl(mux->reg);
+               reg &= ~(mux->mask << mux->shift);
        }
-       val |= index << mux->shift;
-       clk_writel(val, mux->reg);
+       val = val << mux->shift;
+       reg |= val;
+       clk_writel(reg, mux->reg);
 
        if (mux->lock)
                spin_unlock_irqrestore(mux->lock, flags);

diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index d8ba26d033326c932f1faaa0205bf6ec41e7f146..fe720d679c31f4a9ce29d1f2952e9763ebce7b48 100644 (file)
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -511,6 +511,10 @@ struct clk_hw *clk_hw_register_mux_table(struct device *dev, const char *name,
                void __iomem *reg, u8 shift, u32 mask,
                u8 clk_mux_flags, u32 *table, spinlock_t *lock);
 
+int clk_mux_val_to_index(struct clk_hw *hw, u32 *table, unsigned int flags,
+                        unsigned int val);
+unsigned int clk_mux_index_to_val(u32 *table, unsigned int flags, u8 index);
+
 void clk_unregister_mux(struct clk *clk);
 void clk_hw_unregister_mux(struct clk_hw *hw);