Pull pwm fixes from Thierry Reding: "While this comes a bit later than I had wished, both patches are rather minor and touch only new drivers so I think these are still safe for merging." * tag 'for-3.6-rc6' of git://gitorious.org/linux-pwm/linux-pwm: pwm: pwm-tiehrpwm: Fix conflicting channel period setting pwm: pwm-tiecap: Disable APWM mode after configure
Unified · Split
| @@ -100,6 +100,13 @@ static int ecap_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, · 99 unmodified lines | ||
| 100 | 100 | writel(period_cycles, pc->mmio_base + CAP3); |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | + if (!test_bit(PWMF_ENABLED, &pwm->flags)) { | |
| 104 | + reg_val = readw(pc->mmio_base + ECCTL2); | |
| 105 | + /* Disable APWM mode to put APWM output Low */ | |
| 106 | + reg_val &= ~ECCTL2_APWM_MODE; | |
| 107 | + writew(reg_val, pc->mmio_base + ECCTL2); | |
| 108 | + } | |
| 109 | + | |
| 103 | 110 | pm_runtime_put_sync(pc->chip.dev); |
| 104 | 111 | return 0; |
| 105 | 112 | } |
| @@ -104,6 +104,7 @@ struct ehrpwm_pwm_chip { · 103 unmodified lines | ||
| 104 | 104 | struct pwm_chip chip; |
| 105 | 105 | unsigned int clk_rate; |
| 106 | 106 | void __iomem *mmio_base; |
| 107 | + unsigned long period_cycles[NUM_PWM_CHANNEL]; | |
| 107 | 108 | }; |
| 108 | 109 | |
| 109 | 110 | static inline struct ehrpwm_pwm_chip *to_ehrpwm_pwm_chip(struct pwm_chip *chip) |
| @@ -210,6 +211,7 @@ static int ehrpwm_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, · 100 unmodified lines | ||
| 210 | 211 | unsigned long long c; |
| 211 | 212 | unsigned long period_cycles, duty_cycles; |
| 212 | 213 | unsigned short ps_divval, tb_divval; |
| 214 | + int i; | |
| 213 | 215 | |
| 214 | 216 | if (period_ns < 0 || duty_ns < 0 || period_ns > NSEC_PER_SEC) |
| 215 | 217 | return -ERANGE; |
| @@ -229,6 +231,28 @@ static int ehrpwm_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, · 13 unmodified lines | ||
| 229 | 231 | duty_cycles = (unsigned long)c; |
| 230 | 232 | } |
| 231 | 233 | |
| 234 | + /* | |
| 235 | + * Period values should be same for multiple PWM channels as IP uses | |
| 236 | + * same period register for multiple channels. | |
| 237 | + */ | |
| 238 | + for (i = 0; i < NUM_PWM_CHANNEL; i++) { | |
| 239 | + if (pc->period_cycles[i] && | |
| 240 | + (pc->period_cycles[i] != period_cycles)) { | |
| 241 | + /* | |
| 242 | + * Allow channel to reconfigure period if no other | |
| 243 | + * channels being configured. | |
| 244 | + */ | |
| 245 | + if (i == pwm->hwpwm) | |
| 246 | + continue; | |
| 247 | + | |
| 248 | + dev_err(chip->dev, "Period value conflicts with channel %d\n", | |
| 249 | + i); | |
| 250 | + return -EINVAL; | |
| 251 | + } | |
| 252 | + } | |
| 253 | + | |
| 254 | + pc->period_cycles[pwm->hwpwm] = period_cycles; | |
| 255 | + | |
| 232 | 256 | /* Configure clock prescaler to support Low frequency PWM wave */ |
| 233 | 257 | if (set_prescale_div(period_cycles/PERIOD_MAX, &ps_divval, |
| 234 | 258 | &tb_divval)) { |
| @@ -320,10 +344,15 @@ static void ehrpwm_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) · 85 unmodified lines | ||
| 320 | 344 | |
| 321 | 345 | static void ehrpwm_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm) |
| 322 | 346 | { |
| 347 | + struct ehrpwm_pwm_chip *pc = to_ehrpwm_pwm_chip(chip); | |
| 348 | + | |
| 323 | 349 | if (test_bit(PWMF_ENABLED, &pwm->flags)) { |
| 324 | 350 | dev_warn(chip->dev, "Removing PWM device without disabling\n"); |
| 325 | 351 | pm_runtime_put_sync(chip->dev); |
| 326 | 352 | } |
| 353 | + | |
| 354 | + /* set period value to zero on free */ | |
| 355 | + pc->period_cycles[pwm->hwpwm] = 0; | |
| 327 | 356 | } |
| 328 | 357 | |
| 329 | 358 | static const struct pwm_ops ehrpwm_pwm_ops = { |