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

Signed-off-by: Lothar Waßmann <l...@karo-electronics.de>
Signed-off-by: Bhuvanchandra DV <bhuvanchandra...@toradex.com>
Signed-off-by: Lukasz Majewski <l.majew...@majess.pl>
Acked-by: Shawn Guo <shawn....@linaro.org>
Reviewed-by: Sascha Hauer <s.ha...@pengutronix.de>
---
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 70609ef2..d594501 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -230,7 +230,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,
@@ -241,16 +248,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[] = {
@@ -272,6 +282,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;
@@ -283,7 +295,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;
@@ -294,7 +306,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

Reply via email to