GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-24 07:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clk: wm831x: Provide is_prepared() rather than is_enabled()

Browse source 
Since the driver was written an is_prepared() operation has been made
possible. Since the driver uses I2C I/O only prepare operations are
provided so move the is_enabled() operation over to is_prepared().

Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
This commit is contained in:
Mark Brown 2013-08-29 15:13:28 +01:00 • committed by Mike Turquette
parent e2815b048a
commit a5828a6c5f
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/clk/clk-wm831x.c
View file

@ -31,7 +31,7 @@ struct wm831x_clk {
bool xtal_ena; bool xtal_ena;
}; };
static int wm831x_xtal_is_enabled(struct clk_hw *hw) static int wm831x_xtal_is_prepared(struct clk_hw *hw)
{ {
struct wm831x_clk *clkdata = container_of(hw, struct wm831x_clk, struct wm831x_clk *clkdata = container_of(hw, struct wm831x_clk,
xtal_hw); xtal_hw);
@ -52,7 +52,7 @@ static unsigned long wm831x_xtal_recalc_rate(struct clk_hw *hw,
} }
static const struct clk_ops wm831x_xtal_ops = { static const struct clk_ops wm831x_xtal_ops = {
.is_enabled = wm831x_xtal_is_enabled, .is_prepared = wm831x_xtal_is_prepared,
.recalc_rate = wm831x_xtal_recalc_rate, .recalc_rate = wm831x_xtal_recalc_rate,
}; };
@ -73,7 +73,7 @@ static const unsigned long wm831x_fll_auto_rates[] = {
24576000, 24576000,
}; };
static int wm831x_fll_is_enabled(struct clk_hw *hw) static int wm831x_fll_is_prepared(struct clk_hw *hw)
{ {
struct wm831x_clk *clkdata = container_of(hw, struct wm831x_clk, struct wm831x_clk *clkdata = container_of(hw, struct wm831x_clk,
fll_hw); fll_hw);
@ -170,7 +170,7 @@ static int wm831x_fll_set_rate(struct clk_hw *hw, unsigned long rate,
if (i == ARRAY_SIZE(wm831x_fll_auto_rates)) if (i == ARRAY_SIZE(wm831x_fll_auto_rates))
return -EINVAL; return -EINVAL;
if (wm831x_fll_is_enabled(hw)) if (wm831x_fll_is_prepared(hw))
return -EPERM; return -EPERM;
return wm831x_set_bits(wm831x, WM831X_CLOCK_CONTROL_2, return wm831x_set_bits(wm831x, WM831X_CLOCK_CONTROL_2,
@ -220,7 +220,7 @@ static u8 wm831x_fll_get_parent(struct clk_hw *hw)
} }
static const struct clk_ops wm831x_fll_ops = { static const struct clk_ops wm831x_fll_ops = {
.is_enabled = wm831x_fll_is_enabled, .is_prepared = wm831x_fll_is_prepared,
.prepare = wm831x_fll_prepare, .prepare = wm831x_fll_prepare,
.unprepare = wm831x_fll_unprepare, .unprepare = wm831x_fll_unprepare,
.round_rate = wm831x_fll_round_rate, .round_rate = wm831x_fll_round_rate,
@ -237,7 +237,7 @@ static struct clk_init_data wm831x_fll_init = {
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
}; };
static int wm831x_clkout_is_enabled(struct clk_hw *hw) static int wm831x_clkout_is_prepared(struct clk_hw *hw)
{ {
struct wm831x_clk *clkdata = container_of(hw, struct wm831x_clk, struct wm831x_clk *clkdata = container_of(hw, struct wm831x_clk,
clkout_hw); clkout_hw);
@ -335,7 +335,7 @@ static int wm831x_clkout_set_parent(struct clk_hw *hw, u8 parent)
} }
static const struct clk_ops wm831x_clkout_ops = { static const struct clk_ops wm831x_clkout_ops = {
.is_enabled = wm831x_clkout_is_enabled, .is_prepared = wm831x_clkout_is_prepared,
.prepare = wm831x_clkout_prepare, .prepare = wm831x_clkout_prepare,
.unprepare = wm831x_clkout_unprepare, .unprepare = wm831x_clkout_unprepare,
.get_parent = wm831x_clkout_get_parent, .get_parent = wm831x_clkout_get_parent,