Skip to content

Commit 8f25922

Browse files
mniestrojkartben
mniestroj
authored and
kartben
committed
boards: other: 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 9333d7a commit 8f25922

File tree

17 files changed

+378
-354
lines changed

17 files changed

+378
-354
lines changed

‎boards/actinius/icarus_som_dk/arduino_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: arduino_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 &gpio0 15 0>, /* A0 */
14-
<1 0 &gpio0 16 0>, /* A1 */
15-
<2 0 &gpio0 17 0>, /* A2 */
16-
<3 0 &gpio0 18 0>, /* A3 */
17-
<4 0 &gpio0 19 0>, /* A4 */
18-
<5 0 &gpio0 20 0>, /* A5 */
19-
<6 0 &gpio0 4 0>, /* D0 */
20-
<7 0 &gpio0 5 0>, /* D1 */
21-
<8 0 &gpio0 2 0>, /* D2 */
22-
<9 0 &gpio0 1 0>, /* D3 */
23-
<10 0 &gpio0 23 0>, /* D4 */
24-
<11 0 &gpio0 0 0>, /* D5 */
25-
<12 0 &gpio0 26 0>, /* D6 */
26-
<13 0 &gpio0 27 0>, /* D7 */
27-
<14 0 &gpio0 30 0>, /* D8 */
28-
<15 0 &gpio0 31 0>, /* D9 */
29-
<16 0 &gpio0 7 0>, /* D10 */
30-
<17 0 &gpio0 13 0>, /* D11 */
31-
<18 0 &gpio0 14 0>, /* D12 */
32-
<19 0 &gpio0 3 0>, /* D13 */
33-
<20 0 &gpio0 10 0>, /* SDA */
34-
<21 0 &gpio0 11 0>; /* SCL */
15+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpio0 15 0>,
16+
<ARDUINO_HEADER_R3_A1 0 &gpio0 16 0>,
17+
<ARDUINO_HEADER_R3_A2 0 &gpio0 17 0>,
18+
<ARDUINO_HEADER_R3_A3 0 &gpio0 18 0>,
19+
<ARDUINO_HEADER_R3_A4 0 &gpio0 19 0>,
20+
<ARDUINO_HEADER_R3_A5 0 &gpio0 20 0>,
21+
<ARDUINO_HEADER_R3_D0 0 &gpio0 4 0>,
22+
<ARDUINO_HEADER_R3_D1 0 &gpio0 5 0>,
23+
<ARDUINO_HEADER_R3_D2 0 &gpio0 2 0>,
24+
<ARDUINO_HEADER_R3_D3 0 &gpio0 1 0>,
25+
<ARDUINO_HEADER_R3_D4 0 &gpio0 23 0>,
26+
<ARDUINO_HEADER_R3_D5 0 &gpio0 0 0>,
27+
<ARDUINO_HEADER_R3_D6 0 &gpio0 26 0>,
28+
<ARDUINO_HEADER_R3_D7 0 &gpio0 27 0>,
29+
<ARDUINO_HEADER_R3_D8 0 &gpio0 30 0>,
30+
<ARDUINO_HEADER_R3_D9 0 &gpio0 31 0>,
31+
<ARDUINO_HEADER_R3_D10 0 &gpio0 7 0>,
32+
<ARDUINO_HEADER_R3_D11 0 &gpio0 13 0>,
33+
<ARDUINO_HEADER_R3_D12 0 &gpio0 14 0>,
34+
<ARDUINO_HEADER_R3_D13 0 &gpio0 3 0>,
35+
<ARDUINO_HEADER_R3_D14 0 &gpio0 10 0>,
36+
<ARDUINO_HEADER_R3_D15 0 &gpio0 11 0>;
3537
};
3638

