Divider 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-divider.c | 22 +++++++++++++++++++---
include/linux/clk-provider.h | 4 ++++
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 8cfed5c..887e2d8 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -108,7 +108,12 @@ static unsigned long clk_divider_recalc_rate(struct clk_hw
*hw,
struct clk_divider *divider = to_clk_divider(hw);
unsigned int div, val;
- val = clk_readl(divider->reg) >> divider->shift;
+ if (divider->ll_ops)
+ val = divider->ll_ops->clk_readl(divider->reg);
+ else
+ val = clk_readl(divider->reg);
+
+ val >>= divider->shift;
val &= div_mask(divider);
div = _get_div(divider, val);
@@ -234,11 +239,17 @@ static int clk_divider_set_rate(struct clk_hw *hw,
unsigned long rate,
if (divider->flags & CLK_DIVIDER_HIWORD_MASK) {
val = div_mask(divider) << (divider->shift + 16);
} else {
- val = clk_readl(divider->reg);
+ if (divider->ll_ops)
+ val = divider->ll_ops->clk_readl(divider->reg);
+ else
+ val = clk_readl(divider->reg);
val &= ~(div_mask(divider) << divider->shift);
}
val |= value << divider->shift;
- clk_writel(val, divider->reg);
+ if (divider->ll_ops)
+ divider->ll_ops->clk_writel(val, divider->reg);
+ else
+ clk_writel(val, divider->reg);
if (divider->lock)
spin_unlock_irqrestore(divider->lock, flags);
@@ -291,6 +302,7 @@ static struct clk *_register_divider(struct device *dev,
const char *name,
div->lock = lock;
div->hw.init = &init;
div->table = table;
+ div->ll_ops = &clk_ll_ops_default;
/* register the clock */
clk = clk_register(dev, &div->hw);
@@ -368,6 +380,10 @@ struct clk_hw *clk_register_divider_desc(struct device
*dev,
divider->flags = hw_desc->flags;
divider->table = hw_desc->table;
divider->lock = hw_desc->lock;
+ divider->ll_ops = hw_desc->ll_ops;
+
+ if (!divider->ll_ops)
+ divider->ll_ops = &clk_ll_ops_default;
if (!desc->ops)
desc->ops = &clk_divider_ops;
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 671dff4..f082a89 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -322,6 +322,7 @@ struct clk_div_table {
*
* @hw: handle between common and hardware-specific interfaces
* @reg: register containing the divider
+ * @ll_ops: low-level ops for accessing the register
* @shift: shift to the divider bit field
* @width: width of the divider bit field
* @table: array of value/divider pairs, last entry should have div = 0
@@ -350,6 +351,7 @@ struct clk_div_table {
struct clk_divider {
struct clk_hw hw;
void __iomem *reg;
+ struct clk_ll_ops *ll_ops;
u8 shift;
u8 width;
u8 flags;
@@ -361,6 +363,7 @@ struct clk_divider {
* struct clk_divider_desc - init descriptor for divider clock
* @desc: handle between common and hardware-specific interfaces
* @reg: register containing the divider
+ * @ll_ops: low-level ops for accessing the register
* @shift: shift to the divider bit field
* @width: width of the divider bit field
* @table: array of value/divider pairs, last entry should have div = 0
@@ -369,6 +372,7 @@ struct clk_divider {
struct clk_divider_desc {
struct clk_desc desc;
void __iomem *reg;
+ struct clk_ll_ops *ll_ops;
u8 shift;
u8 width;
u8 flags;
--
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
