diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-21 14:09:18 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-21 14:09:18 +0300 |
| commit | a2ab5fc41533c952706ebdfaa378bb746e535cc1 (patch) | |
| tree | 9fb86bb4e9ecb67f7e651d284c2f12c6c5d4378f /drivers/iio/trigger/stm32-timer-trigger.c | |
| parent | a380f2edef65b2447a043251bb3c00a9d2153a8b (diff) | |
| parent | 0e708fc602531b8355b5de6ea7c98f09129b223f (diff) | |
| download | linux-a2ab5fc41533c952706ebdfaa378bb746e535cc1.tar.xz | |
Merge branch 'pm-sleep' into pm-core
Diffstat (limited to 'drivers/iio/trigger/stm32-timer-trigger.c')
| -rw-r--r-- | drivers/iio/trigger/stm32-timer-trigger.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/iio/trigger/stm32-timer-trigger.c b/drivers/iio/trigger/stm32-timer-trigger.c index 9b9053494daf..eb212f8c8879 100644 --- a/drivers/iio/trigger/stm32-timer-trigger.c +++ b/drivers/iio/trigger/stm32-timer-trigger.c @@ -174,6 +174,7 @@ static void stm32_timer_stop(struct stm32_timer_trigger *priv) clk_disable(priv->clk); /* Stop timer */ + regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_ARPE, 0); regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_CEN, 0); regmap_write(priv->regmap, TIM_PSC, 0); regmap_write(priv->regmap, TIM_ARR, 0); @@ -715,8 +716,9 @@ static ssize_t stm32_count_set_preset(struct iio_dev *indio_dev, if (ret) return ret; + /* TIMx_ARR register shouldn't be buffered (ARPE=0) */ + regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_ARPE, 0); regmap_write(priv->regmap, TIM_ARR, preset); - regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_ARPE, TIM_CR1_ARPE); return len; } |