summaryrefslogtreecommitdiffstats
path: root/drivers/clk/clk-pwm.c
diff options
context:
space:
mode:
authorStephen Boyd <stephen.boyd@linaro.org>2016-06-01 16:15:22 -0700
committerStephen Boyd <sboyd@codeaurora.org>2016-08-24 17:23:27 -0700
commit4cf915dfb8ede6e2673b4f1b2d2518ef4fe6620c (patch)
tree3ac4637e116b2f787726ae7e92dce7c0bc4127ea /drivers/clk/clk-pwm.c
parentc742e365a7e03a34363023526fe53c9bc11e294b (diff)
downloadlinux-stable-4cf915dfb8ede6e2673b4f1b2d2518ef4fe6620c.tar.gz
linux-stable-4cf915dfb8ede6e2673b4f1b2d2518ef4fe6620c.tar.bz2
linux-stable-4cf915dfb8ede6e2673b4f1b2d2518ef4fe6620c.zip
clk: pwm: Migrate to clk_hw based OF and registration APIs
Now that we have clk_hw based provider APIs to register clks, we can get rid of struct clk pointers while registering clks in these drivers, allowing us to move closer to a clear split of consumer and provider clk APIs. Cc: Janusz Uzycki <j.uzycki@elproma.com.pl> Cc: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/clk-pwm.c')
-rw-r--r--drivers/clk/clk-pwm.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/clk/clk-pwm.c b/drivers/clk/clk-pwm.c
index 1630a1f085f7..8cb9d117fdbf 100644
--- a/drivers/clk/clk-pwm.c
+++ b/drivers/clk/clk-pwm.c
@@ -61,7 +61,6 @@ static int clk_pwm_probe(struct platform_device *pdev)
struct pwm_device *pwm;
struct pwm_args pargs;
const char *clk_name;
- struct clk *clk;
int ret;
clk_pwm = devm_kzalloc(&pdev->dev, sizeof(*clk_pwm), GFP_KERNEL);
@@ -107,11 +106,11 @@ static int clk_pwm_probe(struct platform_device *pdev)
clk_pwm->pwm = pwm;
clk_pwm->hw.init = &init;
- clk = devm_clk_register(&pdev->dev, &clk_pwm->hw);
- if (IS_ERR(clk))
- return PTR_ERR(clk);
+ ret = devm_clk_hw_register(&pdev->dev, &clk_pwm->hw);
+ if (ret)
+ return ret;
- return of_clk_add_provider(node, of_clk_src_simple_get, clk);
+ return of_clk_add_hw_provider(node, of_clk_hw_simple_get, &clk_pwm->hw);
}
static int clk_pwm_remove(struct platform_device *pdev)