[PATCHv12 08/49] clk: gate: add support for low level ops

[Tero Kristo]

Gate clock can now be registered to use low level register access ops.
Preferred initialization method is via clock description.

Signed-off-by: Tero Kristo <t-kri...@ti.com>
---
 drivers/clk/clk-gate.c       |   20 +++++++++++++++++---
 include/linux/clk-provider.h |    4 ++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c
index 3ec61d2..d4c94a7 100644
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
@@ -62,7 +62,10 @@ static void clk_gate_endisable(struct clk_hw *hw, int enable)
                if (set)
                        reg |= BIT(gate->bit_idx);
        } else {
-               reg = clk_readl(gate->reg);
+               if (gate->ll_ops)
+                       reg = gate->ll_ops->clk_readl(gate->reg);
+               else
+                       reg = clk_readl(gate->reg);
 
                if (set)
                        reg |= BIT(gate->bit_idx);
@@ -70,7 +73,10 @@ static void clk_gate_endisable(struct clk_hw *hw, int enable)
                        reg &= ~BIT(gate->bit_idx);
        }
 
-       clk_writel(reg, gate->reg);
+       if (gate->ll_ops)
+               gate->ll_ops->clk_writel(reg, gate->reg);
+       else
+               clk_writel(reg, gate->reg);
 
        if (gate->lock)
                spin_unlock_irqrestore(gate->lock, flags);
@@ -93,7 +99,10 @@ static int clk_gate_is_enabled(struct clk_hw *hw)
        u32 reg;
        struct clk_gate *gate = to_clk_gate(hw);
 
-       reg = clk_readl(gate->reg);
+       if (gate->ll_ops)
+               reg = gate->ll_ops->clk_readl(gate->reg);
+       else
+               reg = clk_readl(gate->reg);
 
        /* if a set bit disables this clk, flip it before masking */
        if (gate->flags & CLK_GATE_SET_TO_DISABLE)
@@ -157,6 +166,7 @@ struct clk *clk_register_gate(struct device *dev, const 
char *name,
        gate->flags = clk_gate_flags;
        gate->lock = lock;
        gate->hw.init = &init;
+       gate->ll_ops = &clk_ll_ops_default;
 
        clk = clk_register(dev, &gate->hw);
 
@@ -184,6 +194,10 @@ struct clk_hw *clk_register_gate_desc(struct device *dev, 
struct clk_desc *desc)
        gate->bit_idx = hw_desc->bit_idx;
        gate->flags = hw_desc->flags;
        gate->lock = hw_desc->lock;
+       gate->ll_ops = hw_desc->ll_ops;
+
+       if (!gate->ll_ops)
+               gate->ll_ops = &clk_ll_ops_default;
 
        if (!desc->ops)
                desc->ops = &clk_gate_ops;
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index f082a89..3923d46 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -262,6 +262,7 @@ void of_fixed_clk_setup(struct device_node *np);
  *
  * @hw:                handle between common and hardware-specific interfaces
  * @reg:       register controlling gate
+ * @ll_ops:    low-level ops for accessing the register
  * @bit_idx:   single bit controlling gate
  * @flags:     hardware-specific flags
  * @lock:      register lock
@@ -280,6 +281,7 @@ void of_fixed_clk_setup(struct device_node *np);
 struct clk_gate {
        struct clk_hw hw;
        void __iomem    *reg;
+       struct clk_ll_ops       *ll_ops;
        u8              bit_idx;
        u8              flags;
        spinlock_t      *lock;
@@ -289,6 +291,7 @@ struct clk_gate {
  * struct clk_gate_desc - init descriptor for gating clock
  * @desc:      handle between common and hardware-specific interfaces
  * @reg:       register controlling gate
+ * @ll_ops:    low-level ops for accessing the register
  * @bit_idx:   single bit controlling gate
  * @flags:     hardware-specific flags
  * @lock:      register lock
@@ -296,6 +299,7 @@ struct clk_gate {
 struct clk_gate_desc {
        struct clk_desc desc;
        void __iomem    *reg;
+       struct clk_ll_ops       *ll_ops;
        u8              bit_idx;
        u8              flags;
        spinlock_t      *lock;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html