3739
arduino_adc: analog_connector {

‎boards/adi/apard32690/apard32690_max32690_m4.dts‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <adi/max32/max32690.dtsi>
1010
#include <adi/max32/max32690-pinctrl.dtsi>
1111
#include <zephyr/dt-bindings/gpio/adi-max32-gpio.h>
12+
#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
1213
#include <zephyr/dt-bindings/memory-controller/adi-max32-hpb.h>
1314
#include <zephyr/dt-bindings/input/input-event-codes.h>
1415

@@ -60,28 +61,28 @@
6061
#gpio-cells = <2>;
6162
gpio-map-mask = <0xffffffff 0xffffffc0>;
6263
gpio-map-pass-thru = <0 0x3f>;
63-
gpio-map = <0 0 &gpio3 0 0>, /* A0 */
64-
<1 0 &gpio3 1 0>, /* A1 */
65-
<2 0 &gpio3 2 0>, /* A2 */
66-
<3 0 &gpio3 3 0>, /* A3 */
67-
<4 0 &gpio3 4 0>, /* A4 */
68-
<5 0 &gpio3 5 0>, /* A5 */
69-
<6 0 &gpio2 14 0>, /* D0 */
70-
<7 0 &gpio2 16 0>, /* D1 */
71-
<8 0 &gpio2 13 0>, /* D2 */
72-
<9 0 &gpio2 15 0>, /* D3 */
73-
<10 0 &gpio0 8 0>, /* D4 */
74-
<11 0 &gpio0 7 0>, /* D5 */
75-
<12 0 &gpio1 24 0>, /* D6 */
76-
<13 0 &gpio1 25 0>, /* D7 */
77-
<14 0 &gpio1 31 0>, /* D8 */
78-
<15 0 &gpio1 30 0>, /* D9 */
79-
<16 0 &gpio1 23 0>, /* D10 */
80-
<17 0 &gpio1 29 0>, /* D11 */
81-
<18 0 &gpio1 28 0>, /* D12 */
82-
<19 0 &gpio1 26 0>, /* D13 */
83-
<20 0 &gpio2 17 0>, /* D14 */
84-
<21 0 &gpio2 18 0>; /* D15 */
64+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpio3 0 0>,
65+
<ARDUINO_HEADER_R3_A1 0 &gpio3 1 0>,
66+
<ARDUINO_HEADER_R3_A2 0 &gpio3 2 0>,
67+
<ARDUINO_HEADER_R3_A3 0 &gpio3 3 0>,
68+
<ARDUINO_HEADER_R3_A4 0 &gpio3 4 0>,
69+
<ARDUINO_HEADER_R3_A5 0 &gpio3 5 0>,
70+
<ARDUINO_HEADER_R3_D0 0 &gpio2 14 0>,
71+
<ARDUINO_HEADER_R3_D1 0 &gpio2 16 0>,
72+
<ARDUINO_HEADER_R3_D2 0 &gpio2 13 0>,
73+
<ARDUINO_HEADER_R3_D3 0 &gpio2 15 0>,
74+
<ARDUINO_HEADER_R3_D4 0 &gpio0 8 0>,
75+
<ARDUINO_HEADER_R3_D5 0 &gpio0 7 0>,
76+
<ARDUINO_HEADER_R3_D6 0 &gpio1 24 0>,
77+
<ARDUINO_HEADER_R3_D7 0 &gpio1 25 0>,
78+
<ARDUINO_HEADER_R3_D8 0 &gpio1 31 0>,
79+
<ARDUINO_HEADER_R3_D9 0 &gpio1 30 0>,
80+
<ARDUINO_HEADER_R3_D10 0 &gpio1 23 0>,
81+
<ARDUINO_HEADER_R3_D11 0 &gpio1 29 0>,
82+
<ARDUINO_HEADER_R3_D12 0 &gpio1 28 0>,
83+
<ARDUINO_HEADER_R3_D13 0 &gpio1 26 0>,
84+
<ARDUINO_HEADER_R3_D14 0 &gpio2 17 0>,
85+
<ARDUINO_HEADER_R3_D15 0 &gpio2 18 0>;
8586
};
8687

