diff options
-rw-r--r-- | drivers/pwm/pwm-crc.c | 2 | ||||
-rw-r--r-- | drivers/pwm/pwm-lpc18xx-sct.c | 2 | ||||
-rw-r--r-- | drivers/pwm/pwm-omap-dmtimer.c | 2 | ||||
-rw-r--r-- | drivers/pwm/pwm-sun4i.c | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/drivers/pwm/pwm-crc.c b/drivers/pwm/pwm-crc.c index 7101c7020bf4..bd0ebd04856a 100644 --- a/drivers/pwm/pwm-crc.c +++ b/drivers/pwm/pwm-crc.c | |||
@@ -75,7 +75,7 @@ static int crc_pwm_config(struct pwm_chip *c, struct pwm_device *pwm, | |||
75 | return -EINVAL; | 75 | return -EINVAL; |
76 | } | 76 | } |
77 | 77 | ||
78 | if (pwm->period != period_ns) { | 78 | if (pwm_get_period(pwm) != period_ns) { |
79 | int clk_div; | 79 | int clk_div; |
80 | 80 | ||
81 | /* changing the clk divisor, need to disable fisrt */ | 81 | /* changing the clk divisor, need to disable fisrt */ |
diff --git a/drivers/pwm/pwm-lpc18xx-sct.c b/drivers/pwm/pwm-lpc18xx-sct.c index 9861fed4e67d..19dc64cab2f0 100644 --- a/drivers/pwm/pwm-lpc18xx-sct.c +++ b/drivers/pwm/pwm-lpc18xx-sct.c | |||
@@ -249,7 +249,7 @@ static int lpc18xx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) | |||
249 | LPC18XX_PWM_EVSTATEMSK(lpc18xx_data->duty_event), | 249 | LPC18XX_PWM_EVSTATEMSK(lpc18xx_data->duty_event), |
250 | LPC18XX_PWM_EVSTATEMSK_ALL); | 250 | LPC18XX_PWM_EVSTATEMSK_ALL); |
251 | 251 | ||
252 | if (pwm->polarity == PWM_POLARITY_NORMAL) { | 252 | if (pwm_get_polarity(pwm) == PWM_POLARITY_NORMAL) { |
253 | set_event = lpc18xx_pwm->period_event; | 253 | set_event = lpc18xx_pwm->period_event; |
254 | clear_event = lpc18xx_data->duty_event; | 254 | clear_event = lpc18xx_data->duty_event; |
255 | res_action = LPC18XX_PWM_RES_SET; | 255 | res_action = LPC18XX_PWM_RES_SET; |
diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c index b7e6ecba7d5c..3e95090cd7cf 100644 --- a/drivers/pwm/pwm-omap-dmtimer.c +++ b/drivers/pwm/pwm-omap-dmtimer.c | |||
@@ -192,7 +192,7 @@ static int pwm_omap_dmtimer_config(struct pwm_chip *chip, | |||
192 | load_value, load_value, match_value, match_value); | 192 | load_value, load_value, match_value, match_value); |
193 | 193 | ||
194 | omap->pdata->set_pwm(omap->dm_timer, | 194 | omap->pdata->set_pwm(omap->dm_timer, |
195 | pwm->polarity == PWM_POLARITY_INVERSED, | 195 | pwm_get_polarity(pwm) == PWM_POLARITY_INVERSED, |
196 | true, | 196 | true, |
197 | PWM_OMAP_DMTIMER_TRIGGER_OVERFLOW_AND_COMPARE); | 197 | PWM_OMAP_DMTIMER_TRIGGER_OVERFLOW_AND_COMPARE); |
198 | 198 | ||
diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c index 67af9f62361f..03a99a53c39e 100644 --- a/drivers/pwm/pwm-sun4i.c +++ b/drivers/pwm/pwm-sun4i.c | |||
@@ -354,7 +354,8 @@ static int sun4i_pwm_probe(struct platform_device *pdev) | |||
354 | val = sun4i_pwm_readl(pwm, PWM_CTRL_REG); | 354 | val = sun4i_pwm_readl(pwm, PWM_CTRL_REG); |
355 | for (i = 0; i < pwm->chip.npwm; i++) | 355 | for (i = 0; i < pwm->chip.npwm; i++) |
356 | if (!(val & BIT_CH(PWM_ACT_STATE, i))) | 356 | if (!(val & BIT_CH(PWM_ACT_STATE, i))) |
357 | pwm->chip.pwms[i].polarity = PWM_POLARITY_INVERSED; | 357 | pwm_set_polarity(&pwm->chip.pwms[i], |
358 | PWM_POLARITY_INVERSED); | ||
358 | clk_disable_unprepare(pwm->clk); | 359 | clk_disable_unprepare(pwm->clk); |
359 | 360 | ||
360 | return 0; | 361 | return 0; |