Skip to content

Commit f464d29

Browse files
mniestrojkartben
mniestroj
authored and
kartben
committed
boards: st: convert to ARDUINO_HEADER_R3_* macro
Use ARDUINO_HEADER_R3_* macros, as those are much more readable and less error prone. Signed-off-by: Marcin Niestroj <[email protected]>
1 parent 9663b17 commit f464d29

File tree

86 files changed

+2033
-1860
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+2033
-1860
lines changed

‎boards/st/b_l4s5i_iot01a/arduino_r3_connector.dtsi‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,36 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7+
#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
8+
79
/ {
810
arduino_header: connector {
911
compatible = "arduino-header-r3";
1012
#gpio-cells = <2>;
1113
gpio-map-mask = <0xffffffff 0xffffffc0>;
1214
gpio-map-pass-thru = <0 0x3f>;
13-
gpio-map = <0 0 &gpioc 5 0>, /* A0 */
14-
<1 0 &gpioc 4 0>, /* A1 */
15-
<2 0 &gpioc 3 0>, /* A2 */
16-
<3 0 &gpioc 2 0>, /* A3 */
17-
<4 0 &gpioc 1 0>, /* A4 */
18-
<5 0 &gpioc 0 0>, /* A5 */
19-
<6 0 &gpioa 1 0>, /* D0 */
20-
<7 0 &gpioa 0 0>, /* D1 */
21-
<8 0 &gpiod 14 0>, /* D2 */
22-
<9 0 &gpiob 0 0>, /* D3 */
23-
<10 0 &gpioa 3 0>, /* D4 */
24-
<11 0 &gpiob 4 0>, /* D5 */
25-
<12 0 &gpiob 1 0>, /* D6 */
26-
<13 0 &gpioa 4 0>, /* D7 */
27-
<14 0 &gpiob 2 0>, /* D8 */
28-
<15 0 &gpioa 15 0>, /* D9 */
29-
<16 0 &gpioa 2 0>, /* D10 */
30-
<17 0 &gpioa 7 0>, /* D11 */
31-
<18 0 &gpioa 6 0>, /* D12 */
32-
<19 0 &gpioa 5 0>, /* D13 */
33-
<20 0 &gpiob 9 0>, /* D14 */
34-
<21 0 &gpiob 8 0>; /* D15 */
15+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpioc 5 0>,
16+
<ARDUINO_HEADER_R3_A1 0 &gpioc 4 0>,
17+
<ARDUINO_HEADER_R3_A2 0 &gpioc 3 0>,
18+
<ARDUINO_HEADER_R3_A3 0 &gpioc 2 0>,
19+
<ARDUINO_HEADER_R3_A4 0 &gpioc 1 0>,
20+
<ARDUINO_HEADER_R3_A5 0 &gpioc 0 0>,
21+
<ARDUINO_HEADER_R3_D0 0 &gpioa 1 0>,
22+
<ARDUINO_HEADER_R3_D1 0 &gpioa 0 0>,
23+
<ARDUINO_HEADER_R3_D2 0 &gpiod 14 0>,
24+
<ARDUINO_HEADER_R3_D3 0 &gpiob 0 0>,
25+
<ARDUINO_HEADER_R3_D4 0 &gpioa 3 0>,
26+
<ARDUINO_HEADER_R3_D5 0 &gpiob 4 0>,
27+
<ARDUINO_HEADER_R3_D6 0 &gpiob 1 0>,
28+
<ARDUINO_HEADER_R3_D7 0 &gpioa 4 0>,
29+
<ARDUINO_HEADER_R3_D8 0 &gpiob 2 0>,
30+
<ARDUINO_HEADER_R3_D9 0 &gpioa 15 0>,
31+
<ARDUINO_HEADER_R3_D10 0 &gpioa 2 0>,
32+
<ARDUINO_HEADER_R3_D11 0 &gpioa 7 0>,
33+
<ARDUINO_HEADER_R3_D12 0 &gpioa 6 0>,
34+
<ARDUINO_HEADER_R3_D13 0 &gpioa 5 0>,
35+
<ARDUINO_HEADER_R3_D14 0 &gpiob 9 0>,
36+
<ARDUINO_HEADER_R3_D15 0 &gpiob 8 0>;
3537
};
3638
};
3739

