Skip to content

Commit b858121

Browse files
mbolivar-nordiccfriedt
authored andcommitted
dts: nrf52820: sort /soc nodes
Sort by unit address. Signed-off-by: Martí Bolívar <[email protected]>
1 parent e107e28 commit b858121

File tree

1 file changed

+115
-116
lines changed

1 file changed

+115
-116
lines changed

dts/arm/nordic/nrf52820.dtsi

Lines changed: 115 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,16 @@
2727
};
2828

2929
soc {
30+
ficr: ficr@10000000 {
31+
compatible = "nordic,nrf-ficr";
32+
reg = <0x10000000 0x1000>;
33+
status = "okay";
34+
};
3035

31-
flash_controller: flash-controller@4001e000 {
32-
compatible = "nordic,nrf52-flash-controller";
33-
reg = <0x4001e000 0x1000>;
34-
35-
#address-cells = <1>;
36-
#size-cells = <1>;
37-
38-
label="NRF_FLASH_DRV_NAME";
39-
40-
flash0: flash@0 {
41-
compatible = "soc-nv-flash";
42-
label = "NRF_FLASH";
43-
erase-block-size = <4096>;
44-
write-block-size = <4>;
45-
};
36+
uicr: uicr@10001000 {
37+
compatible = "nordic,nrf-uicr";
38+
reg = <0x10001000 0x1000>;
39+
status = "okay";
4640
};
4741

4842
sram0: memory@20000000 {
@@ -57,12 +51,13 @@
5751
label = "CLOCK";
5852
};
5953

60-
ecb: ecb@4000e000 {
61-
compatible = "nordic,nrf-ecb";
62-
reg = <0x4000e000 0x1000>;
63-
interrupts = <14 NRF_DEFAULT_IRQ_PRIORITY>;
54+
radio: radio@40001000 {
55+
compatible = "nordic,nrf-radio";
56+
reg = <0x40001000 0x1000>;
57+
interrupts = <1 NRF_DEFAULT_IRQ_PRIORITY>;
6458
status = "okay";
65-
label = "ECB";
59+
dfe-antenna-num = <0>;
60+
dfe-pdu-antenna = <0xFF>;
6661
};
6762

6863
uart0: uart@40002000 {
@@ -74,25 +69,6 @@
7469
label = "UART_0";
7570
};
7671

77-
gpiote: gpiote@40006000 {
78-
compatible = "nordic,nrf-gpiote";
79-
reg = <0x40006000 0x1000>;
80-
interrupts = <6 5>;
81-
status = "disabled";
82-
label = "GPIOTE_0";
83-
};
84-
85-
gpio0: gpio@50000000 {
86-
compatible = "nordic,nrf-gpio";
87-
gpio-controller;
88-
reg = <0x50000000 0x200
89-
0x50000500 0x300>;
90-
#gpio-cells = <2>;
91-
label = "GPIO_0";
92-
status = "disabled";
93-
port = <0>;
94-
};
95-
9672
i2c0: i2c@40003000 {
9773
/*
9874
* This i2c node can be TWI, TWIM, or TWIS,
@@ -110,6 +86,22 @@
11086
label = "I2C_0";
11187
};
11288

89+
spi0: spi@40003000 {
90+
/*
91+
* This spi node can be SPI, SPIM, or SPIS,
92+
* for the user to pick:
93+
* compatible = "nordic,nrf-spi" or
94+
* "nordic,nrf-spim" or
95+
* "nordic,nrf-spis".
96+
*/
97+
#address-cells = <1>;
98+
#size-cells = <0>;
99+
reg = <0x40003000 0x1000>;
100+
interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
101+
status = "disabled";
102+
label = "SPI_0";
103+
};
104+
113105
i2c1: i2c@40004000 {
114106
/*
115107
* This i2c node can be TWI, TWIM, or TWIS,
@@ -127,38 +119,6 @@
127119
label = "I2C_1";
128120
};
129121

130-
qdec: qdec@40012000 {
131-
compatible = "nordic,nrf-qdec";
132-
reg = <0x40012000 0x1000>;
133-
interrupts = <18 NRF_DEFAULT_IRQ_PRIORITY>;
134-
status = "disabled";
135-
label = "QDEC";
136-
};
137-
138-
rng: random@4000d000 {
139-
compatible = "nordic,nrf-rng";
140-
reg = <0x4000d000 0x1000>;
141-
interrupts = <13 NRF_DEFAULT_IRQ_PRIORITY>;
142-
status = "okay";
143-
label = "RNG";
144-
};
145-
146-
spi0: spi@40003000 {
147-
/*
148-
* This spi node can be SPI, SPIM, or SPIS,
149-
* for the user to pick:
150-
* compatible = "nordic,nrf-spi" or
151-
* "nordic,nrf-spim" or
152-
* "nordic,nrf-spis".
153-
*/
154-
#address-cells = <1>;
155-
#size-cells = <0>;
156-
reg = <0x40003000 0x1000>;
157-
interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
158-
status = "disabled";
159-
label = "SPI_0";
160-
};
161-
162122
spi1: spi@40004000 {
163123
/*
164124
* This spi node can be SPI, SPIM, or SPIS,
@@ -175,26 +135,12 @@
175135
label = "SPI_1";
176136
};
177137

178-
rtc0: rtc@4000b000 {
179-
compatible = "nordic,nrf-rtc";
180-
reg = <0x4000b000 0x1000>;
181-
cc-num = <3>;
182-
interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
183-
status = "okay";
184-
clock-frequency = <32768>;
185-
prescaler = <1>;
186-
label = "RTC_0";
187-
};
188-
189-
rtc1: rtc@40011000 {
190-
compatible = "nordic,nrf-rtc";
191-
reg = <0x40011000 0x1000>;
192-
cc-num = <4>;
193-
interrupts = <17 NRF_DEFAULT_IRQ_PRIORITY>;
194-
status = "okay";
195-
clock-frequency = <32768>;
196-
prescaler = <1>;
197-
label = "RTC_1";
138+
gpiote: gpiote@40006000 {
139+
compatible = "nordic,nrf-gpiote";
140+
reg = <0x40006000 0x1000>;
141+
interrupts = <6 5>;
142+
status = "disabled";
143+
label = "GPIOTE_0";
198144
};
199145

200146
timer0: timer@40008000 {
@@ -227,6 +173,17 @@
227173
label = "TIMER_2";
228174
};
229175

176+
rtc0: rtc@4000b000 {
177+
compatible = "nordic,nrf-rtc";
178+
reg = <0x4000b000 0x1000>;
179+
cc-num = <3>;
180+
interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
181+
status = "okay";
182+
clock-frequency = <32768>;
183+
prescaler = <1>;
184+
label = "RTC_0";
185+
};
186+
230187
temp: temp@4000c000 {
231188
compatible = "nordic,nrf-temp";
232189
reg = <0x4000c000 0x1000>;
@@ -235,17 +192,20 @@
235192
label = "TEMP_0";
236193
};
237194

238-
usbd: usbd@40027000 {
239-
compatible = "nordic,nrf-usbd";
240-
reg = <0x40027000 0x1000>;
241-
interrupts = <39 NRF_DEFAULT_IRQ_PRIORITY>;
242-
num-bidir-endpoints = <1>;
243-
num-in-endpoints = <7>;
244-
num-out-endpoints = <7>;
245-
num-isoin-endpoints = <1>;
246-
num-isoout-endpoints = <1>;
247-
status = "disabled";
248-
label = "USBD";
195+
rng: random@4000d000 {
196+
compatible = "nordic,nrf-rng";
197+
reg = <0x4000d000 0x1000>;
198+
interrupts = <13 NRF_DEFAULT_IRQ_PRIORITY>;
199+
status = "okay";
200+
label = "RNG";
201+
};
202+
203+
ecb: ecb@4000e000 {
204+
compatible = "nordic,nrf-ecb";
205+
reg = <0x4000e000 0x1000>;
206+
interrupts = <14 NRF_DEFAULT_IRQ_PRIORITY>;
207+
status = "okay";
208+
label = "ECB";
249209
};
250210

251211
wdt0: wdt: watchdog@40010000 {
@@ -256,25 +216,64 @@
256216
label = "WDT";
257217
};
258218

259-
ficr: ficr@10000000 {
260-
compatible = "nordic,nrf-ficr";
261-
reg = <0x10000000 0x1000>;
219+
rtc1: rtc@40011000 {
220+
compatible = "nordic,nrf-rtc";
221+
reg = <0x40011000 0x1000>;
222+
cc-num = <4>;
223+
interrupts = <17 NRF_DEFAULT_IRQ_PRIORITY>;
262224
status = "okay";
225+
clock-frequency = <32768>;
226+
prescaler = <1>;
227+
label = "RTC_1";
263228
};
264229

265-
uicr: uicr@10001000 {
266-
compatible = "nordic,nrf-uicr";
267-
reg = <0x10001000 0x1000>;
268-
status = "okay";
230+
qdec: qdec@40012000 {
231+
compatible = "nordic,nrf-qdec";
232+
reg = <0x40012000 0x1000>;
233+
interrupts = <18 NRF_DEFAULT_IRQ_PRIORITY>;
234+
status = "disabled";
235+
label = "QDEC";
269236
};
270237

271-
radio: radio@40001000 {
272-
compatible = "nordic,nrf-radio";
273-
reg = <0x40001000 0x1000>;
274-
interrupts = <1 NRF_DEFAULT_IRQ_PRIORITY>;
275-
status = "okay";
276-
dfe-antenna-num = <0>;
277-
dfe-pdu-antenna = <0xFF>;
238+
flash_controller: flash-controller@4001e000 {
239+
compatible = "nordic,nrf52-flash-controller";
240+
reg = <0x4001e000 0x1000>;
241+
242+
#address-cells = <1>;
243+
#size-cells = <1>;
244+
245+
label="NRF_FLASH_DRV_NAME";
246+
247+
flash0: flash@0 {
248+
compatible = "soc-nv-flash";
249+
label = "NRF_FLASH";
250+
erase-block-size = <4096>;
251+
write-block-size = <4>;
252+
};
253+
};
254+
255+
usbd: usbd@40027000 {
256+
compatible = "nordic,nrf-usbd";
257+
reg = <0x40027000 0x1000>;
258+
interrupts = <39 NRF_DEFAULT_IRQ_PRIORITY>;
259+
num-bidir-endpoints = <1>;
260+
num-in-endpoints = <7>;
261+
num-out-endpoints = <7>;
262+
num-isoin-endpoints = <1>;
263+
num-isoout-endpoints = <1>;
264+
status = "disabled";
265+
label = "USBD";
266+
};
267+
268+
gpio0: gpio@50000000 {
269+
compatible = "nordic,nrf-gpio";
270+
gpio-controller;
271+
reg = <0x50000000 0x200
272+
0x50000500 0x300>;
273+
#gpio-cells = <2>;
274+
label = "GPIO_0";
275+
status = "disabled";
276+
port = <0>;
278277
};
279278
};
280279

0 commit comments

Comments
 (0)