Skip to content

Commit 48e4ad0

Browse files
facchinmfacchinm
committed
Merge remote-tracking branch 'bcmi/unoq' into unoq
2 parents c708776 + 862d7b1 commit 48e4ad0

File tree

2 files changed

+134
-26
lines changed

2 files changed

+134
-26
lines changed

‎boards.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ unoq.compiler.zephyr.arch.define=
2424
unoq.build.float-abi=-mfloat-abi=hard
2525
unoq.build.extra_flags=
2626
unoq.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
27-
unoq.build.board=unoq
27+
unoq.build.board=UNO_Q
2828
unoq.build.zephyr_hals=hal_stm32
2929
unoq.compiler.zephyr.arch.define=
3030
unoq.compiler.zephyr=

‎variants/b_u585i_iot02a_stm32u585xx/b_u585i_iot02a_stm32u585xx.overlay‎

Lines changed: 133 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
/delete-node/ &smbus1;
44
/delete-node/ &i2c1;
55
/delete-node/ &octospi2;
6-
/delete-node/ &timers4;
76

87
/ {
98
chosen {
@@ -182,6 +181,78 @@
182181
};
183182
};
184183

184+
185+
/* Enable PWM timers */
186+
&timers1 {
187+
status = "okay";
188+
st,prescaler = <4>;
189+
190+
pwm1: pwm {
191+
status = "okay";
192+
/* tim1_etr_pa12 is not available for PWM */
193+
/* Currently only the pins marked with ~ on the pin headers are enabled */
194+
/* pinctrl-0 = <&tim1_ch4_pa11 &tim1_ch3n_pb15 &tim1_ch1n_pb13 &tim1_ch2n_pb14>; */
195+
pinctrl-0 = <&tim1_ch4_pa11 &tim1_ch3n_pb15>;
196+
pinctrl-names = "default";
197+
};
198+
};
199+
200+
/* Currently only the pins marked with ~ on the pin headers are enabled */
201+
/* PB10 and PB11 conflict with I2C configuation */
202+
/*
203+
&timers2 {
204+
status = "okay";
205+
st,prescaler = <4>;
206+
207+
pwm2: pwm {
208+
status = "okay";
209+
pinctrl-0 = <&tim2_ch2_pb3 &tim2_ch3_pb10 &tim2_ch4_pb11>;
210+
pinctrl-names = "default";
211+
};
212+
};
213+
*/
214+
215+
&timers3 {
216+
status = "okay";
217+
st,prescaler = <4>;
218+
219+
pwm3: pwm {
220+
status = "okay";
221+
/* Currently only the pins marked with ~ on the pin headers are enabled */
222+
/* pinctrl-0 = <&tim3_ch3_pb0 &tim3_ch4_pb1 &tim3_ch1_pb4>; */
223+
pinctrl-0 = <&tim3_ch3_pb0 &tim3_ch4_pb1>;
224+
pinctrl-names = "default";
225+
};
226+
};
227+
228+
&timers4 {
229+
status = "okay";
230+
st,prescaler = <4>;
231+
232+
pwm4: pwm {
233+
status = "okay";
234+
/* PB6 PB7 not usable for PWM until dynamic pin muxing works */
235+
/* Currently only the pins marked with ~ on the pin headers are enabled */
236+
/* pinctrl-0 = <&tim4_ch3_pb8 &tim4_ch4_pb9 &tim4_ch1_pb6 &tim4_ch2_pb7>; */
237+
pinctrl-0 = <&tim4_ch3_pb8 &tim4_ch4_pb9>;
238+
pinctrl-names = "default";
239+
};
240+
};
241+
242+
/* Currently only the pins marked with ~ on the pin headers are enabled */
243+
/*
244+
&timers8 {
245+
status = "okay";
246+
st,prescaler = <4>;
247+
248+
pwm8: pwm {
249+
status = "okay";
250+
pinctrl-0 = <&tim8_ch4n_pb2>;
251+
pinctrl-names = "default";
252+
};
253+
};
254+
*/
255+
185256
&timers16 {
186257
status = "okay";
187258
st,prescaler = <4>;
@@ -204,28 +275,31 @@
204275
};
205276