‎boards/st/b_u585i_iot02a/arduino_r3_connector.dtsi‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,36 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7+
#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
8+
79
/ {
810
arduino_header: connector {
911
compatible = "arduino-header-r3";
1012
#gpio-cells = <2>;
1113
gpio-map-mask = <0xffffffff 0xffffffc0>;
1214
gpio-map-pass-thru = <0 0x3f>;
13-
gpio-map = <0 0 &gpioc 0 0>, /* A0 */
14-
<1 0 &gpioc 2 0>, /* A1 */
15-
<2 0 &gpioc 4 0>, /* A2 */
16-
<3 0 &gpioc 5 0>, /* A3 */
17-
<4 0 &gpioa 7 0>, /* A4 */
18-
<5 0 &gpiob 0 0>, /* A5 */
19-
<6 0 &gpiod 8 0>, /* D0 */
20-
<7 0 &gpiod 9 0>, /* D1 */
21-
<8 0 &gpiod 15 0>, /* D2 */
22-
<9 0 &gpiob 2 0>, /* D3 */
23-
<10 0 &gpioe 7 0>, /* D4 */
24-
<11 0 &gpioe 0 0>, /* D5 */
25-
<12 0 &gpiob 6 0>, /* D6 */
26-
<13 0 &gpiof 13 0>, /* D7 */
27-
<14 0 &gpioc 1 0>, /* D8 */
28-
<15 0 &gpioa 8 0>, /* D9 */
29-
<16 0 &gpioe 12 0>, /* D10 */
30-
<17 0 &gpioe 15 0>, /* D11 */
31-
<18 0 &gpioe 14 0>, /* D12 */
32-
<19 0 &gpioe 13 0>, /* D13 */
33-
<20 0 &gpiob 9 0>, /* D14 */
34-
<21 0 &gpiob 8 0>; /* D15 */
15+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpioc 0 0>,
16+
<ARDUINO_HEADER_R3_A1 0 &gpioc 2 0>,
17+
<ARDUINO_HEADER_R3_A2 0 &gpioc 4 0>,
18+
<ARDUINO_HEADER_R3_A3 0 &gpioc 5 0>,
19+
<ARDUINO_HEADER_R3_A4 0 &gpioa 7 0>,
20+
<ARDUINO_HEADER_R3_A5 0 &gpiob 0 0>,
21+
<ARDUINO_HEADER_R3_D0 0 &gpiod 8 0>,
22+
<ARDUINO_HEADER_R3_D1 0 &gpiod 9 0>,
23+
<ARDUINO_HEADER_R3_D2 0 &gpiod 15 0>,
24+
<ARDUINO_HEADER_R3_D3 0 &gpiob 2 0>,
25+
<ARDUINO_HEADER_R3_D4 0 &gpioe 7 0>,
26+
<ARDUINO_HEADER_R3_D5 0 &gpioe 0 0>,
27+
<ARDUINO_HEADER_R3_D6 0 &gpiob 6 0>,
28+
<ARDUINO_HEADER_R3_D7 0 &gpiof 13 0>,
29+
<ARDUINO_HEADER_R3_D8 0 &gpioc 1 0>,
30+
<ARDUINO_HEADER_R3_D9 0 &gpioa 8 0>,
31+
<ARDUINO_HEADER_R3_D10 0 &gpioe 12 0>,
32+
<ARDUINO_HEADER_R3_D11 0 &gpioe 15 0>,
33+
<ARDUINO_HEADER_R3_D12 0 &gpioe 14 0>,
34+
<ARDUINO_HEADER_R3_D13 0 &gpioe 13 0>,
35+
<ARDUINO_HEADER_R3_D14 0 &gpiob 9 0>,
36+
<ARDUINO_HEADER_R3_D15 0 &gpiob 8 0>;
3537
};
3638
};
3739

