Commit 29e8c825 authored by Fabrice Gasnier's avatar Fabrice Gasnier Committed by Jonathan Cameron
Browse files

iio: trigger: stm32-timer: disable master mode when stopping 



Master mode should be disabled when stopping. This mainly impacts
possible other use-case after timer has been stopped. Currently,
master mode remains set (from start routine).

Fixes: 6fb34812 ("iio: stm32 trigger: Add support for TRGO2 triggers")

Signed-off-by: default avatarFabrice Gasnier <fabrice.gasnier@st.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent e19ac9d9

drivers/iio/trigger/stm32-timer-trigger.c

+9 −2
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ static int stm32_timer_start(struct stm32_timer_trigger *priv, 
	return 0;

}



static void stm32_timer_stop(struct stm32_timer_trigger *priv)

static void stm32_timer_stop(struct stm32_timer_trigger *priv,

			     struct iio_trigger *trig)

{

	u32 ccer, cr1;
@@ -179,6 +180,12 @@ static void stm32_timer_stop(struct stm32_timer_trigger *priv) 
	regmap_write(priv->regmap, TIM_PSC, 0);

	regmap_write(priv->regmap, TIM_ARR, 0);



	/* Force disable master mode */

	if (stm32_timer_is_trgo2_name(trig->name))

		regmap_update_bits(priv->regmap, TIM_CR2, TIM_CR2_MMS2, 0);

	else

		regmap_update_bits(priv->regmap, TIM_CR2, TIM_CR2_MMS, 0);



	/* Make sure that registers are updated */

	regmap_update_bits(priv->regmap, TIM_EGR, TIM_EGR_UG, TIM_EGR_UG);

}
@@ -197,7 +204,7 @@ static ssize_t stm32_tt_store_frequency(struct device *dev, 
		return ret;



	if (freq == 0) {

		stm32_timer_stop(priv);

		stm32_timer_stop(priv, trig);

	} else {

		ret = stm32_timer_start(priv, trig, freq);

		if (ret)