8788
pmod_header: pmod-header {

‎boards/adi/eval_adin1110ebz/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/D14 */
14-
<1 0 &gpioc 1 0>, /* A1/D15 */
15-
<2 0 &gpioc 2 0>, /* A2/D16 */
16-
<3 0 &gpioc 3 0>, /* A3/D17 */
17-
<4 0 &gpioc 4 0>, /* A4/D18 */
18-
<5 0 &gpioc 5 0>, /* A5/D19 */
19-
<6 0 &gpioa 0 0>, /* D0 */
20-
<7 0 &gpioa 1 0>, /* D1 */
21-
<8 0 &gpioa 2 0>, /* D2 */
22-
<9 0 &gpiod 2 0>, /* D3 */
23-
<10 0 &gpiod 6 0>, /* D4 */
24-
<11 0 &gpiob 7 0>, /* D5 */
25-
<12 0 &gpiob 8 0>, /* D6 */
26-
<13 0 &gpiob 9 0>, /* D7 */
27-
<14 0 &gpiob 6 0>, /* D8 */
28-
<15 0 &gpiob 5 0>, /* D9 */
29-
<16 0 &gpiog 12 0>, /* D10 */
30-
<17 0 &gpioc 12 0>, /* D11 */
31-
<18 0 &gpioc 11 0>, /* D12 */
32-
<19 0 &gpioc 10 0>, /* D13 */
33-
<20 0 &gpioc 0 0>, /* D14 */
34-
<21 0 &gpioc 1 0>; /* D15 */
15+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpioc 0 0>,
16+
<ARDUINO_HEADER_R3_A1 0 &gpioc 1 0>,
17+
<ARDUINO_HEADER_R3_A2 0 &gpioc 2 0>,
18+
<ARDUINO_HEADER_R3_A3 0 &gpioc 3 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 &gpioa 0 0>,
22+
<ARDUINO_HEADER_R3_D1 0 &gpioa 1 0>,
23+
<ARDUINO_HEADER_R3_D2 0 &gpioa 2 0>,
24+
<ARDUINO_HEADER_R3_D3 0 &gpiod 2 0>,
25+
<ARDUINO_HEADER_R3_D4 0 &gpiod 6 0>,
26+
<ARDUINO_HEADER_R3_D5 0 &gpiob 7 0>,
27+
<ARDUINO_HEADER_R3_D6 0 &gpiob 8 0>,
28+
<ARDUINO_HEADER_R3_D7 0 &gpiob 9 0>,
29+
<ARDUINO_HEADER_R3_D8 0 &gpiob 6 0>,
30+
<ARDUINO_HEADER_R3_D9 0 &gpiob 5 0>,
31+
<ARDUINO_HEADER_R3_D10 0 &gpiog 12 0>,
32+
<ARDUINO_HEADER_R3_D11 0 &gpioc 12 0>,
33+
<ARDUINO_HEADER_R3_D12 0 &gpioc 11 0>,
34+
<ARDUINO_HEADER_R3_D13 0 &gpioc 10 0>,
35+
<ARDUINO_HEADER_R3_D14 0 &gpioc 0 0>,
36+
<ARDUINO_HEADER_R3_D15 0 &gpioc 1 0>;
3537
};
3638
};
3739