‎boards/st/disco_l475_iot1/arduino_r3_connector.dtsi‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,36 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7+
#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
8+
79
/ {
810
arduino_header: connector {
911
compatible = "arduino-header-r3";
1012
#gpio-cells = <2>;
1113
gpio-map-mask = <0xffffffff 0xffffffc0>;
1214
gpio-map-pass-thru = <0 0x3f>;
13-
gpio-map = <0 0 &gpioc 5 0>, /* A0 */
14-
<1 0 &gpioc 4 0>, /* A1 */
15-
<2 0 &gpioc 3 0>, /* A2 */
16-
<3 0 &gpioc 2 0>, /* A3 */
17-
<4 0 &gpioc 1 0>, /* A4 */
18-
<5 0 &gpioc 0 0>, /* A5 */
19-
<6 0 &gpioa 1 0>, /* D0 */
20-
<7 0 &gpioa 0 0>, /* D1 */
21-
<8 0 &gpiod 14 0>, /* D2 */
22-
<9 0 &gpiob 0 0>, /* D3 */
23-
<10 0 &gpioa 3 0>, /* D4 */
24-
<11 0 &gpiob 4 0>, /* D5 */
25-
<12 0 &gpiob 1 0>, /* D6 */
26-
<13 0 &gpioa 4 0>, /* D7 */
27-
<14 0 &gpiob 2 0>, /* D8 */
28-
<15 0 &gpioa 15 0>, /* D9 */
29-
<16 0 &gpioa 2 0>, /* D10 */
30-
<17 0 &gpioa 7 0>, /* D11 */
31-
<18 0 &gpioa 6 0>, /* D12 */
32-
<19 0 &gpioa 5 0>, /* D13 */
33-
<20 0 &gpiob 9 0>, /* D14 */
34-
<21 0 &gpiob 8 0>; /* D15 */
15+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpioc 5 0>,
16+
<ARDUINO_HEADER_R3_A1 0 &gpioc 4 0>,
17+
<ARDUINO_HEADER_R3_A2 0 &gpioc 3 0>,
18+
<ARDUINO_HEADER_R3_A3 0 &gpioc 2 0>,
19+
<ARDUINO_HEADER_R3_A4 0 &gpioc 1 0>,
20+
<ARDUINO_HEADER_R3_A5 0 &gpioc 0 0>,
21+
<ARDUINO_HEADER_R3_D0 0 &gpioa 1 0>,
22+
<ARDUINO_HEADER_R3_D1 0 &gpioa 0 0>,
23+
<ARDUINO_HEADER_R3_D2 0 &gpiod 14 0>,
24+
<ARDUINO_HEADER_R3_D3 0 &gpiob 0 0>,
25+
<ARDUINO_HEADER_R3_D4 0 &gpioa 3 0>,
26+
<ARDUINO_HEADER_R3_D5 0 &gpiob 4 0>,
27+
<ARDUINO_HEADER_R3_D6 0 &gpiob 1 0>,
28+
<ARDUINO_HEADER_R3_D7 0 &gpioa 4 0>,
29+
<ARDUINO_HEADER_R3_D8 0 &gpiob 2 0>,
30+
<ARDUINO_HEADER_R3_D9 0 &gpioa 15 0>,
31+
<ARDUINO_HEADER_R3_D10 0 &gpioa 2 0>,
32+
<ARDUINO_HEADER_R3_D11 0 &gpioa 7 0>,
33+
<ARDUINO_HEADER_R3_D12 0 &gpioa 6 0>,
34+
<ARDUINO_HEADER_R3_D13 0 &gpioa 5 0>,
35+
<ARDUINO_HEADER_R3_D14 0 &gpiob 9 0>,
36+
<ARDUINO_HEADER_R3_D15 0 &gpiob 8 0>;
3537
};
3638
};
3739

