Skip to content

Commit 2b17a6e

Browse files
author
Uwe Kleine-König
committed
Merge tag 'ib-mfd-counter-v5.11' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into HEAD
Immutable branch between MFD and Counter due for the v5.11 merge window
2 parents 30122ce + 304d02a commit 2b17a6e

File tree

2 files changed

+96
-87
lines changed

2 files changed

+96
-87
lines changed

‎drivers/counter/stm32-timer-cnt.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ static int stm32_count_events_configure(struct counter_device *counter)
465465
ret = stm32_count_capture_configure(counter, event_node->channel, true);
466466
if (ret)
467467
return ret;
468-
dier |= TIM_DIER_CC_IE(event_node->channel);
468+
dier |= TIM_DIER_CCxIE(event_node->channel + 1);
469469
break;
470470
default:
471471
/* should never reach this path */
@@ -478,7 +478,7 @@ static int stm32_count_events_configure(struct counter_device *counter)
478478

479479
/* check for disabled capture events */
480480
for (i = 0 ; i < priv->nchannels; i++) {
481-
if (!(dier & TIM_DIER_CC_IE(i))) {
481+
if (!(dier & TIM_DIER_CCxIE(i + 1))) {
482482
ret = stm32_count_capture_configure(counter, i, false);
483483
if (ret)
484484
return ret;

‎include/linux/mfd/stm32-timers.h‎

Lines changed: 94 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -12,97 +12,106 @@
1212
#include <linux/dma-mapping.h>
1313
#include <linux/regmap.h>
1414

15-
#define TIM_CR1 0x00 /* Control Register 1 */
16-
#define TIM_CR2 0x04 /* Control Register 2 */
17-
#define TIM_SMCR 0x08 /* Slave mode control reg */
18-
#define TIM_DIER 0x0C /* DMA/interrupt register */
19-
#define TIM_SR 0x10 /* Status register */
20-
#define TIM_EGR 0x14 /* Event Generation Reg */
21-
#define TIM_CCMR1 0x18 /* Capt/Comp 1 Mode Reg */
22-
#define TIM_CCMR2 0x1C /* Capt/Comp 2 Mode Reg */
23-
#define TIM_CCER 0x20 /* Capt/Comp Enable Reg */
24-
#define TIM_CNT 0x24 /* Counter */
25-
#define TIM_PSC 0x28 /* Prescaler */
26-
#define TIM_ARR 0x2c /* Auto-Reload Register */
27-
#define TIM_CCR1 0x34 /* Capt/Comp Register 1 */
28-
#define TIM_CCR2 0x38 /* Capt/Comp Register 2 */
29-
#define TIM_CCR3 0x3C /* Capt/Comp Register 3 */
30-
#define TIM_CCR4 0x40 /* Capt/Comp Register 4 */
31-
#define TIM_BDTR 0x44 /* Break and Dead-Time Reg */
32-
#define TIM_DCR 0x48 /* DMA control register */
33-
#define TIM_DMAR 0x4C /* DMA register for transfer */
34-
#define TIM_TISEL 0x68 /* Input Selection */
15+
#define TIM_CR1 0x00 /* Control Register 1 */
16+
#define TIM_CR2 0x04 /* Control Register 2 */
17+
#define TIM_SMCR 0x08 /* Slave mode control reg */
18+
#define TIM_DIER 0x0C /* DMA/interrupt register */
19+
#define TIM_SR 0x10 /* Status register */
20+
#define TIM_EGR 0x14 /* Event Generation Reg */
21+
#define TIM_CCMR1 0x18 /* Capt/Comp 1 Mode Reg */
22+
#define TIM_CCMR2 0x1C /* Capt/Comp 2 Mode Reg */
23+
#define TIM_CCER 0x20 /* Capt/Comp Enable Reg */
24+
#define TIM_CNT 0x24 /* Counter */
25+
#define TIM_PSC 0x28 /* Prescaler */
26+
#define TIM_ARR 0x2c /* Auto-Reload Register */
27+
#define TIM_CCRx(x) (0x34 + 4 * ((x) - 1)) /* Capt/Comp Register x (x ∈ {1, .. 4}) */
28+
#define TIM_CCR1 TIM_CCRx(1) /* Capt/Comp Register 1 */
29+
#define TIM_CCR2 TIM_CCRx(2) /* Capt/Comp Register 2 */
30+
#define TIM_CCR3 TIM_CCRx(3) /* Capt/Comp Register 3 */
31+
#define TIM_CCR4 TIM_CCRx(4) /* Capt/Comp Register 4 */
32+
#define TIM_BDTR 0x44 /* Break and Dead-Time Reg */
33+
#define TIM_DCR 0x48 /* DMA control register */
34+
#define TIM_DMAR 0x4C /* DMA register for transfer */
35+
#define TIM_TISEL 0x68 /* Input Selection */
3536

36-
#define TIM_CR1_CEN BIT(0) /* Counter Enable */
37-
#define TIM_CR1_DIR BIT(4) /* Counter Direction */
38-
#define TIM_CR1_ARPE BIT(7) /* Auto-reload Preload Ena */
39-
#define TIM_CR2_MMS (BIT(4) | BIT(5) | BIT(6)) /* Master mode selection */
40-
#define TIM_CR2_MMS2 GENMASK(23, 20) /* Master mode selection 2 */
41-
#define TIM_SMCR_SMS (BIT(0) | BIT(1) | BIT(2)) /* Slave mode selection */
42-
#define TIM_SMCR_TS (BIT(4) | BIT(5) | BIT(6)) /* Trigger selection */
43-
#define TIM_DIER_UIE BIT(0) /* Update interrupt */
44-
#define TIM_DIER_CC1IE BIT(1) /* CC1 Interrupt Enable */
45-
#define TIM_DIER_CC2IE BIT(2) /* CC2 Interrupt Enable */
46-
#define TIM_DIER_CC3IE BIT(3) /* CC3 Interrupt Enable */
47-
#define TIM_DIER_CC4IE BIT(4) /* CC4 Interrupt Enable */
48-
#define TIM_DIER_CC_IE(x) BIT((x) + 1) /* CC1, CC2, CC3, CC4 interrupt enable */
49-
#define TIM_DIER_UDE BIT(8) /* Update DMA request Enable */
50-
#define TIM_DIER_CC1DE BIT(9) /* CC1 DMA request Enable */
51-
#define TIM_DIER_CC2DE BIT(10) /* CC2 DMA request Enable */
52-
#define TIM_DIER_CC3DE BIT(11) /* CC3 DMA request Enable */
53-
#define TIM_DIER_CC4DE BIT(12) /* CC4 DMA request Enable */
54-
#define TIM_DIER_COMDE BIT(13) /* COM DMA request Enable */
55-
#define TIM_DIER_TDE BIT(14) /* Trigger DMA request Enable */
56-
#define TIM_SR_UIF BIT(0) /* Update interrupt flag */
57-
#define TIM_SR_CC_IF(x) BIT((x) + 1) /* CC1, CC2, CC3, CC4 interrupt flag */
58-
#define TIM_EGR_UG BIT(0) /* Update Generation */
59-
#define TIM_CCMR_PE BIT(3) /* Channel Preload Enable */
60-
#define TIM_CCMR_M1 (BIT(6) | BIT(5)) /* Channel PWM Mode 1 */
61-
#define TIM_CCMR_CC1S (BIT(0) | BIT(1)) /* Capture/compare 1 sel */
62-
#define TIM_CCMR_IC1PSC GENMASK(3, 2) /* Input capture 1 prescaler */
63-
#define TIM_CCMR_CC2S (BIT(8) | BIT(9)) /* Capture/compare 2 sel */
64-
#define TIM_CCMR_IC2PSC GENMASK(11, 10) /* Input capture 2 prescaler */
65-
#define TIM_CCMR_CC1S_TI1 BIT(0) /* IC1/IC3 selects TI1/TI3 */
66-
#define TIM_CCMR_CC1S_TI2 BIT(1) /* IC1/IC3 selects TI2/TI4 */
67-
#define TIM_CCMR_CC2S_TI2 BIT(8) /* IC2/IC4 selects TI2/TI4 */
68-
#define TIM_CCMR_CC2S_TI1 BIT(9) /* IC2/IC4 selects TI1/TI3 */
69-
#define TIM_CCMR_CC3S (BIT(0) | BIT(1)) /* Capture/compare 3 sel */
70-
#define TIM_CCMR_CC4S (BIT(8) | BIT(9)) /* Capture/compare 4 sel */
71-
#define TIM_CCMR_CC3S_TI3 BIT(0) /* IC3 selects TI3 */
72-
#define TIM_CCMR_CC4S_TI4 BIT(8) /* IC4 selects TI4 */
73-
#define TIM_CCER_CC1E BIT(0) /* Capt/Comp 1 out Ena */
74-
#define TIM_CCER_CC1P BIT(1) /* Capt/Comp 1 Polarity */
75-
#define TIM_CCER_CC1NE BIT(2) /* Capt/Comp 1N out Ena */
76-
#define TIM_CCER_CC1NP BIT(3) /* Capt/Comp 1N Polarity */
77-
#define TIM_CCER_CC2E BIT(4) /* Capt/Comp 2 out Ena */
78-
#define TIM_CCER_CC2P BIT(5) /* Capt/Comp 2 Polarity */
79-
#define TIM_CCER_CC2NP BIT(7) /* Capt/Comp 2N Polarity */
80-
#define TIM_CCER_CC3E BIT(8) /* Capt/Comp 3 out Ena */
81-
#define TIM_CCER_CC3P BIT(9) /* Capt/Comp 3 Polarity */
82-
#define TIM_CCER_CC3NP BIT(11) /* Capt/Comp 3N Polarity */
83-
#define TIM_CCER_CC4E BIT(12) /* Capt/Comp 4 out Ena */
84-
#define TIM_CCER_CC4P BIT(13) /* Capt/Comp 4 Polarity */
85-
#define TIM_CCER_CC4NP BIT(15) /* Capt/Comp 4N Polarity */
86-
#define TIM_CCER_CCXE (BIT(0) | BIT(4) | BIT(8) | BIT(12))
87-
#define TIM_BDTR_BKE(x) BIT(12 + (x) * 12) /* Break input enable */
88-
#define TIM_BDTR_BKP(x) BIT(13 + (x) * 12) /* Break input polarity */
89-
#define TIM_BDTR_AOE BIT(14) /* Automatic Output Enable */
90-
#define TIM_BDTR_MOE BIT(15) /* Main Output Enable */
91-
#define TIM_BDTR_BKF(x) (0xf << (16 + (x) * 4))
92-
#define TIM_DCR_DBA GENMASK(4, 0) /* DMA base addr */
93-
#define TIM_DCR_DBL GENMASK(12, 8) /* DMA burst len */
37+
#define TIM_CR1_CEN BIT(0) /* Counter Enable */
38+
#define TIM_CR1_DIR BIT(4) /* Counter Direction */
39+
#define TIM_CR1_ARPE BIT(7) /* Auto-reload Preload Ena */
40+
#define TIM_CR2_MMS (BIT(4) | BIT(5) | BIT(6)) /* Master mode selection */
41+
#define TIM_CR2_MMS2 GENMASK(23, 20) /* Master mode selection 2 */
42+
#define TIM_SMCR_SMS (BIT(0) | BIT(1) | BIT(2)) /* Slave mode selection */
43+
#define TIM_SMCR_TS (BIT(4) | BIT(5) | BIT(6)) /* Trigger selection */
44+
#define TIM_DIER_UIE BIT(0) /* Update interrupt */
45+
#define TIM_DIER_CCxIE(x) BIT(1 + ((x) - 1)) /* CCx Interrupt Enable (x ∈ {1, .. 4}) */
46+
#define TIM_DIER_CC1IE TIM_DIER_CCxIE(1) /* CC1 Interrupt Enable */
47+
#define TIM_DIER_CC2IE TIM_DIER_CCxIE(2) /* CC2 Interrupt Enable */
48+
#define TIM_DIER_CC3IE TIM_DIER_CCxIE(3) /* CC3 Interrupt Enable */
49+
#define TIM_DIER_CC4IE TIM_DIER_CCxIE(4) /* CC4 Interrupt Enable */
50+
#define TIM_DIER_UDE BIT(8) /* Update DMA request Enable */
51+
#define TIM_DIER_CCxDE(x) BIT(9 + ((x) - 1)) /* CCx DMA request Enable (x ∈ {1, .. 4}) */
52+
#define TIM_DIER_CC1DE TIM_DIER_CCxDE(1) /* CC1 DMA request Enable */
53+
#define TIM_DIER_CC2DE TIM_DIER_CCxDE(2) /* CC2 DMA request Enable */
54+
#define TIM_DIER_CC3DE TIM_DIER_CCxDE(3) /* CC3 DMA request Enable */
55+
#define TIM_DIER_CC4DE TIM_DIER_CCxDE(4) /* CC4 DMA request Enable */
56+
#define TIM_DIER_COMDE BIT(13) /* COM DMA request Enable */
57+
#define TIM_DIER_TDE BIT(14) /* Trigger DMA request Enable */
58+
#define TIM_SR_UIF BIT(0) /* Update interrupt flag */
59+
#define TIM_SR_CC_IF(x) BIT((x) + 1) /* CC1, CC2, CC3, CC4 interrupt flag */
60+
#define TIM_EGR_UG BIT(0) /* Update Generation */
61+
#define TIM_CCMR_PE BIT(3) /* Channel Preload Enable */
62+
#define TIM_CCMR_M1 (BIT(6) | BIT(5)) /* Channel PWM Mode 1 */
63+
#define TIM_CCMR_CC1S (BIT(0) | BIT(1)) /* Capture/compare 1 sel */
64+
#define TIM_CCMR_IC1PSC GENMASK(3, 2) /* Input capture 1 prescaler */
65+
#define TIM_CCMR_CC2S (BIT(8) | BIT(9)) /* Capture/compare 2 sel */
66+
#define TIM_CCMR_IC2PSC GENMASK(11, 10) /* Input capture 2 prescaler */
67+
#define TIM_CCMR_CC1S_TI1 BIT(0) /* IC1/IC3 selects TI1/TI3 */
68+
#define TIM_CCMR_CC1S_TI2 BIT(1) /* IC1/IC3 selects TI2/TI4 */
69+
#define TIM_CCMR_CC2S_TI2 BIT(8) /* IC2/IC4 selects TI2/TI4 */
70+
#define TIM_CCMR_CC2S_TI1 BIT(9) /* IC2/IC4 selects TI1/TI3 */
71+
#define TIM_CCMR_CC3S (BIT(0) | BIT(1)) /* Capture/compare 3 sel */
72+
#define TIM_CCMR_CC4S (BIT(8) | BIT(9)) /* Capture/compare 4 sel */
73+
#define TIM_CCMR_CC3S_TI3 BIT(0) /* IC3 selects TI3 */
74+
#define TIM_CCMR_CC4S_TI4 BIT(8) /* IC4 selects TI4 */
75+
#define TIM_CCER_CCxE(x) BIT(0 + 4 * ((x) - 1)) /* Capt/Comp x out Ena (x ∈ {1, .. 4}) */
76+
#define TIM_CCER_CCxP(x) BIT(1 + 4 * ((x) - 1)) /* Capt/Comp x Polarity (x ∈ {1, .. 4}) */
77+
#define TIM_CCER_CCxNE(x) BIT(2 + 4 * ((x) - 1)) /* Capt/Comp xN out Ena (x ∈ {1, .. 4}) */
78+
#define TIM_CCER_CCxNP(x) BIT(3 + 4 * ((x) - 1)) /* Capt/Comp xN Polarity (x ∈ {1, .. 4}) */
79+
#define TIM_CCER_CC1E TIM_CCER_CCxE(1) /* Capt/Comp 1 out Ena */
80+
#define TIM_CCER_CC1P TIM_CCER_CCxP(1) /* Capt/Comp 1 Polarity */
81+
#define TIM_CCER_CC1NE TIM_CCER_CCxNE(1) /* Capt/Comp 1N out Ena */
82+
#define TIM_CCER_CC1NP TIM_CCER_CCxNP(1) /* Capt/Comp 1N Polarity */
83+
#define TIM_CCER_CC2E TIM_CCER_CCxE(2) /* Capt/Comp 2 out Ena */
84+
#define TIM_CCER_CC2P TIM_CCER_CCxP(2) /* Capt/Comp 2 Polarity */
85+
#define TIM_CCER_CC2NE TIM_CCER_CCxNE(2) /* Capt/Comp 2N out Ena */
86+
#define TIM_CCER_CC2NP TIM_CCER_CCxNP(2) /* Capt/Comp 2N Polarity */
87+
#define TIM_CCER_CC3E TIM_CCER_CCxE(3) /* Capt/Comp 3 out Ena */
88+
#define TIM_CCER_CC3P TIM_CCER_CCxP(3) /* Capt/Comp 3 Polarity */
89+
#define TIM_CCER_CC3NE TIM_CCER_CCxNE(3) /* Capt/Comp 3N out Ena */
90+
#define TIM_CCER_CC3NP TIM_CCER_CCxNP(3) /* Capt/Comp 3N Polarity */
91+
#define TIM_CCER_CC4E TIM_CCER_CCxE(4) /* Capt/Comp 4 out Ena */
92+
#define TIM_CCER_CC4P TIM_CCER_CCxP(4) /* Capt/Comp 4 Polarity */
93+
#define TIM_CCER_CC4NE TIM_CCER_CCxNE(4) /* Capt/Comp 4N out Ena */
94+
#define TIM_CCER_CC4NP TIM_CCER_CCxNP(4) /* Capt/Comp 4N Polarity */
95+
#define TIM_CCER_CCXE (BIT(0) | BIT(4) | BIT(8) | BIT(12))
96+
#define TIM_BDTR_BKE(x) BIT(12 + (x) * 12) /* Break input enable */
97+
#define TIM_BDTR_BKP(x) BIT(13 + (x) * 12) /* Break input polarity */
98+
#define TIM_BDTR_AOE BIT(14) /* Automatic Output Enable */
99+
#define TIM_BDTR_MOE BIT(15) /* Main Output Enable */
100+
#define TIM_BDTR_BKF(x) (0xf << (16 + (x) * 4))
101+
#define TIM_DCR_DBA GENMASK(4, 0) /* DMA base addr */
102+
#define TIM_DCR_DBL GENMASK(12, 8) /* DMA burst len */
94103

95-
#define MAX_TIM_PSC 0xFFFF
96-
#define MAX_TIM_ICPSC 0x3
97-
#define TIM_CR2_MMS_SHIFT 4
98-
#define TIM_CR2_MMS2_SHIFT 20
104+
#define MAX_TIM_PSC 0xFFFF
105+
#define MAX_TIM_ICPSC 0x3
106+
#define TIM_CR2_MMS_SHIFT 4
107+
#define TIM_CR2_MMS2_SHIFT 20
99108
#define TIM_SMCR_SMS_SLAVE_MODE_DISABLED 0 /* counts on internal clock when CEN=1 */
100109
#define TIM_SMCR_SMS_ENCODER_MODE_1 1 /* counts TI1FP1 edges, depending on TI2FP2 level */
101110
#define TIM_SMCR_SMS_ENCODER_MODE_2 2 /* counts TI2FP2 edges, depending on TI1FP1 level */
102111
#define TIM_SMCR_SMS_ENCODER_MODE_3 3 /* counts on both TI1FP1 and TI2FP2 edges */
103-
#define TIM_SMCR_TS_SHIFT 4
104-
#define TIM_BDTR_BKF_MASK 0xF
105-
#define TIM_BDTR_BKF_SHIFT(x) (16 + (x) * 4)
112+
#define TIM_SMCR_TS_SHIFT 4
113+
#define TIM_BDTR_BKF_MASK 0xF
114+
#define TIM_BDTR_BKF_SHIFT(x) (16 + (x) * 4)
106115

107116
enum stm32_timers_dmas {
108117
STM32_TIMERS_DMA_CH1,

0 commit comments

Comments
 (0)