aboutsummaryrefslogtreecommitdiff
path: root/drivers/clk
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2013-04-11 11:31:36 -0700
committerMike Turquette <mturquette@linaro.org>2013-04-12 11:22:35 -0700
commitd3a1c7be8361e2fbb6affbdb19de47ca48d6c402 (patch)
tree2371cf7b528092b13bd8a178f77a9c5aa0a947ad /drivers/clk
parent9abd5f0555df6cd36130feb742f1def6d99c60fe (diff)
clk: composite: rename 'div' references to 'rate'
Rename all div_hw and div_ops related variables and functions to use rate_hw, rate_ops, etc. This is to make the rate-change portion of the composite clk implementation more generic. A patch following this one will allow for fixed-rate clocks to reuse this infrastructure. Signed-off-by: Mike Turquette <mturquette@linaro.org> Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com> Tested-by: Emilio López <emilio@elopez.com.ar> Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/clk-composite.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
index 097dee4fd20..6f4728c6dbd 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
@@ -47,36 +47,36 @@ static unsigned long clk_composite_recalc_rate(struct clk_hw *hw,
unsigned long parent_rate)
{
struct clk_composite *composite = to_clk_composite(hw);
- const struct clk_ops *div_ops = composite->div_ops;
- struct clk_hw *div_hw = composite->div_hw;
+ const struct clk_ops *rate_ops = composite->rate_ops;
+ struct clk_hw *rate_hw = composite->rate_hw;
- div_hw->clk = hw->clk;
+ rate_hw->clk = hw->clk;
- return div_ops->recalc_rate(div_hw, parent_rate);
+ return rate_ops->recalc_rate(rate_hw, parent_rate);
}
static long clk_composite_round_rate(struct clk_hw *hw, unsigned long rate,
unsigned long *prate)
{
struct clk_composite *composite = to_clk_composite(hw);
- const struct clk_ops *div_ops = composite->div_ops;
- struct clk_hw *div_hw = composite->div_hw;
+ const struct clk_ops *rate_ops = composite->rate_ops;
+ struct clk_hw *rate_hw = composite->rate_hw;
- div_hw->clk = hw->clk;
+ rate_hw->clk = hw->clk;
- return div_ops->round_rate(div_hw, rate, prate);
+ return rate_ops->round_rate(rate_hw, rate, prate);
}
static int clk_composite_set_rate(struct clk_hw *hw, unsigned long rate,
unsigned long parent_rate)
{
struct clk_composite *composite = to_clk_composite(hw);
- const struct clk_ops *div_ops = composite->div_ops;
- struct clk_hw *div_hw = composite->div_hw;
+ const struct clk_ops *rate_ops = composite->rate_ops;
+ struct clk_hw *rate_hw = composite->rate_hw;
- div_hw->clk = hw->clk;
+ rate_hw->clk = hw->clk;
- return div_ops->set_rate(div_hw, rate, parent_rate);
+ return rate_ops->set_rate(rate_hw, rate, parent_rate);
}
static int clk_composite_is_enabled(struct clk_hw *hw)
@@ -115,7 +115,7 @@ static void clk_composite_disable(struct clk_hw *hw)
struct clk *clk_register_composite(struct device *dev, const char *name,
const char **parent_names, int num_parents,
struct clk_hw *mux_hw, const struct clk_ops *mux_ops,
- struct clk_hw *div_hw, const struct clk_ops *div_ops,
+ struct clk_hw *rate_hw, const struct clk_ops *rate_ops,
struct clk_hw *gate_hw, const struct clk_ops *gate_ops,
unsigned long flags)
{
@@ -149,15 +149,15 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
clk_composite_ops->set_parent = clk_composite_set_parent;
}
- if (div_hw && div_ops) {
- if (!div_ops->recalc_rate || !div_ops->round_rate ||
- !div_ops->set_rate) {
+ if (rate_hw && rate_ops) {
+ if (!rate_ops->recalc_rate || !rate_ops->round_rate ||
+ !rate_ops->set_rate) {
clk = ERR_PTR(-EINVAL);
goto err;
}
- composite->div_hw = div_hw;
- composite->div_ops = div_ops;
+ composite->rate_hw = rate_hw;
+ composite->rate_ops = rate_ops;
clk_composite_ops->recalc_rate = clk_composite_recalc_rate;
clk_composite_ops->round_rate = clk_composite_round_rate;
clk_composite_ops->set_rate = clk_composite_set_rate;
@@ -187,8 +187,8 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
if (composite->mux_hw)
composite->mux_hw->clk = clk;
- if (composite->div_hw)
- composite->div_hw->clk = clk;
+ if (composite->rate_hw)
+ composite->rate_hw->clk = clk;
if (composite->gate_hw)
composite->gate_hw->clk = clk;