Skip to content

Commit f4567c4

Browse files
nordicjmnordicjm
committed
boards: nordic: Fix devicetree styling issues
Fixes issues to make files compliant with the Zephyr devicetree guidelines Signed-off-by: Jamie McCrae <[email protected]>
1 parent 58d473f commit f4567c4

File tree

66 files changed

+343
-53
lines changed

Some content is hidden

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

66 files changed

+343
-53
lines changed

‎boards/nordic/nrf21540dk/nrf21540dk_nrf52840-pinctrl.dtsi

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
psels = <NRF_PSEL(UART_TX, 0, 6)>,
1010
<NRF_PSEL(UART_RTS, 0, 5)>;
1111
};
12+
1213
group2 {
1314
psels = <NRF_PSEL(UART_RX, 0, 8)>,
1415
<NRF_PSEL(UART_CTS, 0, 7)>;
@@ -31,6 +32,7 @@
3132
psels = <NRF_PSEL(UART_RX, 1, 1)>;
3233
bias-pull-up;
3334
};
35+
3436
group2 {
3537
psels = <NRF_PSEL(UART_TX, 1, 2)>;
3638
};
@@ -155,5 +157,4 @@
155157
low-power-enable;
156158
};
157159
};
158-
159160
};

‎boards/nordic/nrf21540dk/nrf21540dk_nrf52840.dts

+12-2
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,22 @@
2828