206277
/ {
207-
zephyr,user {
208-
digital-pin-gpios = <&gpiob 7 GPIO_ACTIVE_HIGH>, /* JDIGITAL */
209-
<&gpiob 6 GPIO_ACTIVE_HIGH>,
210-
<&gpiob 3 GPIO_ACTIVE_HIGH>,
211-
<&gpiob 0 GPIO_ACTIVE_HIGH>,
212-
<&gpioa 12 GPIO_ACTIVE_HIGH>,
213-
<&gpioa 11 GPIO_ACTIVE_HIGH>,
214-
<&gpiob 1 GPIO_ACTIVE_HIGH>,
215-
<&gpiob 2 GPIO_ACTIVE_HIGH>,
216-
<&gpiob 4 GPIO_ACTIVE_HIGH>,
217-
<&gpiob 8 GPIO_ACTIVE_HIGH>,
218-
<&gpiob 9 GPIO_ACTIVE_HIGH>,
219-
<&gpiob 15 GPIO_ACTIVE_HIGH>,
220-
<&gpiob 14 GPIO_ACTIVE_HIGH>,
221-
<&gpiob 13 GPIO_ACTIVE_HIGH>,
222-
223-
<&gpioa 4 GPIO_ACTIVE_HIGH>, /* ADCs */
224-
<&gpioa 5 GPIO_ACTIVE_HIGH>,
225-
<&gpioa 6 GPIO_ACTIVE_HIGH>,
226-
<&gpioa 7 GPIO_ACTIVE_HIGH>,
227-
<&gpioc 1 GPIO_ACTIVE_HIGH>,
228-
<&gpioc 0 GPIO_ACTIVE_HIGH>,
278+
zephyr,user {
279+
digital-pin-gpios = <&gpiob 7 GPIO_ACTIVE_HIGH>, /* D0 - PB7 */
280+
<&gpiob 6 GPIO_ACTIVE_HIGH>, /* D1 - PB6 */
281+
<&gpiob 3 GPIO_ACTIVE_HIGH>, /* D2 - PB3 */
282+
<&gpiob 0 GPIO_ACTIVE_HIGH>, /* D3 - PB0 */
283+
<&gpioa 12 GPIO_ACTIVE_HIGH>, /* D4 - PA12 */
284+
<&gpioa 11 GPIO_ACTIVE_HIGH>, /* D5 - PA11 */
285+
<&gpiob 1 GPIO_ACTIVE_HIGH>, /* D6 - PB1 */
286+
<&gpiob 2 GPIO_ACTIVE_HIGH>, /* D7 - PB2 */
287+
<&gpiob 4 GPIO_ACTIVE_HIGH>, /* D8 - PB4 */
288+
<&gpiob 8 GPIO_ACTIVE_HIGH>, /* D9 - PB8 */
289+
<&gpiob 9 GPIO_ACTIVE_HIGH>, /* D10 - PB9 */
290+
<&gpiob 15 GPIO_ACTIVE_HIGH>, /* D11 - PB15 */
291+
<&gpiob 14 GPIO_ACTIVE_HIGH>, /* D12 - PB14 */
292+
<&gpiob 13 GPIO_ACTIVE_HIGH>, /* D13 - PB13 */
293+
<&gpiob 11 GPIO_ACTIVE_HIGH>, /* D20 - PB11 */
294+
<&gpiob 10 GPIO_ACTIVE_HIGH>, /* D21 - PB10 */
295+
296+
/* ADCs */
297+
<&gpioa 4 GPIO_ACTIVE_HIGH>, /* A0 - PA4 */
298+
<&gpioa 5 GPIO_ACTIVE_HIGH>, /* A1 - PA5 */
299+
<&gpioa 6 GPIO_ACTIVE_HIGH>, /* A2 - PA6 */
300+
<&gpioa 7 GPIO_ACTIVE_HIGH>, /* A3 - PA7 */
301+
<&gpioc 1 GPIO_ACTIVE_HIGH>, /* A4 - PC1 */
302+
<&gpioc 0 GPIO_ACTIVE_HIGH>, /* A5 - PC0 */
229303

230304
<&gpioc 2 GPIO_ACTIVE_HIGH>, /* JSPI */
231305
<&gpioc 3 GPIO_ACTIVE_HIGH>,
@@ -289,7 +363,24 @@
289363
<&gpioh 14 GPIO_ACTIVE_HIGH>,
290364
<&gpioh 15 GPIO_ACTIVE_HIGH>;
291365

292-
pwm-pin-gpios = <>;
366+
/* PWM pin mapping - Digital pins with their timer channels */
367+
/* Currently only the pins marked with ~ on the pin headers are enabled */
368+
pwm-pin-gpios =
369+
/* <&gpiob 6 0>, */ /* D1/PB6 - TIM4_CH1 */
370+
/* <&gpiob 3 0>, */ /* D2/PB3 - TIM2_CH2 */
371+
/* <&gpiob 3 0>, */ /* D2/PB3 - TIM2_CH2 */
372+
<&gpiob 0 0>, /* D3/PB0 - TIM3_CH3 */
373+
<&gpioa 11 0>, /* D5/PA11 - TIM1_CH4 */
374+
<&gpiob 1 0>, /* D6/PB1 - TIM3_CH4 */
375+
/* <&gpiob 2 0>, */ /* D7/PB2 - TIM8_CH4N */
376+
/* <&gpiob 4 0>, */ /* D8/PB4 - TIM3_CH1 */
377+
<&gpiob 8 0>, /* D9/PB8 - TIM4_CH3 */
378+
<&gpiob 9 0>, /* D10/PB9 - TIM4_CH4 */
379+
<&gpiob 15 0>; /* D11/PB15 - TIM1_CH3N */
380+
/* <&gpiob 14 0>, */ /* D12/PB14 - TIM1_CH2N */
381+
/* <&gpiob 13 0>, */ /* D13/PB13 - TIM1_CH1N */
382+
/* <&gpiob 11 0>, */ /* D20/PB11 - TIM2_CH4 */
383+
/* <&gpiob 10 0>; */ /* D21/PB10 - TIM2_CH3 */
293384

294385
adc-pin-gpios = <&gpioa 4 0>,
295386
<&gpioa 5 0>,
@@ -301,7 +392,24 @@
301392
serials = <&usart1>, <&lpuart1>;
302393
i2cs = <&i2c2>, <&i2c4>;
303394
spis = <&spi3>;
304-
pwms = <>;
395+
/* PWM mapping for the digital pins */
396+
/* Currently only the pins marked with ~ on the pin headers are enabled */
397+
pwms =
398+
/* <&pwm4 2 PWM_HZ(500) PWM_POLARITY_NORMAL>, */ /* D0/PB7 → TIM4_CH2 */
399+
/* <&pwm4 1 PWM_HZ(500) PWM_POLARITY_NORMAL>, */ /* D1/PB6 → TIM4_CH1 */
400+
/* <&pwm2 2 PWM_HZ(500) PWM_POLARITY_NORMAL>, */ /* D2/PB3 → TIM2_CH2 */
401+
<&pwm3 3 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D3/PB0 → TIM3_CH3 */
402+
<&pwm1 4 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D5/PA11 → TIM1_CH4 */
403+
<&pwm3 4 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D6/PB1 → TIM3_CH4 */
404+
/* <&pwm8 4 PWM_HZ(500) PWM_POLARITY_INVERTED>, */ /* D7/PB2 → TIM8_CH4N */
405+
/* <&pwm3 1 PWM_HZ(500) PWM_POLARITY_NORMAL>, */ /* D8/PB4 → TIM3_CH1 */
406+
<&pwm4 3 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D9/PB8 → TIM4_CH3 */
407+
<&pwm4 4 PWM_HZ(500) PWM_POLARITY_NORMAL>, /* D10/PB9 → TIM4_CH4 */
408+
<&pwm1 3 PWM_HZ(500) PWM_POLARITY_INVERTED>; /* D11/PB15 → TIM1_CH3N */
409+
/* <&pwm1 2 PWM_HZ(500) PWM_POLARITY_INVERTED>, */ /* D12/PB14 → TIM1_CH2N */
410+
/* <&pwm1 1 PWM_HZ(500) PWM_POLARITY_INVERTED>, */ /* D13/PB13 → TIM1_CH1N */
411+
/* <&pwm2 4 PWM_HZ(500) PWM_POLARITY_NORMAL>, */ /* D20/PB11 → TIM2_CH4 */
412+
/* <&pwm2 3 PWM_HZ(500) PWM_POLARITY_NORMAL>; */ /* D21/PB10 → TIM2_CH3 */
305413

306414
control-gpios = <&gpiog 13 GPIO_ACTIVE_HIGH>; /* Internal SPI RDY */
307415
analog-switch-gpios = <&gpioa 2 GPIO_ACTIVE_HIGH>; /* Analog switch for VREF */

0 commit comments

Comments
 (0)