‎boards/st/nucleo_c031c6/arduino_r3_connector.dtsi‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,36 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7+
#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
8+
79
/ {
810
arduino_header: connector {
911
compatible = "arduino-header-r3";
1012
#gpio-cells = <2>;
1113
gpio-map-mask = <0xffffffff 0xffffffc0>;
1214
gpio-map-pass-thru = <0 0x3f>;
13-
gpio-map = <0 0 &gpioa 0 0>, /* A0 */
14-
<1 0 &gpioa 1 0>, /* A1 */
15-
<2 0 &gpioa 4 0>, /* A2 */
16-
<3 0 &gpiob 1 0>, /* A3 */
17-
<4 0 &gpioa 11 0>, /* A4 */
18-
<5 0 &gpioa 12 0>, /* A5 */
19-
<6 0 &gpiob 7 0>, /* D0 */
20-
<7 0 &gpiob 6 0>, /* D1 */
21-
<8 0 &gpioa 10 0>, /* D2 */
22-
<9 0 &gpiob 3 0>, /* D3 */
23-
<10 0 &gpiob 10 0>, /* D4 */
24-
<11 0 &gpiob 4 0>, /* D5 */
25-
<12 0 &gpiob 5 0>, /* D6 */
26-
<13 0 &gpioa 15 0>, /* D7 */
27-
<14 0 &gpioa 9 0>, /* D8 */
28-
<15 0 &gpioc 7 0>, /* D9 */
29-
<16 0 &gpiob 0 0>, /* D10 */
30-
<17 0 &gpioa 7 0>, /* D11 */
31-
<18 0 &gpioa 6 0>, /* D12 */
32-
<19 0 &gpioa 5 0>, /* D13 */
33-
<20 0 &gpiob 9 0>, /* D14 */
34-
<21 0 &gpiob 8 0>; /* D15 */
15+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpioa 0 0>,
16+
<ARDUINO_HEADER_R3_A1 0 &gpioa 1 0>,
17+
<ARDUINO_HEADER_R3_A2 0 &gpioa 4 0>,
18+
<ARDUINO_HEADER_R3_A3 0 &gpiob 1 0>,
19+
<ARDUINO_HEADER_R3_A4 0 &gpioa 11 0>,
20+
<ARDUINO_HEADER_R3_A5 0 &gpioa 12 0>,
21+
<ARDUINO_HEADER_R3_D0 0 &gpiob 7 0>,
22+
<ARDUINO_HEADER_R3_D1 0 &gpiob 6 0>,
23+
<ARDUINO_HEADER_R3_D2 0 &gpioa 10 0>,
24+
<ARDUINO_HEADER_R3_D3 0 &gpiob 3 0>,
25+
<ARDUINO_HEADER_R3_D4 0 &gpiob 10 0>,
26+
<ARDUINO_HEADER_R3_D5 0 &gpiob 4 0>,
27+
<ARDUINO_HEADER_R3_D6 0 &gpiob 5 0>,
28+
<ARDUINO_HEADER_R3_D7 0 &gpioa 15 0>,
29+
<ARDUINO_HEADER_R3_D8 0 &gpioa 9 0>,
30+
<ARDUINO_HEADER_R3_D9 0 &gpioc 7 0>,
31+
<ARDUINO_HEADER_R3_D10 0 &gpiob 0 0>,
32+
<ARDUINO_HEADER_R3_D11 0 &gpioa 7 0>,
33+
<ARDUINO_HEADER_R3_D12 0 &gpioa 6 0>,
34+
<ARDUINO_HEADER_R3_D13 0 &gpioa 5 0>,
35+
<ARDUINO_HEADER_R3_D14 0 &gpiob 9 0>,
36+
<ARDUINO_HEADER_R3_D15 0 &gpiob 8 0>;
3537
};
3638
};
3739