2929
leds {
3030
compatible = "gpio-leds";
31+
3132
led0: led_0 {
3233
gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
3334
label = "Green LED 0";
3435
};
36+
3537
led1: led_1 {
3638
gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
3739
label = "Green LED 1";
3840
};
41+
3942
led2: led_2 {
4043
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
4144
label = "Green LED 2";
4245
};
46+
4347
led3: led_3 {
4448
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
4549
label = "Green LED 3";
@@ -48,28 +52,33 @@
4852

4953
pwmleds {
5054
compatible = "pwm-leds";
55+
5156
pwm_led0: pwm_led_0 {
5257
pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
5358
};
5459
};
5560

5661
buttons {
5762
compatible = "gpio-keys";
63+
5864
button0: button_0 {
5965
gpios = <&gpio0 11 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
6066
label = "Push button switch 0";
6167
zephyr,code = <INPUT_KEY_0>;
6268
};
69+
6370
button1: button_1 {
6471
gpios = <&gpio0 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
6572
label = "Push button switch 1";
6673
zephyr,code = <INPUT_KEY_1>;
6774
};
75+
6876
button2: button_2 {
6977
gpios = <&gpio0 24 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
7078
label = "Push button switch 2";
7179
zephyr,code = <INPUT_KEY_2>;
7280
};
81+
7382
button3: button_3 {
7483
gpios = <&gpio0 25 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
7584
label = "Push button switch 3";
@@ -238,10 +247,10 @@ arduino_i2c: &i2c0 {
238247
fem_spi: &spi3 {
239248
status = "okay";
240249
cs-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
241-
242250
pinctrl-0 = <&spi3_default>;
243251
pinctrl-1 = <&spi3_sleep>;
244252
pinctrl-names = "default", "sleep";
253+
245254
nrf_radio_fem_spi: nrf21540_fem_spi@0 {
246255
compatible = "nordic,nrf21540-fem-spi";
247256
status = "okay";
@@ -259,7 +268,6 @@ fem_spi: &spi3 {
259268
};
260269

261270
&flash0 {
262-
263271
partitions {
264272
compatible = "fixed-partitions";
265273
#address-cells = <1>;
@@ -269,10 +277,12 @@ fem_spi: &spi3 {
269277
label = "mcuboot";
270278
reg = <0x00000000 0x0000C000>;
271279
};
280+
272281
slot0_partition: partition@c000 {
273282
label = "image-0";
274283
reg = <0x0000C000 0x00076000>;
275284
};
285+
276286
slot1_partition: partition@82000 {
277287
label = "image-1";
278288
reg = <0x00082000 0x00076000>;

‎boards/nordic/nrf51dk/nrf51dk_nrf51822-pinctrl.dtsi

-1
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,4 @@
8686
low-power-enable;
8787
};
8888
};
89-
9089
};

‎boards/nordic/nrf51dk/nrf51dk_nrf51822.dts

+12-1
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,22 @@
2626

2727
leds {
2828
compatible = "gpio-leds";
29+
2930
led0: led_0 {
3031
gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
3132
label = "Green LED 0";
3233
};
34+
3335
led1: led_1 {
3436
gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
3537
label = "Green LED 1";
3638
};
39+
3740
led2: led_2 {
3841
gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
3942
label = "Green LED 2";
4043
};
44+
4145
led3: led_3 {
4246
gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
4347
label = "Green LED 3";
@@ -46,28 +50,33 @@
4650

4751
pwmleds {
4852
compatible = "pwm-leds";
53+
4954
pwm_led0: pwm_led_0 {
5055
pwms = <&sw_pwm 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
5156
};
5257
};
5358

5459
buttons {
5560
compatible = "gpio-keys";
61+
5662
button0: button_0 {
5763
gpios = <&gpio0 17 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
5864
label = "Push button switch 0";
5965
zephyr,code = <INPUT_KEY_0>;
6066
};
67+
6168
button1: button_1 {
6269
gpios = <&gpio0 18 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
6370
label = "Push button switch 1";
6471
zephyr,code = <INPUT_KEY_1>;
6572
};
73+
6674
button2: button_2 {
6775
gpios = <&gpio0 19 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
6876
label = "Push button switch 2";
6977
zephyr,code = <INPUT_KEY_2>;
7078
};
79+
7180
button3: button_3 {
7281
gpios = <&gpio0 20 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
7382
label = "Push button switch 3";
@@ -151,7 +160,6 @@
151160
};
152161

153162
&flash0 {
154-
155163
partitions {
156164
compatible = "fixed-partitions";
157165
#address-cells = <1>;
@@ -161,14 +169,17 @@
161169
label = "mcuboot";
162170
reg = <0x00000000 0x8000>;
163171
};
172+
164173
slot0_partition: partition@8000 {
165174
label = "image-0";
166175
reg = <0x00008000 0x1b000>;
167176
};
177+
168178
slot1_partition: partition@23000 {
169179
label = "image-1";
170180
reg = <0x00023000 0x1b000>;
171181
};
182+
172183
storage_partition: partition@3e000 {
173184
label = "storage";
174185
reg = <0x0003e000 0x00002000>;

‎boards/nordic/nrf51dongle/nrf51dongle_nrf51822-pinctrl.dtsi

-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@
2222
low-power-enable;
2323
};
2424
};
25-
2625
};

‎boards/nordic/nrf51dongle/nrf51dongle_nrf51822.dts

+7-1
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,17 @@
2525

2626
leds {
2727
compatible = "gpio-leds";
28+
2829
led0_red: led_0 {
2930
gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
3031
label = "Red LED 0";
3132
};
33+
3234
led0_green: led_1 {
3335
gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
3436
label = "Green LED 0";
3537
};
38+
3639
led0_blue: led_2 {
3740
gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
3841
label = "Blue LED 0";
@@ -41,6 +44,7 @@
4144

4245
pwmleds {
4346
compatible = "pwm-leds";
47+
4448
pwm_led0: pwm_led_0 {
4549
pwms = <&sw_pwm 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
4650
};
@@ -83,7 +87,6 @@
8387
};
8488

8589
&flash0 {
86-
8790
partitions {
8891
compatible = "fixed-partitions";
8992
#address-cells = <1>;
@@ -93,14 +96,17 @@
9396
label = "mcuboot";
9497
reg = <0x00000000 0x8000>;
9598
};
99+
96100
slot0_partition: partition@8000 {
97101
label = "image-0";
98102
reg = <0x00008000 0x1b000>;
99103
};
104+
100105
slot1_partition: partition@23000 {
101106
label = "image-1";
102107
reg = <0x00023000 0x1b000>;
103108
};
109+
104110
storage_partition: partition@3e000 {
105111
label = "storage";
106112
reg = <0x0003e000 0x00002000>;

‎boards/nordic/nrf52833dk/nrf52833dk_nrf52820-pinctrl.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
psels = <NRF_PSEL(UART_TX, 0, 6)>,
1010
<NRF_PSEL(UART_RTS, 0, 5)>;
1111
};
12+
1213
group2 {
1314
psels = <NRF_PSEL(UART_RX, 0, 8)>,
1415
<NRF_PSEL(UART_CTS, 0, 7)>;
@@ -57,5 +58,4 @@
5758
low-power-enable;
5859
};
5960
};
60-
6161
};

‎boards/nordic/nrf52833dk/nrf52833dk_nrf52820.dts

+12-1
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,22 @@
2626

2727
leds {
2828
compatible = "gpio-leds";
29+
2930
led0: led_0 {
3031
gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
3132
label = "Green LED 0";
3233
};
34+
3335
led1: led_1 {
3436
gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
3537
label = "Green LED 1";
3638
};
39+
3740
led2: led_2 {
3841
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
3942
label = "Green LED 2";
4043
};
44+
4145
led3: led_3 {
4246
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
4347
label = "Green LED 3";
@@ -46,28 +50,33 @@
4650

4751
pwmleds {
4852
compatible = "pwm-leds";
53+
4954
pwm_led0: pwm_led_0 {
5055
pwms = <&sw_pwm 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>;
5156
};
5257
};
5358

5459
buttons {
5560
compatible = "gpio-keys";
61+
5662
button0: button_0 {
5763
gpios = <&gpio0 11 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
5864
label = "Push button switch 0";
5965
zephyr,code = <INPUT_KEY_0>;
6066
};
67+
6168
button1: button_1 {
6269
gpios = <&gpio0 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
6370
label = "Push button switch 1";
6471
zephyr,code = <INPUT_KEY_1>;
6572
};
73+
6674
button2: button_2 {
6775
gpios = <&gpio0 24 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
6876
label = "Push button switch 2";
6977
zephyr,code = <INPUT_KEY_2>;
7078
};
79+
7180
button3: button_3 {
7281
gpios = <&gpio0 25 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
7382
label = "Push button switch 3";
@@ -152,7 +161,6 @@
152161
};
153162

154163
&flash0 {
155-
156164
partitions {
157165
compatible = "fixed-partitions";
158166
#address-cells = <1>;
@@ -162,14 +170,17 @@
162170
label = "mcuboot";
163171
reg = <0x00000000 0xC000>;
164172
};
173+
165174
slot0_partition: partition@C000 {
166175
label = "image-0";
167176
reg = <0x0000C000 0x17000>;
168177
};
178+
169179
slot1_partition: partition@23000 {
170180
label = "image-1";
171181
reg = <0x00023000 0x17000>;
172182
};
183+
173184
storage_partition: partition@3a000 {
174185
label = "storage";
175186
reg = <0x0003a000 0x00006000>;

‎boards/nordic/nrf52833dk/nrf52833dk_nrf52833-pinctrl.dtsi

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
psels = <NRF_PSEL(UART_TX, 0, 6)>,
1010
<NRF_PSEL(UART_RTS, 0, 5)>;
1111
};
12+
1213
group2 {
1314
psels = <NRF_PSEL(UART_RX, 0, 8)>,
1415
<NRF_PSEL(UART_CTS, 0, 7)>;
@@ -31,6 +32,7 @@
3132
psels = <NRF_PSEL(UART_RX, 1, 1)>;
3233
bias-pull-up;
3334
};
35+
3436
group2 {
3537
psels = <NRF_PSEL(UART_TX, 1, 2)>;
3638
};
@@ -138,5 +140,4 @@
138140
low-power-enable;
139141
};
140142
};
141-
142143
};

0 commit comments

Comments
 (0)