Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1569292

[PATCH v5 05/11] pwm: imx: Move PWMv2 software reset code to a separate function

Show all headers | View raw

From: Lukasz Majewski <l.majewski@majess.pl>

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>

---
Changes for v5:
- None

Changes for v4:
- None

Changes for v3:
- None

Changes for v2:
- Add missing parenthesis
---
 drivers/pwm/pwm-imx.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 11e3f3e..f0d78f3 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -120,6 +120,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)
 {
@@ -129,7 +148,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;
 
 	/*
@@ -152,15 +171,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);
-- 
2.1.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v5 00/11] pwm: imx: Provide atomic operation for IMX PWM driver Lukasz Majewski <lukma@denx.de> - 2017-01-29 23:00 +0100
  [PATCH v5 05/11] pwm: imx: Move PWMv2 software reset code to a separate function Lukasz Majewski <lukma@denx.de> - 2017-01-29 23:00 +0100
    Re: [PATCH v5 05/11] pwm: imx: Move PWMv2 software reset code to a  separate function Thierry Reding <thierry.reding@gmail.com> - 2017-01-30 08:30 +0100
  [PATCH v5 02/11] pwm: imx: remove ipg clock and enable per clock when required Lukasz Majewski <lukma@denx.de> - 2017-01-29 23:00 +0100
  [PATCH v5 11/11] pwm: imx: Add polarity inversion support to i.MX's PWMv2 Lukasz Majewski <lukma@denx.de> - 2017-01-29 23:00 +0100
  [PATCH v5 10/11] pwm: imx: doc: Update imx-pwm.txt documentation entry Lukasz Majewski <lukma@denx.de> - 2017-01-29 23:00 +0100
  [PATCH v5 03/11] pwm: imx: Add separate set of pwm ops for PWMv1 and PWMv2 Lukasz Majewski <lukma@denx.de> - 2017-01-29 23:00 +0100
    Re: [PATCH v5 03/11] pwm: imx: Add separate set of pwm ops for PWMv1  and PWMv2 Thierry Reding <thierry.reding@gmail.com> - 2017-01-30 08:30 +0100
      Re: [PATCH v5 03/11] pwm: imx: Add separate set of pwm ops for PWMv1  and PWMv2 Thierry Reding <thierry.reding@gmail.com> - 2017-01-30 08:50 +0100
        Re: [PATCH v5 03/11] pwm: imx: Add separate set of pwm ops for  PWMv1 and PWMv2 Lukasz Majewski <lukma@denx.de> - 2017-01-30 09:40 +0100
          Re: [PATCH v5 03/11] pwm: imx: Add separate set of pwm ops for PWMv1  and PWMv2 Thierry Reding <thierry.reding@gmail.com> - 2017-01-30 10:00 +0100
            Re: [PATCH v5 03/11] pwm: imx: Add separate set of pwm ops for  PWMv1 and PWMv2 Lukasz Majewski <lukma@denx.de> - 2017-01-30 10:00 +0100
              Re: [PATCH v5 03/11] pwm: imx: Add separate set of pwm ops for PWMv1  and PWMv2 Thierry Reding <thierry.reding@gmail.com> - 2017-01-30 10:10 +0100

csiph-web