GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-16 04:04:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

counter: stm32-timer-cnt: Provide defines for slave mode selection

Browse source 
[ Upstream commit ea434ff826 ]

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@foss.st.com>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Reviewed-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
Link: https://lore.kernel.org/r/ad3d9cd7af580d586316d368f74964cbc394f981.1630031207.git.vilhelm.gray@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Stable-dep-of: 00f4bc5184 ("counter: 104-quad-8: Fix Synapse action reported for Index signals")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
William Breathitt Gray 2021-08-27 12:47:46 +09:00 • committed by Justin Hammond
parent ab7bc9200d
commit fb7479c2df
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/counter/stm32-timer-cnt.c
View file

@ -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;

4
include/linux/mfd/stm32-timers.h
View file

@ -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)