pwm: imx: Move PWMv2 software reset code to a separate function

The software reset code has been extracted from imx_pwm_config_v2 function
and moved to new one - imx_pwm_sw_reset().

This change reduces the overall size of imx_pwm_config_v2() and prepares
it for atomic PWM operation.

Suggested-by: Stefan Agner <stefan@agner.ch>
Suggested-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Lukasz Majewski <l.majewski@majess.pl>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>

1 files changed, 21 insertions, 10 deletions

diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 5c712104066a..c944f15f574c 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -119,6 +119,25 @@ static void imx_pwm_disable_v1(struct pwm_chip *chip, struct pwm_device *pwm)
         clk_disable_unprepare(imx->clk_per);
 }
 
+static void imx_pwm_sw_reset(struct pwm_chip *chip)
+{
+        struct imx_chip *imx = to_imx_chip(chip);
+        struct device *dev = chip->dev;
+        int wait_count = 0;
+        u32 cr;
+
+        writel(MX3_PWMCR_SWR, imx->mmio_base + MX3_PWMCR);
+        do {
+                usleep_range(200, 1000);
+                cr = readl(imx->mmio_base + MX3_PWMCR);
+        } while ((cr & MX3_PWMCR_SWR) &&
+                 (wait_count++ < MX3_PWM_SWR_LOOP));
+
+        if (cr & MX3_PWMCR_SWR)
+                dev_warn(dev, "software reset timeout\n");
+}
+
+
 static int imx_pwm_config_v2(struct pwm_chip *chip,
                 struct pwm_device *pwm, int duty_ns, int period_ns)
 {
@@ -128,7 +147,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
         unsigned long period_cycles, duty_cycles, prescale;
         unsigned int period_ms;
         bool enable = pwm_is_enabled(pwm);
-        int wait_count = 0, fifoav;
+        int fifoav;
         u32 cr, sr;
 
         /*
@@ -151,15 +170,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
                                 dev_warn(dev, "there is no free FIFO slot\n");
                 }
         } else {
-                writel(MX3_PWMCR_SWR, imx->mmio_base + MX3_PWMCR);
-                do {
-                        usleep_range(200, 1000);
-                        cr = readl(imx->mmio_base + MX3_PWMCR);
-                } while ((cr & MX3_PWMCR_SWR) &&
-                         (wait_count++ < MX3_PWM_SWR_LOOP));
-
-                if (cr & MX3_PWMCR_SWR)
-                        dev_warn(dev, "software reset timeout\n");
+                imx_pwm_sw_reset(chip);
         }
 
         c = clk_get_rate(imx->clk_per);