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

Groups > linux.kernel > #1569296

[PATCH v5 03/11] pwm: imx: Add separate set of pwm ops for PWMv1 and PWMv2

Show all headers | View raw

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

This patch provides separate set of pwm ops utilized by
i.MX's PWMv1 and PWMv2.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Signed-off-by: Lukasz Majewski <l.majewski@majess.pl>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
---
Changes for v5:
- None

Changes for v4:
- None

Changes for v3:
- Adjust the code to work with ipg clock removed

Changes for v2:
- New patch
---
 drivers/pwm/pwm-imx.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index b1d1e50..0fa480d 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -239,7 +239,14 @@ static void imx_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 	clk_disable_unprepare(imx->clk_per);
 }
 
-static struct pwm_ops imx_pwm_ops = {
+static struct pwm_ops imx_pwm_ops_v1 = {
+	.enable = imx_pwm_enable,
+	.disable = imx_pwm_disable,
+	.config = imx_pwm_config,
+	.owner = THIS_MODULE,
+};
+
+static struct pwm_ops imx_pwm_ops_v2 = {
 	.enable = imx_pwm_enable,
 	.disable = imx_pwm_disable,
 	.config = imx_pwm_config,
@@ -250,16 +257,19 @@ struct imx_pwm_data {
 	int (*config)(struct pwm_chip *chip,
 		struct pwm_device *pwm, int duty_ns, int period_ns);
 	void (*set_enable)(struct pwm_chip *chip, bool enable);
+	struct pwm_ops *pwm_ops;
 };
 
 static struct imx_pwm_data imx_pwm_data_v1 = {
 	.config = imx_pwm_config_v1,
 	.set_enable = imx_pwm_set_enable_v1,
+	.pwm_ops = &imx_pwm_ops_v1,
 };
 
 static struct imx_pwm_data imx_pwm_data_v2 = {
 	.config = imx_pwm_config_v2,
 	.set_enable = imx_pwm_set_enable_v2,
+	.pwm_ops = &imx_pwm_ops_v2,
 };
 
 static const struct of_device_id imx_pwm_dt_ids[] = {
@@ -281,6 +291,8 @@ static int imx_pwm_probe(struct platform_device *pdev)
 	if (!of_id)
 		return -ENODEV;
 
+	data = of_id->data;
+
 	imx = devm_kzalloc(&pdev->dev, sizeof(*imx), GFP_KERNEL);
 	if (imx == NULL)
 		return -ENOMEM;
@@ -292,7 +304,7 @@ static int imx_pwm_probe(struct platform_device *pdev)
 		return PTR_ERR(imx->clk_per);
 	}
 
-	imx->chip.ops = &imx_pwm_ops;
+	imx->chip.ops = data->pwm_ops;
 	imx->chip.dev = &pdev->dev;
 	imx->chip.base = -1;
 	imx->chip.npwm = 1;
@@ -303,7 +315,6 @@ static int imx_pwm_probe(struct platform_device *pdev)
 	if (IS_ERR(imx->mmio_base))
 		return PTR_ERR(imx->mmio_base);
 
-	data = of_id->data;
 	imx->config = data->config;
 	imx->set_enable = data->set_enable;
 
-- 
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