‎boards/st/nucleo_c071rb/arduino_r3_connector.dtsi‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,36 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7+
#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
8+
79
/ {
810
arduino_header: connector {
911
compatible = "arduino-header-r3";
1012
#gpio-cells = <2>;
1113
gpio-map-mask = <0xffffffff 0xffffffc0>;
1214
gpio-map-pass-thru = <0 0x3f>;
13-
gpio-map = <0 0 &gpioa 0 0>, /* A0 */
14-
<1 0 &gpioa 1 0>, /* A1 */
15-
<2 0 &gpioa 4 0>, /* A2 */
16-
<3 0 &gpiob 0 0>, /* A3 */
17-
<4 0 &gpioc 4 0>, /* A4 */
18-
<5 0 &gpioc 5 0>, /* A5 */
19-
<6 0 &gpiob 7 0>, /* D0 */
20-
<7 0 &gpiob 6 0>, /* D1 */
21-
<8 0 &gpioa 10 0>, /* D2 */
22-
<9 0 &gpioc 7 0>, /* D3 */
23-
<10 0 &gpiob 5 0>, /* D4 */
24-
<11 0 &gpiob 4 0>, /* D5 */
25-
<12 0 &gpioc 8 0>, /* D6 */
26-
<13 0 &gpioa 8 0>, /* D7 */
27-
<14 0 &gpioa 9 0>, /* D8 */
28-
<15 0 &gpiob 3 0>, /* D9 */
29-
<16 0 &gpioa 15 0>, /* D10 */
30-
<17 0 &gpioa 7 0>, /* D11 */
31-
<18 0 &gpioa 6 0>, /* D12 */
32-
<19 0 &gpioa 5 0>, /* D13 */
33-
<20 0 &gpiob 9 0>, /* D14 */
34-
<21 0 &gpiob 8 0>; /* D15 */
15+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpioa 0 0>,
16+
<ARDUINO_HEADER_R3_A1 0 &gpioa 1 0>,
17+
<ARDUINO_HEADER_R3_A2 0 &gpioa 4 0>,
18+
<ARDUINO_HEADER_R3_A3 0 &gpiob 0 0>,
19+
<ARDUINO_HEADER_R3_A4 0 &gpioc 4 0>,
20+
<ARDUINO_HEADER_R3_A5 0 &gpioc 5 0>,
21+
<ARDUINO_HEADER_R3_D0 0 &gpiob 7 0>,
22+
<ARDUINO_HEADER_R3_D1 0 &gpiob 6 0>,
23+
<ARDUINO_HEADER_R3_D2 0 &gpioa 10 0>,
24+
<ARDUINO_HEADER_R3_D3 0 &gpioc 7 0>,
25+
<ARDUINO_HEADER_R3_D4 0 &gpiob 5 0>,
26+
<ARDUINO_HEADER_R3_D5 0 &gpiob 4 0>,
27+
<ARDUINO_HEADER_R3_D6 0 &gpioc 8 0>,
28+
<ARDUINO_HEADER_R3_D7 0 &gpioa 8 0>,
29+
<ARDUINO_HEADER_R3_D8 0 &gpioa 9 0>,
30+
<ARDUINO_HEADER_R3_D9 0 &gpiob 3 0>,
31+
<ARDUINO_HEADER_R3_D10 0 &gpioa 15 0>,
32+
<ARDUINO_HEADER_R3_D11 0 &gpioa 7 0>,
33+
<ARDUINO_HEADER_R3_D12 0 &gpioa 6 0>,
34+
<ARDUINO_HEADER_R3_D13 0 &gpioa 5 0>,
35+
<ARDUINO_HEADER_R3_D14 0 &gpiob 9 0>,
36+
<ARDUINO_HEADER_R3_D15 0 &gpiob 8 0>;
3537
};
3638
};
3739

