Merge tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[J-linux.git] / drivers / pwm / pwm-stm32.c

diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c
index 5f10cba492ecba6389f49462033d911c9a197c46..0c028d17c07523a76957f312fd660f0e64554d04 100644 (file)
--- a/drivers/pwm/pwm-stm32.c
+++ b/drivers/pwm/pwm-stm32.c
@@ -27,7 +27,6 @@ struct stm32_breakinput {
 };
 
 struct stm32_pwm {
 };
 
 struct stm32_pwm {

-       struct pwm_chip chip;

        struct mutex lock; /* protect pwm config/enable */
        struct clk *clk;
        struct regmap *regmap;
        struct mutex lock; /* protect pwm config/enable */
        struct clk *clk;
        struct regmap *regmap;


@@ -40,7 +39,7 @@ struct stm32_pwm {
 
 static inline struct stm32_pwm *to_stm32_pwm_dev(struct pwm_chip *chip)
 {
 
 static inline struct stm32_pwm *to_stm32_pwm_dev(struct pwm_chip *chip)
 {

-       return container_of(chip, struct stm32_pwm, chip);
+       return pwmchip_get_drvdata(chip);

 }
 
 static u32 active_channels(struct stm32_pwm *dev)
 }
 
 static u32 active_channels(struct stm32_pwm *dev)


@@ -90,11 +89,12 @@ static u32 active_channels(struct stm32_pwm *dev)
  * - Period     = t2 - t0
  * - Duty cycle = t1 - t0
  */
  * - Period     = t2 - t0
  * - Duty cycle = t1 - t0
  */

-static int stm32_pwm_raw_capture(struct stm32_pwm *priv, struct pwm_device *pwm,
+static int stm32_pwm_raw_capture(struct pwm_chip *chip, struct pwm_device *pwm,

                                 unsigned long tmo_ms, u32 *raw_prd,
                                 u32 *raw_dty)
 {
                                 unsigned long tmo_ms, u32 *raw_prd,
                                 u32 *raw_dty)
 {

-       struct device *parent = priv->chip.dev->parent;
+       struct stm32_pwm *priv = to_stm32_pwm_dev(chip);
+       struct device *parent = pwmchip_parent(chip)->parent;

        enum stm32_timers_dmas dma_id;
        u32 ccen, ccr;
        int ret;
        enum stm32_timers_dmas dma_id;
        u32 ccen, ccr;
        int ret;


@@ -170,7 +170,7 @@ static int stm32_pwm_capture(struct pwm_chip *chip, struct pwm_device *pwm,
 
        ret = clk_enable(priv->clk);
        if (ret) {
 
        ret = clk_enable(priv->clk);
        if (ret) {

-               dev_err(priv->chip.dev, "failed to enable counter clock\n");
+               dev_err(pwmchip_parent(chip), "failed to enable counter clock\n");

                goto unlock;
        }
 
                goto unlock;
        }
 


@@ -208,7 +208,7 @@ static int stm32_pwm_capture(struct pwm_chip *chip, struct pwm_device *pwm,
                           TIM_CCER_CC12P : TIM_CCER_CC34P, pwm->hwpwm < 2 ?
                           TIM_CCER_CC2P : TIM_CCER_CC4P);
 
                           TIM_CCER_CC12P : TIM_CCER_CC34P, pwm->hwpwm < 2 ?
                           TIM_CCER_CC2P : TIM_CCER_CC4P);
 

-       ret = stm32_pwm_raw_capture(priv, pwm, tmo_ms, &raw_prd, &raw_dty);
+       ret = stm32_pwm_raw_capture(chip, pwm, tmo_ms, &raw_prd, &raw_dty);

        if (ret)
                goto stop;
 
        if (ret)
                goto stop;
 


@@ -229,7 +229,7 @@ static int stm32_pwm_capture(struct pwm_chip *chip, struct pwm_device *pwm,
                /* 2nd measure with new scale */
                psc /= scale;
                regmap_write(priv->regmap, TIM_PSC, psc);
                /* 2nd measure with new scale */
                psc /= scale;
                regmap_write(priv->regmap, TIM_PSC, psc);

-               ret = stm32_pwm_raw_capture(priv, pwm, tmo_ms, &raw_prd,
+               ret = stm32_pwm_raw_capture(chip, pwm, tmo_ms, &raw_prd,

                                            &raw_dty);
                if (ret)
                        goto stop;
                                            &raw_dty);
                if (ret)
                        goto stop;


@@ -257,7 +257,7 @@ static int stm32_pwm_capture(struct pwm_chip *chip, struct pwm_device *pwm,
                           FIELD_PREP(TIM_CCMR_IC1PSC, icpsc) |
                           FIELD_PREP(TIM_CCMR_IC2PSC, icpsc));
 
                           FIELD_PREP(TIM_CCMR_IC1PSC, icpsc) |
                           FIELD_PREP(TIM_CCMR_IC2PSC, icpsc));
 

-       ret = stm32_pwm_raw_capture(priv, pwm, tmo_ms, &raw_prd, &raw_dty);
+       ret = stm32_pwm_raw_capture(chip, pwm, tmo_ms, &raw_prd, &raw_dty);

        if (ret)
                goto stop;
 
        if (ret)
                goto stop;
 


@@ -605,7 +605,7 @@ static void stm32_pwm_detect_complementary(struct stm32_pwm *priv)
        priv->have_complementary_output = (ccer != 0);
 }
 
        priv->have_complementary_output = (ccer != 0);
 }
 

-static unsigned int stm32_pwm_detect_channels(struct stm32_pwm *priv,
+static unsigned int stm32_pwm_detect_channels(struct regmap *regmap,

                                              unsigned int *num_enabled)
 {
        u32 ccer, ccer_backup;
                                              unsigned int *num_enabled)
 {
        u32 ccer, ccer_backup;


@@ -614,10 +614,10 @@ static unsigned int stm32_pwm_detect_channels(struct stm32_pwm *priv,
         * If channels enable bits don't exist writing 1 will have no
         * effect so we can detect and count them.
         */
         * If channels enable bits don't exist writing 1 will have no
         * effect so we can detect and count them.
         */

-       regmap_read(priv->regmap, TIM_CCER, &ccer_backup);
-       regmap_set_bits(priv->regmap, TIM_CCER, TIM_CCER_CCXE);
-       regmap_read(priv->regmap, TIM_CCER, &ccer);
-       regmap_write(priv->regmap, TIM_CCER, ccer_backup);
+       regmap_read(regmap, TIM_CCER, &ccer_backup);
+       regmap_set_bits(regmap, TIM_CCER, TIM_CCER_CCXE);
+       regmap_read(regmap, TIM_CCER, &ccer);
+       regmap_write(regmap, TIM_CCER, ccer_backup);

 
        *num_enabled = hweight32(ccer_backup & TIM_CCER_CCXE);
 
 
        *num_enabled = hweight32(ccer_backup & TIM_CCER_CCXE);
 


@@ -629,14 +629,18 @@ static int stm32_pwm_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct device_node *np = dev->of_node;
        struct stm32_timers *ddata = dev_get_drvdata(pdev->dev.parent);
        struct device *dev = &pdev->dev;
        struct device_node *np = dev->of_node;
        struct stm32_timers *ddata = dev_get_drvdata(pdev->dev.parent);

+       struct pwm_chip *chip;

        struct stm32_pwm *priv;
        struct stm32_pwm *priv;

-       unsigned int num_enabled;
+       unsigned int npwm, num_enabled;

        unsigned int i;
        int ret;
 
        unsigned int i;
        int ret;
 

-       priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-       if (!priv)
-               return -ENOMEM;
+       npwm = stm32_pwm_detect_channels(ddata->regmap, &num_enabled);
+
+       chip = devm_pwmchip_alloc(dev, npwm, sizeof(*priv));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+       priv = to_stm32_pwm_dev(chip);

 
        mutex_init(&priv->lock);
        priv->regmap = ddata->regmap;
 
        mutex_init(&priv->lock);
        priv->regmap = ddata->regmap;


@@ -652,37 +656,36 @@ static int stm32_pwm_probe(struct platform_device *pdev)
 
        stm32_pwm_detect_complementary(priv);
 
 
        stm32_pwm_detect_complementary(priv);
 

-       priv->chip.dev = dev;
-       priv->chip.ops = &stm32pwm_ops;
-       priv->chip.npwm = stm32_pwm_detect_channels(priv, &num_enabled);
+       chip->ops = &stm32pwm_ops;

 
        /* Initialize clock refcount to number of enabled PWM channels. */
        for (i = 0; i < num_enabled; i++)
                clk_enable(priv->clk);
 
 
        /* Initialize clock refcount to number of enabled PWM channels. */
        for (i = 0; i < num_enabled; i++)
                clk_enable(priv->clk);
 

-       ret = devm_pwmchip_add(dev, &priv->chip);
+       ret = devm_pwmchip_add(dev, chip);

        if (ret < 0)
                return ret;
 
        if (ret < 0)
                return ret;
 

-       platform_set_drvdata(pdev, priv);
+       platform_set_drvdata(pdev, chip);

 
        return 0;
 }
 
 static int stm32_pwm_suspend(struct device *dev)
 {
 
        return 0;
 }
 
 static int stm32_pwm_suspend(struct device *dev)
 {

-       struct stm32_pwm *priv = dev_get_drvdata(dev);
+       struct pwm_chip *chip = dev_get_drvdata(dev);
+       struct stm32_pwm *priv = to_stm32_pwm_dev(chip);

        unsigned int i;
        u32 ccer, mask;
 
        /* Look for active channels */
        ccer = active_channels(priv);
 
        unsigned int i;
        u32 ccer, mask;
 
        /* Look for active channels */
        ccer = active_channels(priv);
 

-       for (i = 0; i < priv->chip.npwm; i++) {
+       for (i = 0; i < chip->npwm; i++) {

                mask = TIM_CCER_CC1E << (i * 4);
                if (ccer & mask) {
                        dev_err(dev, "PWM %u still in use by consumer %s\n",
                mask = TIM_CCER_CC1E << (i * 4);
                if (ccer & mask) {
                        dev_err(dev, "PWM %u still in use by consumer %s\n",

-                               i, priv->chip.pwms[i].label);
+                               i, chip->pwms[i].label);

                        return -EBUSY;
                }
        }
                        return -EBUSY;
                }
        }


@@ -692,7 +695,8 @@ static int stm32_pwm_suspend(struct device *dev)
 
 static int stm32_pwm_resume(struct device *dev)
 {
 
 static int stm32_pwm_resume(struct device *dev)
 {

-       struct stm32_pwm *priv = dev_get_drvdata(dev);
+       struct pwm_chip *chip = dev_get_drvdata(dev);
+       struct stm32_pwm *priv = to_stm32_pwm_dev(chip);

        int ret;
 
        ret = pinctrl_pm_select_default_state(dev);
        int ret;
 
        ret = pinctrl_pm_select_default_state(dev);