This is a note to let you know that I've just added the patch titled
counter: stm32-timer-cnt: Provide defines for slave mode selection
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
counter-stm32-timer-cnt-provide-defines-for-slave-mo.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 320004fee88a9a167c46eeed825185b94853126a
Author: William Breathitt Gray <vilhelm.gray@xxxxxxxxx>
Date: Fri Aug 27 12:47:46 2021 +0900
counter: stm32-timer-cnt: Provide defines for slave mode selection
[ Upstream commit ea434ff82649111de4fcabd76187270f8abdb63a ]
The STM32 timer permits configuration of the counter encoder mode via
the slave mode control register (SMCR) slave mode selection (SMS) bits.
This patch provides preprocessor defines for the supported encoder
modes.
Cc: Fabrice Gasnier <fabrice.gasnier@xxxxxxxxxxx>
Signed-off-by: William Breathitt Gray <vilhelm.gray@xxxxxxxxx>
Reviewed-by: Fabrice Gasnier <fabrice.gasnier@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/ad3d9cd7af580d586316d368f74964cbc394f981.1630031207.git.vilhelm.gray@xxxxxxxxx
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Stable-dep-of: 00f4bc5184c1 ("counter: 104-quad-8: Fix Synapse action reported for Index signals")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/counter/stm32-timer-cnt.c b/drivers/counter/stm32-timer-cnt.c
index 3fb0debd7425d..1fbc46f4ee66e 100644
--- a/drivers/counter/stm32-timer-cnt.c
+++ b/drivers/counter/stm32-timer-cnt.c
@@ -93,16 +93,16 @@ static int stm32_count_function_get(struct counter_device *counter,
regmap_read(priv->regmap, TIM_SMCR, &smcr);
switch (smcr & TIM_SMCR_SMS) {
- case 0:
+ case TIM_SMCR_SMS_SLAVE_MODE_DISABLED:
*function = STM32_COUNT_SLAVE_MODE_DISABLED;
return 0;
- case 1:
+ case TIM_SMCR_SMS_ENCODER_MODE_1:
*function = STM32_COUNT_ENCODER_MODE_1;
return 0;
- case 2:
+ case TIM_SMCR_SMS_ENCODER_MODE_2:
*function = STM32_COUNT_ENCODER_MODE_2;
return 0;
- case 3:
+ case TIM_SMCR_SMS_ENCODER_MODE_3:
*function = STM32_COUNT_ENCODER_MODE_3;
return 0;
default:
@@ -119,16 +119,16 @@ static int stm32_count_function_set(struct counter_device *counter,
switch (function) {
case STM32_COUNT_SLAVE_MODE_DISABLED:
- sms = 0;
+ sms = TIM_SMCR_SMS_SLAVE_MODE_DISABLED;
break;
case STM32_COUNT_ENCODER_MODE_1:
- sms = 1;
+ sms = TIM_SMCR_SMS_ENCODER_MODE_1;
break;
case STM32_COUNT_ENCODER_MODE_2:
- sms = 2;
+ sms = TIM_SMCR_SMS_ENCODER_MODE_2;
break;
case STM32_COUNT_ENCODER_MODE_3:
- sms = 3;
+ sms = TIM_SMCR_SMS_ENCODER_MODE_3;
break;
default:
return -EINVAL;
diff --git a/include/linux/mfd/stm32-timers.h b/include/linux/mfd/stm32-timers.h
index f8db83aedb2b5..5f5c43fd69ddd 100644
--- a/include/linux/mfd/stm32-timers.h
+++ b/include/linux/mfd/stm32-timers.h
@@ -82,6 +82,10 @@
#define MAX_TIM_ICPSC 0x3
#define TIM_CR2_MMS_SHIFT 4
#define TIM_CR2_MMS2_SHIFT 20
+#define TIM_SMCR_SMS_SLAVE_MODE_DISABLED 0 /* counts on internal clock when CEN=1 */
+#define TIM_SMCR_SMS_ENCODER_MODE_1 1 /* counts TI1FP1 edges, depending on TI2FP2 level */
+#define TIM_SMCR_SMS_ENCODER_MODE_2 2 /* counts TI2FP2 edges, depending on TI1FP1 level */
+#define TIM_SMCR_SMS_ENCODER_MODE_3 3 /* counts on both TI1FP1 and TI2FP2 edges */
#define TIM_SMCR_TS_SHIFT 4
#define TIM_BDTR_BKF_MASK 0xF
#define TIM_BDTR_BKF_SHIFT(x) (16 + (x) * 4)