‎boards/adi/sdp_k1/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 2 0>, /* A0 */
14-
<1 0 &gpioa 4 0>, /* A1 */
15-
<2 0 &gpioa 6 0>, /* A2 */
16-
<3 0 &gpioc 1 0>, /* A3 */
17-
<4 0 &gpioc 4 0>, /* A4 */
18-
<5 0 &gpioc 5 0>, /* A5 */
19-
<6 0 &gpioa 1 0>, /* D0 */
20-
<7 0 &gpioa 0 0>, /* D1 */
21-
<8 0 &gpiog 7 0>, /* D2 */
22-
<9 0 &gpiod 12 0>, /* D3 */
23-
<10 0 &gpiog 9 0>, /* D4 */
24-
<11 0 &gpioa 11 0>, /* D5 */
25-
<12 0 &gpioa 10 0>, /* D6 */
26-
<13 0 &gpiog 10 0>, /* D7 */
27-
<14 0 &gpiog 11 0>, /* D8 */
28-
<15 0 &gpiob 15 0>, /* D9 */
29-
<16 0 &gpioa 15 0>, /* D10 */
30-
<17 0 &gpioa 7 0>, /* D11 */
31-
<18 0 &gpiob 4 0>, /* D12 */
32-
<19 0 &gpiob 3 0>, /* D13 */
33-
<20 0 &gpiob 7 0>, /* D14 */
34-
<21 0 &gpiob 8 0>; /* D15 */
15+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpioa 2 0>,
16+
<ARDUINO_HEADER_R3_A1 0 &gpioa 4 0>,
17+
<ARDUINO_HEADER_R3_A2 0 &gpioa 6 0>,
18+
<ARDUINO_HEADER_R3_A3 0 &gpioc 1 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 &gpioa 1 0>,
22+
<ARDUINO_HEADER_R3_D1 0 &gpioa 0 0>,
23+
<ARDUINO_HEADER_R3_D2 0 &gpiog 7 0>,
24+
<ARDUINO_HEADER_R3_D3 0 &gpiod 12 0>,
25+
<ARDUINO_HEADER_R3_D4 0 &gpiog 9 0>,
26+
<ARDUINO_HEADER_R3_D5 0 &gpioa 11 0>,
27+
<ARDUINO_HEADER_R3_D6 0 &gpioa 10 0>,
28+
<ARDUINO_HEADER_R3_D7 0 &gpiog 10 0>,
29+
<ARDUINO_HEADER_R3_D8 0 &gpiog 11 0>,
30+
<ARDUINO_HEADER_R3_D9 0 &gpiob 15 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 &gpiob 4 0>,
34+
<ARDUINO_HEADER_R3_D13 0 &gpiob 3 0>,
35+
<ARDUINO_HEADER_R3_D14 0 &gpiob 7 0>,
36+
<ARDUINO_HEADER_R3_D15 0 &gpiob 8 0>;
3537
};
3638
};
3739

‎boards/arduino/due/arduino_r3_connector.dtsi‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,35 @@
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 &pioa 16 0>, /* A0 */
14-
< 1 0 &pioa 24 0>, /* A1 */
15-
< 2 0 &pioa 23 0>, /* A2 */
16-
< 3 0 &pioa 22 0>, /* A3 */
17-
< 4 0 &pioa 6 0>, /* A4 */
18-
< 5 0 &pioa 4 0>, /* A5 */
19-
< 6 0 &pioa 8 0>, /* D0 */
20-
< 7 0 &pioa 9 0>, /* D1 */
21-
< 8 0 &piob 25 0>, /* D2 */
22-
< 9 0 &pioc 28 0>, /* D3 */
23-
<10 0 &pioa 29 0>, /* D4 */
24-
<11 0 &pioc 25 0>, /* D5 */
25-
<12 0 &pioc 24 0>, /* D6 */
26-
<13 0 &pioc 23 0>, /* D7 */
27-
<14 0 &pioc 22 0>, /* D8 */
28-
<15 0 &pioc 21 0>, /* D9 */
29-
<16 0 &pioa 28 0>, /* D10 */
30-
<17 0 &piod 7 0>, /* D11 */
31-
<18 0 &piod 8 0>, /* D12 */
32-
<19 0 &piob 27 0>, /* D13 */
33-
<20 0 &pioa 17 0>, /* D20 */
34-
<21 0 &pioa 18 0>; /* D21 */
15+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &pioa 16 0>,
16+
<ARDUINO_HEADER_R3_A1 0 &pioa 24 0>,
17+
<ARDUINO_HEADER_R3_A2 0 &pioa 23 0>,
18+
<ARDUINO_HEADER_R3_A3 0 &pioa 22 0>,
19+
<ARDUINO_HEADER_R3_A4 0 &pioa 6 0>,
20+
<ARDUINO_HEADER_R3_A5 0 &pioa 4 0>,
21+
<ARDUINO_HEADER_R3_D0 0 &pioa 8 0>,
22+
<ARDUINO_HEADER_R3_D1 0 &pioa 9 0>,
23+
<ARDUINO_HEADER_R3_D2 0 &piob 25 0>,
24+
<ARDUINO_HEADER_R3_D3 0 &pioc 28 0>,
25+
<ARDUINO_HEADER_R3_D4 0 &pioa 29 0>,
26+
<ARDUINO_HEADER_R3_D5 0 &pioc 25 0>,
27+
<ARDUINO_HEADER_R3_D6 0 &pioc 24 0>,
28+
<ARDUINO_HEADER_R3_D7 0 &pioc 23 0>,
29+
<ARDUINO_HEADER_R3_D8 0 &pioc 22 0>,
30+
<ARDUINO_HEADER_R3_D9 0 &pioc 21 0>,
31+
<ARDUINO_HEADER_R3_D10 0 &pioa 28 0>,
32+
<ARDUINO_HEADER_R3_D11 0 &piod 7 0>,
33+
<ARDUINO_HEADER_R3_D12 0 &piod 8 0>,
34+
<ARDUINO_HEADER_R3_D13 0 &piob 27 0>,
35+
<ARDUINO_HEADER_R3_D14 0 &pioa 17 0>,
36+
<ARDUINO_HEADER_R3_D15 0 &pioa 18 0>;
3537
};
3638
};

