Skip to content

Commit bf5766f

Browse files
facchinmfacchinm
committed
unoq: restore conflicting PWMs and DACs
1 parent f00d424 commit bf5766f

File tree

1 file changed

+36
-40
lines changed

1 file changed

+36
-40
lines changed

‎variants/arduino_uno_q_stm32u585xx/arduino_uno_q_stm32u585xx.overlay‎

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,13 @@
7575
status = "okay";
7676
/* tim1_etr_pa12 is not available for PWM */
7777
/* Currently only the pins marked with ~ on the pin headers are enabled */
78-
/* pinctrl-0 = <&tim1_ch4_pa11 &tim1_ch3n_pb15 &tim1_ch1n_pb13 &tim1_ch2n_pb14>; */
79-
pinctrl-0 = <&tim1_ch4_pa11>;
78+
pinctrl-0 = <&tim1_ch4_pa11 &tim1_ch3n_pb15 &tim1_ch1n_pb13 &tim1_ch2n_pb14>;
8079
pinctrl-names = "default";
8180
};
8281
};
8382

8483
/* Currently only the pins marked with ~ on the pin headers are enabled */
8584
/* PB10 and PB11 conflict with I2C configuation */
86-
/*
8785
&timers2 {
8886
status = "okay";
8987
st,prescaler = <4>;
@@ -94,7 +92,6 @@
9492
pinctrl-names = "default";
9593
};
9694
};
97-
*/
9895

9996
&timers3 {
10097
status = "okay";
@@ -103,8 +100,7 @@
103100
pwm3: pwm {
104101
status = "okay";
105102
/* Currently only the pins marked with ~ on the pin headers are enabled */
106-
/* pinctrl-0 = <&tim3_ch3_pb0 &tim3_ch4_pb1 &tim3_ch1_pb4>; */
107-
pinctrl-0 = <&tim3_ch3_pb0 &tim3_ch4_pb1>;
103+
pinctrl-0 = <&tim3_ch3_pb0 &tim3_ch4_pb1 &tim3_ch1_pb4>;
108104
pinctrl-names = "default";
109105
};
110106
};
@@ -117,8 +113,7 @@
117113
status = "okay";
118114
/* PB6 PB7 not usable for PWM until dynamic pin muxing works */
119115
/* Currently only the pins marked with ~ on the pin headers are enabled */
120-
/* pinctrl-0 = <&tim4_ch3_pb8 &tim4_ch4_pb9 &tim4_ch1_pb6 &tim4_ch2_pb7>; */
121-
pinctrl-0 = <&tim4_ch3_pb8 &tim4_ch4_pb9>;
116+
pinctrl-0 = <&tim4_ch3_pb8 &tim4_ch4_pb9 &tim4_ch1_pb6 &tim4_ch2_pb7>;
122117
pinctrl-names = "default";
123118
};
124119
};
@@ -135,7 +130,6 @@
135130
};
136131

137132
/* Currently only the pins marked with ~ on the pin headers are enabled */
138-
/*
139133
&timers8 {
140134
status = "okay";
141135
st,prescaler = <4>;
@@ -146,7 +140,6 @@
146140
pinctrl-names = "default";
147141
};
148142
};
149-
*/
150143

