projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
[linux-2.6-microblaze.git]
/
drivers
/
clk
/
imx
/
clk-divider-gate.c
diff --git
a/drivers/clk/imx/clk-divider-gate.c
b/drivers/clk/imx/clk-divider-gate.c
index
0322a84
..
26b210c
100644
(file)
--- a/
drivers/clk/imx/clk-divider-gate.c
+++ b/
drivers/clk/imx/clk-divider-gate.c
@@
-64,10
+64,10
@@
static unsigned long clk_divider_gate_recalc_rate(struct clk_hw *hw,
div->flags, div->width);
}
div->flags, div->width);
}
-static
long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate
,
-
unsigned long *prate
)
+static
int clk_divider_determine_rate(struct clk_hw *hw
,
+
struct clk_rate_request *req
)
{
{
- return clk_divider_ops.
round_rate(hw, rate, prate
);
+ return clk_divider_ops.
determine_rate(hw, req
);
}
static int clk_divider_gate_set_rate(struct clk_hw *hw, unsigned long rate,
}
static int clk_divider_gate_set_rate(struct clk_hw *hw, unsigned long rate,
@@
-154,12
+154,12
@@
static int clk_divider_is_enabled(struct clk_hw *hw)
static const struct clk_ops clk_divider_gate_ro_ops = {
.recalc_rate = clk_divider_gate_recalc_rate_ro,
static const struct clk_ops clk_divider_gate_ro_ops = {
.recalc_rate = clk_divider_gate_recalc_rate_ro,
- .
round_rate = clk_divider_round
_rate,
+ .
determine_rate = clk_divider_determine
_rate,
};
static const struct clk_ops clk_divider_gate_ops = {
.recalc_rate = clk_divider_gate_recalc_rate,
};
static const struct clk_ops clk_divider_gate_ops = {
.recalc_rate = clk_divider_gate_recalc_rate,
- .
round_rate = clk_divider_round
_rate,
+ .
determine_rate = clk_divider_determine
_rate,
.set_rate = clk_divider_gate_set_rate,
.enable = clk_divider_enable,
.disable = clk_divider_disable,
.set_rate = clk_divider_gate_set_rate,
.enable = clk_divider_enable,
.disable = clk_divider_disable,