‎boards/arduino/giga_r1/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 4 0>, /* A0 */
14-
< 1 0 &gpioc 5 0>, /* A1 */
15-
< 2 0 &gpiob 0 0>, /* A2 */
16-
< 3 0 &gpiob 1 0>, /* A3 */
17-
< 4 0 &gpioc 3 0>, /* A4 */
18-
< 5 0 &gpioc 2 0>, /* A5 */
19-
< 6 0 &gpiob 7 0>, /* D0 */
20-
< 7 0 &gpioa 9 0>, /* D1 */
21-
< 8 0 &gpioa 3 0>, /* D2 */
22-
< 9 0 &gpioa 2 0>, /* D3 */
23-
<10 0 &gpioj 8 0>, /* D4 */
24-
<11 0 &gpioa 7 0>, /* D5 */
25-
<12 0 &gpiod 13 0>, /* D6 */
26-
<13 0 &gpiob 4 0>, /* D7 */
27-
<14 0 &gpiob 8 0>, /* D8 */
28-
<15 0 &gpiob 9 0>, /* D9 */
29-
<16 0 &gpiok 1 0>, /* D10 */
30-
<17 0 &gpioj 10 0>, /* D11 */
31-
<18 0 &gpioj 11 0>, /* D12 */
32-
<19 0 &gpioh 6 0>, /* D13 */
33-
<20 0 &gpioh 12 0>, /* D14 */
34-
<21 0 &gpiob 6 0>; /* D15 */
15+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpioc 4 0>,
16+
<ARDUINO_HEADER_R3_A1 0 &gpioc 5 0>,
17+
<ARDUINO_HEADER_R3_A2 0 &gpiob 0 0>,
18+
<ARDUINO_HEADER_R3_A3 0 &gpiob 1 0>,
19+
<ARDUINO_HEADER_R3_A4 0 &gpioc 3 0>,
20+
<ARDUINO_HEADER_R3_A5 0 &gpioc 2 0>,
21+
<ARDUINO_HEADER_R3_D0 0 &gpiob 7 0>,
22+
<ARDUINO_HEADER_R3_D1 0 &gpioa 9 0>,
23+
<ARDUINO_HEADER_R3_D2 0 &gpioa 3 0>,
24+
<ARDUINO_HEADER_R3_D3 0 &gpioa 2 0>,
25+
<ARDUINO_HEADER_R3_D4 0 &gpioj 8 0>,
26+
<ARDUINO_HEADER_R3_D5 0 &gpioa 7 0>,
27+
<ARDUINO_HEADER_R3_D6 0 &gpiod 13 0>,
28+
<ARDUINO_HEADER_R3_D7 0 &gpiob 4 0>,
29+
<ARDUINO_HEADER_R3_D8 0 &gpiob 8 0>,
30+
<ARDUINO_HEADER_R3_D9 0 &gpiob 9 0>,
31+
<ARDUINO_HEADER_R3_D10 0 &gpiok 1 0>,
32+
<ARDUINO_HEADER_R3_D11 0 &gpioj 10 0>,
33+
<ARDUINO_HEADER_R3_D12 0 &gpioj 11 0>,
34+
<ARDUINO_HEADER_R3_D13 0 &gpioh 6 0>,
35+
<ARDUINO_HEADER_R3_D14 0 &gpioh 12 0>,
36+
<ARDUINO_HEADER_R3_D15 0 &gpiob 6 0>;
3537
};
3638
};
3739

0 commit comments

Comments
 (0)