151144
&timers16 {
152145
status = "okay";
@@ -258,25 +251,25 @@
258251

259252
/* PWM pin mapping - Digital pins with their timer channels */
260253
/* Currently only the pins marked with ~ on the pin headers are enabled */
261-
pwm-pin-gpios =
262-
/* <&gpiob 6 0>, */ /* D1/PB6 - TIM4_CH1 */
263-
/* <&gpiob 3 0>, */ /* D2/PB3 - TIM2_CH2 */
264-
/* <&gpiob 3 0>, */ /* D2/PB3 - TIM2_CH2 */
265-
<&gpiob 0 0>, /* D3/PB0 - TIM3_CH3 */
266-
<&gpioa 11 0>, /* D5/PA11 - TIM1_CH4 */
267-
<&gpiob 1 0>, /* D6/PB1 - TIM3_CH4 */
268-
/* <&gpiob 2 0>, */ /* D7/PB2 - TIM8_CH4N */
269-
/* <&gpiob 4 0>, */ /* D8/PB4 - TIM3_CH1 */
270-
<&gpiob 8 0>, /* D9/PB8 - TIM4_CH3 */
271-
<&gpiob 9 0>, /* D10/PB9 - TIM4_CH4 */
272-
/* <&gpiob 15 0>, */ /* D11/PB15 - TIM1_CH3N */
273-
/* <&gpiob 14 0>, */ /* D12/PB14 - TIM1_CH2N */
274-
/* <&gpiob 13 0>, */ /* D13/PB13 - TIM1_CH1N */
275-
/* <&gpiob 11 0>, */ /* D20/PB11 - TIM2_CH4 */
276-
/* <&gpiob 10 0>; */ /* D21/PB10 - TIM2_CH3 */
277-
<&gpioh 10 0>, /* LED3_R - TIM5_CH1 */
278-
<&gpioh 11 0>, /* LED3_G - TIM5_CH2 */
279-
<&gpioh 12 0>; /* LED3_B - TIM5_CH3 */
254+
pwm-pin-gpios =
255+
<&gpiob 7 0>, /* D0/PB6 - TIM4_CH2 */
256+
<&gpiob 6 0>, /* D1/PB6 - TIM4_CH1 */
257+
<&gpiob 3 0>, /* D2/PB3 - TIM2_CH2 */
258+
<&gpiob 0 0>, /* D3/PB0 - TIM3_CH3 */
259+
<&gpioa 11 0>, /* D5/PA11 - TIM1_CH4 */
260+
<&gpiob 1 0>, /* D6/PB1 - TIM3_CH4 */
261+
<&gpiob 2 0>, /* D7/PB2 - TIM8_CH4N */
262+
<&gpiob 4 0>, /* D8/PB4 - TIM3_CH1 */
263+
<&gpiob 8 0>, /* D9/PB8 - TIM4_CH3 */
264+
<&gpiob 9 0>, /* D10/PB9 - TIM4_CH4 */
265+
<&gpiob 15 0>, /* D11/PB15 - TIM1_CH3N */
266+
<&gpiob 14 0>, /* D12/PB14 - TIM1_CH2N */
267+
<&gpiob 13 0>, /* D13/PB13 - TIM1_CH1N */
268+
<&gpiob 11 0>, /* D20/PB11 - TIM2_CH4 */
269+
<&gpiob 10 0>, /* D21/PB10 - TIM2_CH3 */
270+
<&gpioh 10 0>, /* LED3_R - TIM5_CH1 */
271+
<&gpioh 11 0>, /* LED3_G - TIM5_CH2 */
272+
<&gpioh 12 0>; /* LED3_B - TIM5_CH3 */
280273

281274
adc-pin-gpios = <&gpioa 4 0>,
282275
<&gpioa 5 0>,
@@ -290,22 +283,22 @@
290283
spis = <&spi2>, <&spi3>;
291284
/* PWM mapping for the digital pins */
292285
/* Currently only the pins marked with ~ on the pin headers are enabled */
293-
pwms =
294-
/* <&pwm4 2 PWM_HZ(500) PWM_POLARITY_NORMAL>, */ /* D0/PB7 → TIM4_CH2 */
295-
/* <&pwm4 1 PWM_HZ(500) PWM_POLARITY_NORMAL>, */ /* D1/PB6 → TIM4_CH1 */
296-
/* <&pwm2 2 PWM_HZ(500) PWM_POLARITY_NORMAL>, */ /* D2/PB3 → TIM2_CH2 */
286+
pwms =
287+
<&pwm4 2 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D0/PB7 → TIM4_CH2 */
288+
<&pwm4 1 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D1/PB6 → TIM4_CH1 */
289+
<&pwm2 2 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D2/PB3 → TIM2_CH2 */
297290
<&pwm3 3 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D3/PB0 → TIM3_CH3 */
298291
<&pwm1 4 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D5/PA11 → TIM1_CH4 */
299292
<&pwm3 4 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D6/PB1 → TIM3_CH4 */
300-
/* <&pwm8 4 PWM_HZ(500) PWM_POLARITY_INVERTED>, */ /* D7/PB2 → TIM8_CH4N */
301-
/* <&pwm3 1 PWM_HZ(500) PWM_POLARITY_NORMAL>, */ /* D8/PB4 → TIM3_CH1 */
293+
<&pwm8 4 PWM_HZ(500) PWM_POLARITY_INVERTED>, /* D7/PB2 → TIM8_CH4N */
294+
<&pwm3 1 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D8/PB4 → TIM3_CH1 */
302295
<&pwm4 3 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D9/PB8 → TIM4_CH3 */
303296
<&pwm4 4 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D10/PB9 → TIM4_CH4 */
304-
/* <&pwm1 3 PWM_HZ(500) PWM_POLARITY_INVERTED>, */ /* D11/PB15 → TIM1_CH3N */
305-
/* <&pwm1 2 PWM_HZ(500) PWM_POLARITY_INVERTED>, */ /* D12/PB14 → TIM1_CH2N */
306-
/* <&pwm1 1 PWM_HZ(500) PWM_POLARITY_INVERTED>, */ /* D13/PB13 → TIM1_CH1N */
307-
/* <&pwm2 4 PWM_HZ(500) PWM_POLARITY_NORMAL>, */ /* D20/PB11 → TIM2_CH4 */
308-
/* <&pwm2 3 PWM_HZ(500) PWM_POLARITY_NORMAL>; */ /* D21/PB10 → TIM2_CH3 */
297+
<&pwm1 3 PWM_HZ(500) PWM_POLARITY_INVERTED>, /* D11/PB15 → TIM1_CH3N */
298+
<&pwm1 2 PWM_HZ(500) PWM_POLARITY_INVERTED>, /* D12/PB14 → TIM1_CH2N */
299+
<&pwm1 1 PWM_HZ(500) PWM_POLARITY_INVERTED>, /* D13/PB13 → TIM1_CH1N */
300+
<&pwm2 4 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D20/PB11 → TIM2_CH4 */
301+
<&pwm2 3 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D21/PB10 → TIM2_CH3 */
309302
<&pwm5 1 PWM_HZ(500) PWM_POLARITY_INVERTED>, /* LED3_R/PH10 → TIM5_CH1 */
310303
<&pwm5 2 PWM_HZ(500) PWM_POLARITY_INVERTED>, /* LED3_G/PH11 → TIM5_CH2 */
311304
<&pwm5 3 PWM_HZ(500) PWM_POLARITY_INVERTED>; /* LED3_B/PH12 → TIM5_CH3 */
@@ -320,6 +313,9 @@
320313
<&adc1 2>, /* A4 - PC1 */
321314
<&adc1 1>; /* A5 - PC0 */
322315

316+
dac-pin-gpios = <&gpioa 4 0>,
317+
<&gpioa 5 0>;
318+
323319
dac = <&dac1>;
324320
dac-channels = <1>, <2>;
325321
dac-resolution = <12>;

0 commit comments

Comments
 (0)