Skip to content

Commit 9333d7a

Browse files
mniestrojkartben
mniestroj
authored and
kartben
committed
boards: panasonic: 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 68d76ce commit 9333d7a

File tree

5 files changed

+115
-110
lines changed

5 files changed

+115
-110
lines changed

‎boards/panasonic/pan1770_evb/pan1770_evb.dts‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/dts-v1/;
99
#include <nordic/nrf52840_qiaa.dtsi>
1010
#include "pan1770_evb-pinctrl.dtsi"
11+
#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
1112
#include <zephyr/dt-bindings/input/input-event-codes.h>
1213

1314
/ {
@@ -82,28 +83,28 @@
8283
#gpio-cells = <2>;
8384
gpio-map-mask = <0xffffffff 0xffffffc0>;
8485
gpio-map-pass-thru = <0 0x3f>;
85-
gpio-map = <0 0 &gpio0 3 0>, /* A0 */
86-
<1 0 &gpio0 4 0>, /* A1 */
87-
<2 0 &gpio0 28 0>, /* A2 */
88-
<3 0 &gpio0 29 0>, /* A3 */
89-
<4 0 &gpio0 30 0>, /* A4 */
90-
<5 0 &gpio0 31 0>, /* A5 */
91-
<6 0 &gpio1 1 0>, /* D0 */
92-
<7 0 &gpio1 2 0>, /* D1 */
93-
<8 0 &gpio1 3 0>, /* D2 */
94-
<9 0 &gpio1 4 0>, /* D3 */
95-
<10 0 &gpio1 5 0>, /* D4 */
96-
<11 0 &gpio1 6 0>, /* D5 */
97-
<12 0 &gpio1 7 0>, /* D6 */
98-
<13 0 &gpio1 8 0>, /* D7 */
99-
<14 0 &gpio1 10 0>, /* D8 */
100-
<15 0 &gpio1 11 0>, /* D9 */
101-
<16 0 &gpio0 12 0>, /* D10 */
102-
<17 0 &gpio0 13 0>, /* D11 */
103-
<18 0 &gpio0 14 0>, /* D12 */
104-
<19 0 &gpio0 15 0>, /* D13 */
105-
<20 0 &gpio0 26 0>, /* D14 */
106-
<21 0 &gpio0 27 0>; /* D15 */
86+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpio0 3 0>,
87+
<ARDUINO_HEADER_R3_A1 0 &gpio0 4 0>,
88+
<ARDUINO_HEADER_R3_A2 0 &gpio0 28 0>,
89+
<ARDUINO_HEADER_R3_A3 0 &gpio0 29 0>,
90+
<ARDUINO_HEADER_R3_A4 0 &gpio0 30 0>,
91+
<ARDUINO_HEADER_R3_A5 0 &gpio0 31 0>,
92+
<ARDUINO_HEADER_R3_D0 0 &gpio1 1 0>,
93+
<ARDUINO_HEADER_R3_D1 0 &gpio1 2 0>,
94+
<ARDUINO_HEADER_R3_D2 0 &gpio1 3 0>,
95+
<ARDUINO_HEADER_R3_D3 0 &gpio1 4 0>,
96+
<ARDUINO_HEADER_R3_D4 0 &gpio1 5 0>,
97+
<ARDUINO_HEADER_R3_D5 0 &gpio1 6 0>,
98+
<ARDUINO_HEADER_R3_D6 0 &gpio1 7 0>,
99+
<ARDUINO_HEADER_R3_D7 0 &gpio1 8 0>,
100+
<ARDUINO_HEADER_R3_D8 0 &gpio1 10 0>,
101+
<ARDUINO_HEADER_R3_D9 0 &gpio1 11 0>,
102+
<ARDUINO_HEADER_R3_D10 0 &gpio0 12 0>,
103+
<ARDUINO_HEADER_R3_D11 0 &gpio0 13 0>,
104+
<ARDUINO_HEADER_R3_D12 0 &gpio0 14 0>,
105+
<ARDUINO_HEADER_R3_D13 0 &gpio0 15 0>,
106+
<ARDUINO_HEADER_R3_D14 0 &gpio0 26 0>,
107+
<ARDUINO_HEADER_R3_D15 0 &gpio0 27 0>;
107108
};
108109

