[PATCH v5 34/46] clk: pwm: switch to the atomic API

[Boris Brezillon]

pwm_config/enable/disable() have been deprecated and should be replaced
by pwm_apply_state().

Signed-off-by: Boris Brezillon <boris.brezillon at free-electrons.com>
---
 drivers/clk/clk-pwm.c | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/clk-pwm.c b/drivers/clk/clk-pwm.c
index ebcd738..49ec5b1 100644
--- a/drivers/clk/clk-pwm.c
+++ b/drivers/clk/clk-pwm.c
@@ -28,15 +28,29 @@ static inline struct clk_pwm *to_clk_pwm(struct clk_hw *hw)
 static int clk_pwm_prepare(struct clk_hw *hw)
 {
        struct clk_pwm *clk_pwm = to_clk_pwm(hw);
+       struct pwm_state pstate;

-       return pwm_enable(clk_pwm->pwm);
+       pwm_get_state(clk_pwm->pwm, &pstate);
+       if (pstate.enabled)
+               return 0;
+
+       pstate.enabled = true;
+
+       return pwm_apply_state(clk_pwm->pwm, &pstate);
 }

 static void clk_pwm_unprepare(struct clk_hw *hw)
 {
        struct clk_pwm *clk_pwm = to_clk_pwm(hw);
+       struct pwm_state pstate;
+
+       pwm_get_state(clk_pwm->pwm, &pstate);
+       if (!pstate.enabled)
+               return;

-       pwm_disable(clk_pwm->pwm);
+       pstate.enabled = false;
+
+       pwm_apply_state(clk_pwm->pwm, &pstate);
 }

 static unsigned long clk_pwm_recalc_rate(struct clk_hw *hw,
@@ -56,6 +70,7 @@ static const struct clk_ops clk_pwm_ops = {
 static int clk_pwm_probe(struct platform_device *pdev)
 {
        struct device_node *node = pdev->dev.of_node;
+       struct pwm_state pstate;
        struct pwm_args pargs = { };
        struct clk_init_data init;
        struct clk_pwm *clk_pwm;
@@ -88,7 +103,12 @@ static int clk_pwm_probe(struct platform_device *pdev)
                return -EINVAL;
        }

-       ret = pwm_config(pwm, (pargs.period + 1) >> 1, pargs.period);
+       pwm_get_state(pwm, &pstate);
+       pstate.period = pargs.period;
+       pstate.polarity = pargs.polarity;
+       pstate.duty_cycle = (pargs.period + 1) >> 1;
+
+       ret = pwm_apply_state(pwm, &pstate);
        if (ret < 0)
                return ret;

-- 
2.5.0