aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <stephen.boyd@linaro.org>2016-06-01 19:15:22 -0400
committerStephen Boyd <sboyd@codeaurora.org>2016-08-24 20:23:27 -0400
commit4cf915dfb8ede6e2673b4f1b2d2518ef4fe6620c (patch)
tree3ac4637e116b2f787726ae7e92dce7c0bc4127ea
parentc742e365a7e03a34363023526fe53c9bc11e294b (diff)
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>
-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)
61 struct pwm_device *pwm; 61 struct pwm_device *pwm;
62 struct pwm_args pargs; 62 struct pwm_args pargs;
63 const char *clk_name; 63 const char *clk_name;
64 struct clk *clk;
65 int ret; 64 int ret;
66 65
67 clk_pwm = devm_kzalloc(&pdev->dev, sizeof(*clk_pwm), GFP_KERNEL); 66 clk_pwm = devm_kzalloc(&pdev->dev, sizeof(*clk_pwm), GFP_KERNEL);
@@ -107,11 +106,11 @@ static int clk_pwm_probe(struct platform_device *pdev)
107 106
108 clk_pwm->pwm = pwm; 107 clk_pwm->pwm = pwm;
109 clk_pwm->hw.init = &init; 108 clk_pwm->hw.init = &init;
110 clk = devm_clk_register(&pdev->dev, &clk_pwm->hw); 109 ret = devm_clk_hw_register(&pdev->dev, &clk_pwm->hw);
111 if (IS_ERR(clk)) 110 if (ret)
112 return PTR_ERR(clk); 111 return ret;
113 112
114 return of_clk_add_provider(node, of_clk_src_simple_get, clk); 113 return of_clk_add_hw_provider(node, of_clk_hw_simple_get, &clk_pwm->hw);
115} 114}
116 115
117static int clk_pwm_remove(struct platform_device *pdev) 116static int clk_pwm_remove(struct platform_device *pdev)