‎boards/st/nucleo_c092rc/arduino_r3_connector.dtsi‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,36 @@
55
* SPDX-License-Identifier: Apache-2.0
66
*/
77

8+
#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
9+
810
/ {
911
arduino_header: connector {
1012
compatible = "arduino-header-r3";
1113
#gpio-cells = <2>;
1214
gpio-map-mask = <0xffffffff 0xffffffc0>;
1315
gpio-map-pass-thru = <0 0x3f>;
14-
gpio-map = <0 0 &gpioa 0 0>, /* A0 */
15-
<1 0 &gpioa 1 0>, /* A1 */
16-
<2 0 &gpioa 4 0>, /* A2 */
17-
<3 0 &gpiob 0 0>, /* A3 */
18-
<4 0 &gpioc 4 0>, /* A4 */
19-
<5 0 &gpioc 5 0>, /* A5 */
20-
<6 0 &gpiob 7 0>, /* D0 */
21-
<7 0 &gpiob 6 0>, /* D1 */
22-
<8 0 &gpioa 10 0>, /* D2 */
23-
<9 0 &gpioc 7 0>, /* D3 */
24-
<10 0 &gpiob 5 0>, /* D4 */
25-
<11 0 &gpiob 4 0>, /* D5 */
26-
<12 0 &gpioc 8 0>, /* D6 */
27-
<13 0 &gpioa 8 0>, /* D7 */
28-
<14 0 &gpioa 9 0>, /* D8 */
29-
<15 0 &gpiob 3 0>, /* D9 */
30-
<16 0 &gpioa 15 0>, /* D10 */
31-
<17 0 &gpioa 7 0>, /* D11 */
32-
<18 0 &gpioa 6 0>, /* D12 */
33-
<19 0 &gpioa 5 0>, /* D13 */
34-
<20 0 &gpiob 9 0>, /* D14 */
35-
<21 0 &gpiob 8 0>; /* D15 */
16+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpioa 0 0>,
17+
<ARDUINO_HEADER_R3_A1 0 &gpioa 1 0>,
18+
<ARDUINO_HEADER_R3_A2 0 &gpioa 4 0>,
19+
<ARDUINO_HEADER_R3_A3 0 &gpiob 0 0>,
20+
<ARDUINO_HEADER_R3_A4 0 &gpioc 4 0>,
21+
<ARDUINO_HEADER_R3_A5 0 &gpioc 5 0>,
22+
<ARDUINO_HEADER_R3_D0 0 &gpiob 7 0>,
23+
<ARDUINO_HEADER_R3_D1 0 &gpiob 6 0>,
24+
<ARDUINO_HEADER_R3_D2 0 &gpioa 10 0>,
25+
<ARDUINO_HEADER_R3_D3 0 &gpioc 7 0>,
26+
<ARDUINO_HEADER_R3_D4 0 &gpiob 5 0>,
27+
<ARDUINO_HEADER_R3_D5 0 &gpiob 4 0>,
28+
<ARDUINO_HEADER_R3_D6 0 &gpioc 8 0>,
29+
<ARDUINO_HEADER_R3_D7 0 &gpioa 8 0>,
30+
<ARDUINO_HEADER_R3_D8 0 &gpioa 9 0>,
31+
<ARDUINO_HEADER_R3_D9 0 &gpiob 3 0>,
32+
<ARDUINO_HEADER_R3_D10 0 &gpioa 15 0>,
33+
<ARDUINO_HEADER_R3_D11 0 &gpioa 7 0>,
34+
<ARDUINO_HEADER_R3_D12 0 &gpioa 6 0>,
35+
<ARDUINO_HEADER_R3_D13 0 &gpioa 5 0>,
36+
<ARDUINO_HEADER_R3_D14 0 &gpiob 9 0>,
37+
<ARDUINO_HEADER_R3_D15 0 &gpiob 8 0>;
3638
};
3739
};
3840

0 commit comments

Comments
 (0)