109110
arduino_adc: analog-connector {

‎boards/panasonic/pan1780_evb/pan1780_evb.dts‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/dts-v1/;
99
#include <nordic/nrf52840_qiaa.dtsi>
1010
#include "pan1780_evb-pinctrl.dtsi"
11+
#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
1112
#include <zephyr/dt-bindings/input/input-event-codes.h>
1213

1314
/ {
@@ -82,28 +83,28 @@
8283
#gpio-cells = <2>;
8384
gpio-map-mask = <0xffffffff 0xffffffc0>;
8485
gpio-map-pass-thru = <0 0x3f>;
85-
gpio-map = <0 0 &gpio0 3 0>, /* A0 */
86-
<1 0 &gpio0 4 0>, /* A1 */
87-
<2 0 &gpio0 28 0>, /* A2 */
88-
<3 0 &gpio0 29 0>, /* A3 */
89-
<4 0 &gpio0 30 0>, /* A4 */
90-
<5 0 &gpio0 31 0>, /* A5 */
91-
<6 0 &gpio1 1 0>, /* D0 */
92-
<7 0 &gpio1 2 0>, /* D1 */
93-
<8 0 &gpio1 3 0>, /* D2 */
94-
<9 0 &gpio1 4 0>, /* D3 */
95-
<10 0 &gpio1 5 0>, /* D4 */
96-
<11 0 &gpio1 6 0>, /* D5 */
97-
<12 0 &gpio1 7 0>, /* D6 */
98-
<13 0 &gpio1 8 0>, /* D7 */
99-
<14 0 &gpio1 10 0>, /* D8 */
100-
<15 0 &gpio1 11 0>, /* D9 */
101-
<16 0 &gpio0 12 0>, /* D10 */
102-
<17 0 &gpio0 13 0>, /* D11 */
103-
<18 0 &gpio0 14 0>, /* D12 */
104-
<19 0 &gpio0 15 0>, /* D13 */
105-
<20 0 &gpio0 26 0>, /* D14 */
106-
<21 0 &gpio0 27 0>; /* D15 */
86+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpio0 3 0>,
87+
<ARDUINO_HEADER_R3_A1 0 &gpio0 4 0>,
88+
<ARDUINO_HEADER_R3_A2 0 &gpio0 28 0>,
89+
<ARDUINO_HEADER_R3_A3 0 &gpio0 29 0>,
90+
<ARDUINO_HEADER_R3_A4 0 &gpio0 30 0>,
91+
<ARDUINO_HEADER_R3_A5 0 &gpio0 31 0>,
92+
<ARDUINO_HEADER_R3_D0 0 &gpio1 1 0>,
93+
<ARDUINO_HEADER_R3_D1 0 &gpio1 2 0>,
94+
<ARDUINO_HEADER_R3_D2 0 &gpio1 3 0>,
95+
<ARDUINO_HEADER_R3_D3 0 &gpio1 4 0>,
96+
<ARDUINO_HEADER_R3_D4 0 &gpio1 5 0>,
97+
<ARDUINO_HEADER_R3_D5 0 &gpio1 6 0>,
98+
<ARDUINO_HEADER_R3_D6 0 &gpio1 7 0>,
99+
<ARDUINO_HEADER_R3_D7 0 &gpio1 8 0>,
100+
<ARDUINO_HEADER_R3_D8 0 &gpio1 10 0>,
101+
<ARDUINO_HEADER_R3_D9 0 &gpio1 11 0>,
102+
<ARDUINO_HEADER_R3_D10 0 &gpio0 12 0>,
103+
<ARDUINO_HEADER_R3_D11 0 &gpio0 13 0>,
104+
<ARDUINO_HEADER_R3_D12 0 &gpio0 14 0>,
105+
<ARDUINO_HEADER_R3_D13 0 &gpio0 15 0>,
106+
<ARDUINO_HEADER_R3_D14 0 &gpio0 26 0>,
107+
<ARDUINO_HEADER_R3_D15 0 &gpio0 27 0>;
107108
};
108109

109110
arduino_adc: analog-connector {

‎boards/panasonic/pan1783/pan1783_nrf5340_cpuapp_common.dtsi‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66
#include "pan1783_nrf5340_cpuapp_common-pinctrl.dtsi"
7+
#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
78
#include <zephyr/dt-bindings/input/input-event-codes.h>
89

910
/ {
@@ -98,28 +99,28 @@
9899
#gpio-cells = <2>;
99100
gpio-map-mask = <0xffffffff 0xffffffc0>;
100101
gpio-map-pass-thru = <0 0x3f>;
101-
gpio-map = <0 0 &gpio0 4 0>, /* A0 */
102-
<1 0 &gpio0 5 0>, /* A1 */
103-
<2 0 &gpio0 6 0>, /* A2 */
104-
<3 0 &gpio0 7 0>, /* A3 */
105-
<4 0 &gpio0 25 0>, /* A4 */
106-
<5 0 &gpio0 26 0>, /* A5 */
107-
<6 0 &gpio1 0 0>, /* D0 */
108-
<7 0 &gpio1 1 0>, /* D1 */
109-
<8 0 &gpio1 4 0>, /* D2 */
110-
<9 0 &gpio1 5 0>, /* D3 */
111-
<10 0 &gpio1 6 0>, /* D4 */
112-
<11 0 &gpio1 7 0>, /* D5 */
113-
<12 0 &gpio1 8 0>, /* D6 */
114-
<13 0 &gpio1 9 0>, /* D7 */
115-
<14 0 &gpio1 10 0>, /* D8 */
116-
<15 0 &gpio1 11 0>, /* D9 */
117-
<16 0 &gpio1 12 0>, /* D10 */
118-
<17 0 &gpio1 13 0>, /* D11 */
119-
<18 0 &gpio1 14 0>, /* D12 */
120-
<19 0 &gpio1 15 0>, /* D13 */
121-
<20 0 &gpio1 2 0>, /* D14 */
122-
<21 0 &gpio1 3 0>; /* D15 */
102+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpio0 4 0>,
103+
<ARDUINO_HEADER_R3_A1 0 &gpio0 5 0>,
104+
<ARDUINO_HEADER_R3_A2 0 &gpio0 6 0>,
105+
<ARDUINO_HEADER_R3_A3 0 &gpio0 7 0>,
106+
<ARDUINO_HEADER_R3_A4 0 &gpio0 25 0>,
107+
<ARDUINO_HEADER_R3_A5 0 &gpio0 26 0>,
108+
<ARDUINO_HEADER_R3_D0 0 &gpio1 0 0>,
109+
<ARDUINO_HEADER_R3_D1 0 &gpio1 1 0>,
110+
<ARDUINO_HEADER_R3_D2 0 &gpio1 4 0>,
111+
<ARDUINO_HEADER_R3_D3 0 &gpio1 5 0>,
112+
<ARDUINO_HEADER_R3_D4 0 &gpio1 6 0>,
113+
<ARDUINO_HEADER_R3_D5 0 &gpio1 7 0>,
114+
<ARDUINO_HEADER_R3_D6 0 &gpio1 8 0>,
115+
<ARDUINO_HEADER_R3_D7 0 &gpio1 9 0>,
116+
<ARDUINO_HEADER_R3_D8 0 &gpio1 10 0>,
117+
<ARDUINO_HEADER_R3_D9 0 &gpio1 11 0>,
118+
<ARDUINO_HEADER_R3_D10 0 &gpio1 12 0>,
119+
<ARDUINO_HEADER_R3_D11 0 &gpio1 13 0>,
120+
<ARDUINO_HEADER_R3_D12 0 &gpio1 14 0>,
121+
<ARDUINO_HEADER_R3_D13 0 &gpio1 15 0>,
122+
<ARDUINO_HEADER_R3_D14 0 &gpio1 2 0>,
123+
<ARDUINO_HEADER_R3_D15 0 &gpio1 3 0>;
123124
};
124125

125126
arduino_adc: analog-connector {

‎boards/panasonic/pan1783/pan1783_nrf5340_cpunet_common.dtsi‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66
#include "pan1783_nrf5340_cpunet-pinctrl.dtsi"
7+
#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
78
#include <zephyr/dt-bindings/input/input-event-codes.h>
89

910
/ {
@@ -91,28 +92,28 @@
9192
#gpio-cells = <2>;
9293
gpio-map-mask = <0xffffffff 0xffffffc0>;
9394
gpio-map-pass-thru = <0 0x3f>;
94-
gpio-map = <0 0 &gpio0 4 0>, /* A0 */
95-
<1 0 &gpio0 5 0>, /* A1 */
96-
<2 0 &gpio0 6 0>, /* A2 */
97-
<3 0 &gpio0 7 0>, /* A3 */
98-
<4 0 &gpio0 25 0>, /* A4 */
99-
<5 0 &gpio0 26 0>, /* A5 */
100-
<6 0 &gpio1 0 0>, /* D0 */
101-
<7 0 &gpio1 1 0>, /* D1 */
102-
<8 0 &gpio1 4 0>, /* D2 */
103-
<9 0 &gpio1 5 0>, /* D3 */
104-
<10 0 &gpio1 6 0>, /* D4 */
105-
<11 0 &gpio1 7 0>, /* D5 */
106-
<12 0 &gpio1 8 0>, /* D6 */
107-
<13 0 &gpio1 9 0>, /* D7 */
108-
<14 0 &gpio1 10 0>, /* D8 */
109-
<15 0 &gpio1 11 0>, /* D9 */
110-
<16 0 &gpio1 12 0>, /* D10 */
111-
<17 0 &gpio1 13 0>, /* D11 */
112-
<18 0 &gpio1 14 0>, /* D12 */
113-
<19 0 &gpio1 15 0>, /* D13 */
114-
<20 0 &gpio1 2 0>, /* D14 */
115-
<21 0 &gpio1 3 0>; /* D15 */
95+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpio0 4 0>,
96+
<ARDUINO_HEADER_R3_A1 0 &gpio0 5 0>,
97+
<ARDUINO_HEADER_R3_A2 0 &gpio0 6 0>,
98+
<ARDUINO_HEADER_R3_A3 0 &gpio0 7 0>,
99+
<ARDUINO_HEADER_R3_A4 0 &gpio0 25 0>,
100+
<ARDUINO_HEADER_R3_A5 0 &gpio0 26 0>,
101+
<ARDUINO_HEADER_R3_D0 0 &gpio1 0 0>,
102+
<ARDUINO_HEADER_R3_D1 0 &gpio1 1 0>,
103+
<ARDUINO_HEADER_R3_D2 0 &gpio1 4 0>,
104+
<ARDUINO_HEADER_R3_D3 0 &gpio1 5 0>,
105+
<ARDUINO_HEADER_R3_D4 0 &gpio1 6 0>,
106+
<ARDUINO_HEADER_R3_D5 0 &gpio1 7 0>,
107+
<ARDUINO_HEADER_R3_D6 0 &gpio1 8 0>,
108+
<ARDUINO_HEADER_R3_D7 0 &gpio1 9 0>,
109+
<ARDUINO_HEADER_R3_D8 0 &gpio1 10 0>,
110+
<ARDUINO_HEADER_R3_D9 0 &gpio1 11 0>,
111+
<ARDUINO_HEADER_R3_D10 0 &gpio1 12 0>,
112+
<ARDUINO_HEADER_R3_D11 0 &gpio1 13 0>,
113+
<ARDUINO_HEADER_R3_D12 0 &gpio1 14 0>,
114+
<ARDUINO_HEADER_R3_D13 0 &gpio1 15 0>,
115+
<ARDUINO_HEADER_R3_D14 0 &gpio1 2 0>,
116+
<ARDUINO_HEADER_R3_D15 0 &gpio1 3 0>;
116117
};
117118

118119
/* These aliases are provided for compatibility with samples */

‎boards/panasonic/panb611evb/panb611evb_nrf54l15_common.dtsi‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
#include "panb611evb_nrf54l15-pinctrl.dtsi"
8+
#include <zephyr/dt-bindings/gpio/arduino-header-r3.h>
89

910
/ {
1011
leds {
@@ -101,28 +102,28 @@
101102
#gpio-cells = <2>;
102103
gpio-map-mask = <0xffffffff 0xffffffc0>;
103104
gpio-map-pass-thru = <0 0x3f>;
104-
gpio-map = <0 0 &gpio1 6 0>, /* A0 */
105-
<1 0 &gpio1 7 0>, /* A1 */
106-
<2 0 &gpio1 11 0>, /* A2 */
107-
<3 0 &gpio1 12 0>, /* A3 */
108-
<4 0 &gpio1 13 0>, /* A4 */
109-
<5 0 &gpio1 14 0>, /* A5 */
110-
<6 0 &gpio1 4 0>, /* D0 */
111-
<7 0 &gpio1 5 0>, /* D1 */
112-
<8 0 &gpio0 0 0>, /* D2 */
113-
<9 0 &gpio1 2 0>, /* D3 */
114-
<10 0 &gpio1 3 0>, /* D4 */
115-
<11 0 &gpio1 10 0>, /* D5 */
116-
<12 0 &gpio1 13 0>, /* D6 */
117-
<13 0 &gpio1 14 0>, /* D7 */
118-
<14 0 &gpio1 15 0>, /* D8 */
119-
<15 0 &gpio2 7 0>, /* D9 */
120-
<16 0 &gpio2 10 0>, /* D10 */
121-
<17 0 &gpio2 8 0>, /* D11 */
122-
<18 0 &gpio2 9 0>, /* D12 */
123-
<19 0 &gpio2 6 0>, /* D13 */
124-
<20 0 &gpio1 9 0>, /* D14 */
125-
<21 0 &gpio1 8 0>; /* D15 */
105+
gpio-map = <ARDUINO_HEADER_R3_A0 0 &gpio1 6 0>,
106+
<ARDUINO_HEADER_R3_A1 0 &gpio1 7 0>,
107+
<ARDUINO_HEADER_R3_A2 0 &gpio1 11 0>,
108+
<ARDUINO_HEADER_R3_A3 0 &gpio1 12 0>,
109+
<ARDUINO_HEADER_R3_A4 0 &gpio1 13 0>,
110+
<ARDUINO_HEADER_R3_A5 0 &gpio1 14 0>,
111+
<ARDUINO_HEADER_R3_D0 0 &gpio1 4 0>,
112+
<ARDUINO_HEADER_R3_D1 0 &gpio1 5 0>,
113+
<ARDUINO_HEADER_R3_D2 0 &gpio0 0 0>,
114+
<ARDUINO_HEADER_R3_D3 0 &gpio1 2 0>,
115+
<ARDUINO_HEADER_R3_D4 0 &gpio1 3 0>,
116+
<ARDUINO_HEADER_R3_D5 0 &gpio1 10 0>,
117+
<ARDUINO_HEADER_R3_D6 0 &gpio1 13 0>,
118+
<ARDUINO_HEADER_R3_D7 0 &gpio1 14 0>,
119+
<ARDUINO_HEADER_R3_D8 0 &gpio1 15 0>,
120+
<ARDUINO_HEADER_R3_D9 0 &gpio2 7 0>,
121+
<ARDUINO_HEADER_R3_D10 0 &gpio2 10 0>,
122+
<ARDUINO_HEADER_R3_D11 0 &gpio2 8 0>,
123+
<ARDUINO_HEADER_R3_D12 0 &gpio2 9 0>,
124+
<ARDUINO_HEADER_R3_D13 0 &gpio2 6 0>,
125+
<ARDUINO_HEADER_R3_D14 0 &gpio1 9 0>,
126+
<ARDUINO_HEADER_R3_D15 0 &gpio1 8 0>;
126127
};
127128

128129
arduino_adc: analog-connector {

0 commit comments

Comments
 (0)