x86/kaslr: Expose and use the end of the physical memory address space

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

diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c
index 8bae3fd2b33065997901b61f4ce2a8cda09a6e6b..fd754a99cf2ed1182a6b5c52c7e4712eae5a7f29 100644 (file)
--- a/drivers/pwm/pwm-stm32.c
+++ b/drivers/pwm/pwm-stm32.c
@@ -368,7 +368,7 @@ static int stm32_pwm_config(struct stm32_pwm *priv, unsigned int ch,
        dty = mul_u64_u64_div_u64(duty_ns, clk_get_rate(priv->clk),
                                  (u64)NSEC_PER_SEC * (prescaler + 1));
 
        dty = mul_u64_u64_div_u64(duty_ns, clk_get_rate(priv->clk),
                                  (u64)NSEC_PER_SEC * (prescaler + 1));
 

-       regmap_write(priv->regmap, TIM_CCR1 + 4 * ch, dty);
+       regmap_write(priv->regmap, TIM_CCRx(ch + 1), dty);

 
        /* Configure output mode */
        shift = (ch & 0x1) * CCMR_CHANNEL_SHIFT;
 
        /* Configure output mode */
        shift = (ch & 0x1) * CCMR_CHANNEL_SHIFT;


@@ -390,9 +390,9 @@ static int stm32_pwm_set_polarity(struct stm32_pwm *priv, unsigned int ch,
 {
        u32 mask;
 
 {
        u32 mask;
 

-       mask = TIM_CCER_CC1P << (ch * 4);
+       mask = TIM_CCER_CCxP(ch + 1);

        if (priv->have_complementary_output)
        if (priv->have_complementary_output)

-               mask |= TIM_CCER_CC1NP << (ch * 4);
+               mask |= TIM_CCER_CCxNP(ch + 1);

 
        regmap_update_bits(priv->regmap, TIM_CCER, mask,
                           polarity == PWM_POLARITY_NORMAL ? 0 : mask);
 
        regmap_update_bits(priv->regmap, TIM_CCER, mask,
                           polarity == PWM_POLARITY_NORMAL ? 0 : mask);


@@ -410,9 +410,9 @@ static int stm32_pwm_enable(struct stm32_pwm *priv, unsigned int ch)
                return ret;
 
        /* Enable channel */
                return ret;
 
        /* Enable channel */

-       mask = TIM_CCER_CC1E << (ch * 4);
+       mask = TIM_CCER_CCxE(ch + 1);

        if (priv->have_complementary_output)
        if (priv->have_complementary_output)

-               mask |= TIM_CCER_CC1NE << (ch * 4);
+               mask |= TIM_CCER_CCxNE(ch);

 
        regmap_set_bits(priv->regmap, TIM_CCER, mask);
 
 
        regmap_set_bits(priv->regmap, TIM_CCER, mask);
 


@@ -430,9 +430,9 @@ static void stm32_pwm_disable(struct stm32_pwm *priv, unsigned int ch)
        u32 mask;
 
        /* Disable channel */
        u32 mask;
 
        /* Disable channel */

-       mask = TIM_CCER_CC1E << (ch * 4);
+       mask = TIM_CCER_CCxE(ch + 1);

        if (priv->have_complementary_output)
        if (priv->have_complementary_output)

-               mask |= TIM_CCER_CC1NE << (ch * 4);
+               mask |= TIM_CCER_CCxNE(ch + 1);

 
        regmap_clear_bits(priv->regmap, TIM_CCER, mask);
 
 
        regmap_clear_bits(priv->regmap, TIM_CCER, mask);
 


@@ -452,8 +452,9 @@ static int stm32_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 
        enabled = pwm->state.enabled;
 
 
        enabled = pwm->state.enabled;
 

-       if (enabled && !state->enabled) {
-               stm32_pwm_disable(priv, pwm->hwpwm);
+       if (!state->enabled) {
+               if (enabled)
+                       stm32_pwm_disable(priv, pwm->hwpwm);

                return 0;
        }
 
                return 0;
        }
 


@@ -501,8 +502,8 @@ static int stm32_pwm_get_state(struct pwm_chip *chip,
        if (ret)
                goto out;
 
        if (ret)
                goto out;
 

-       state->enabled = ccer & (TIM_CCER_CC1E << (ch * 4));
-       state->polarity = (ccer & (TIM_CCER_CC1P << (ch * 4))) ?
+       state->enabled = ccer & TIM_CCER_CCxE(ch + 1);
+       state->polarity = (ccer & TIM_CCER_CCxP(ch + 1)) ?

                          PWM_POLARITY_INVERSED : PWM_POLARITY_NORMAL;
        ret = regmap_read(priv->regmap, TIM_PSC, &psc);
        if (ret)
                          PWM_POLARITY_INVERSED : PWM_POLARITY_NORMAL;
        ret = regmap_read(priv->regmap, TIM_PSC, &psc);
        if (ret)


@@ -510,7 +511,7 @@ static int stm32_pwm_get_state(struct pwm_chip *chip,
        ret = regmap_read(priv->regmap, TIM_ARR, &arr);
        if (ret)
                goto out;
        ret = regmap_read(priv->regmap, TIM_ARR, &arr);
        if (ret)
                goto out;

-       ret = regmap_read(priv->regmap, TIM_CCR1 + 4 * ch, &ccr);
+       ret = regmap_read(priv->regmap, TIM_CCRx(ch + 1), &ccr);

        if (ret)
                goto out;
 
        if (ret)
                goto out;
 


@@ -711,7 +712,7 @@ static int stm32_pwm_suspend(struct device *dev)
        ccer = active_channels(priv);
 
        for (i = 0; i < chip->npwm; i++) {
        ccer = active_channels(priv);
 
        for (i = 0; i < chip->npwm; i++) {

-               mask = TIM_CCER_CC1E << (i * 4);
+               mask = TIM_CCER_CCxE(i + 1);

                if (ccer & mask) {
                        dev_err(dev, "PWM %u still in use by consumer %s\n",
                                i, chip->pwms[i].label);
                if (ccer & mask) {
                        dev_err(dev, "PWM %u still in use by consumer %s\n",
                                i, chip->pwms[i].label);