Skip to content

Commit 46f67ed

Browse files
mbolivar-nordiccfriedt
mbolivar-nordic
authored and
cfriedt
committed
dts: nrf52810: sort /soc nodes
Sort by unit address. Signed-off-by: Martí Bolívar <[email protected]>
1 parent 62740a6 commit 46f67ed

File tree

1 file changed

+99
-101
lines changed

1 file changed

+99
-101
lines changed

‎dts/arm/nordic/nrf52810.dtsi‎

Lines changed: 99 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -22,37 +22,22 @@
2222
};
2323

2424
soc {
25+
ficr: ficr@10000000 {
26+
compatible = "nordic,nrf-ficr";
27+
reg = <0x10000000 0x1000>;
28+
status = "okay";
29+
};
2530

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

4337
sram0: memory@20000000 {
4438
compatible = "mmio-sram";
4539
};
4640

47-
adc: adc@40007000 {
48-
compatible = "nordic,nrf-saadc";
49-
reg = <0x40007000 0x1000>;
50-
interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
51-
status = "disabled";
52-
label = "ADC_0";
53-
#io-channel-cells = <1>;
54-
};
55-
5641
clock: clock@40000000 {
5742
compatible = "nordic,nrf-clock";
5843
reg = <0x40000000 0x1000>;
@@ -61,14 +46,6 @@
6146
label = "CLOCK";
6247
};
6348

64-
ecb: ecb@4000e000 {
65-
compatible = "nordic,nrf-ecb";
66-
reg = <0x4000e000 0x1000>;
67-
interrupts = <14 NRF_DEFAULT_IRQ_PRIORITY>;
68-
status = "okay";
69-
label = "ECB";
70-
};
71-
7249
uart0: uart@40002000 {
7350
/* uart can be either UART or UARTE, for the user to pick */
7451
/* compatible = "nordic,nrf-uarte" or "nordic,nrf-uart"; */
@@ -78,24 +55,6 @@
7855
label = "UART_0";
7956
};
8057

81-
gpiote: gpiote@40006000 {
82-
compatible = "nordic,nrf-gpiote";
83-
reg = <0x40006000 0x1000>;
84-
interrupts = <6 5>;
85-
status = "disabled";
86-
label = "GPIOTE_0";
87-
};
88-
89-
gpio0: gpio@50000000 {
90-
compatible = "nordic,nrf-gpio";
91-
gpio-controller;
92-
reg = <0x50000000 0x1000>;
93-
#gpio-cells = <2>;
94-
label = "GPIO_0";
95-
status = "disabled";
96-
port = <0>;
97-
};
98-
9958
i2c0: i2c@40003000 {
10059
/*
10160
* This i2c node can be TWI, TWIM, or TWIS,
@@ -113,31 +72,6 @@
11372
label = "I2C_0";
11473
};
11574

116-
pwm0: pwm@4001c000 {
117-
compatible = "nordic,nrf-pwm";
118-
reg = <0x4001c000 0x1000>;
119-
interrupts = <28 NRF_DEFAULT_IRQ_PRIORITY>;
120-
status = "disabled";
121-
label = "PWM_0";
122-
#pwm-cells = <1>;
123-
};
124-
125-
qdec: qdec@40012000 {
126-
compatible = "nordic,nrf-qdec";
127-
reg = <0x40012000 0x1000>;
128-
interrupts = <18 NRF_DEFAULT_IRQ_PRIORITY>;
129-
status = "disabled";
130-
label = "QDEC";
131-
};
132-
133-
rng: random@4000d000 {
134-
compatible = "nordic,nrf-rng";
135-
reg = <0x4000d000 0x1000>;
136-
interrupts = <13 NRF_DEFAULT_IRQ_PRIORITY>;
137-
status = "okay";
138-
label = "RNG";
139-
};
140-
14175
spi0: spi@40004000 {
14276
/*
14377
* This spi node can be SPI, SPIM, or SPIS,
@@ -154,28 +88,22 @@
15488
label = "SPI_0";
15589
};
15690

157-
rtc0: rtc@4000b000 {
158-
compatible = "nordic,nrf-rtc";
159-
reg = <0x4000b000 0x1000>;
160-
cc-num = <3>;
161-
interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
162-
status = "okay";
163-
clock-frequency = <32768>;
164-
prescaler = <1>;
165-
label = "RTC_0";
91+
gpiote: gpiote@40006000 {
92+
compatible = "nordic,nrf-gpiote";
93+
reg = <0x40006000 0x1000>;
94+
interrupts = <6 5>;
95+
status = "disabled";
96+
label = "GPIOTE_0";
16697
};
16798

168-
rtc1: rtc@40011000 {
169-
compatible = "nordic,nrf-rtc";
170-
reg = <0x40011000 0x1000>;
171-
cc-num = <4>;
172-
interrupts = <17 NRF_DEFAULT_IRQ_PRIORITY>;
173-
status = "okay";
174-
clock-frequency = <32768>;
175-
prescaler = <1>;
176-
label = "RTC_1";
99+
adc: adc@40007000 {
100+
compatible = "nordic,nrf-saadc";
101+
reg = <0x40007000 0x1000>;
102+
interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
103+
status = "disabled";
104+
label = "ADC_0";
105+
#io-channel-cells = <1>;
177106
};
178-
179107
timer0: timer@40008000 {
180108
compatible = "nordic,nrf-timer";
181109
status = "okay";
@@ -206,6 +134,17 @@
206134
label = "TIMER_2";
207135
};
208136

137+
rtc0: rtc@4000b000 {
138+
compatible = "nordic,nrf-rtc";
139+
reg = <0x4000b000 0x1000>;
140+
cc-num = <3>;
141+
interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
142+
status = "okay";
143+
clock-frequency = <32768>;
144+
prescaler = <1>;
145+
label = "RTC_0";
146+
};
147+
209148
temp: temp@4000c000 {
210149
compatible = "nordic,nrf-temp";
211150
reg = <0x4000c000 0x1000>;
@@ -214,6 +153,22 @@
214153
label = "TEMP_0";
215154
};
216155

156+
rng: random@4000d000 {
157+
compatible = "nordic,nrf-rng";
158+
reg = <0x4000d000 0x1000>;
159+
interrupts = <13 NRF_DEFAULT_IRQ_PRIORITY>;
160+
status = "okay";
161+
label = "RNG";
162+
};
163+
164+
ecb: ecb@4000e000 {
165+
compatible = "nordic,nrf-ecb";
166+
reg = <0x4000e000 0x1000>;
167+
interrupts = <14 NRF_DEFAULT_IRQ_PRIORITY>;
168+
status = "okay";
169+
label = "ECB";
170+
};
171+
217172
wdt: wdt0: watchdog@40010000 {
218173
compatible = "nordic,nrf-watchdog";
219174
reg = <0x40010000 0x1000>;
@@ -222,16 +177,59 @@
222177
label = "WDT";
223178
};
224179

225-
ficr: ficr@10000000 {
226-
compatible = "nordic,nrf-ficr";
227-
reg = <0x10000000 0x1000>;
180+
rtc1: rtc@40011000 {
181+
compatible = "nordic,nrf-rtc";
182+
reg = <0x40011000 0x1000>;
183+
cc-num = <4>;
184+
interrupts = <17 NRF_DEFAULT_IRQ_PRIORITY>;
228185
status = "okay";
186+
clock-frequency = <32768>;
187+
prescaler = <1>;
188+
label = "RTC_1";
229189
};
230190

231-
uicr: uicr@10001000 {
232-
compatible = "nordic,nrf-uicr";
233-
reg = <0x10001000 0x1000>;
234-
status = "okay";
191+
qdec: qdec@40012000 {
192+
compatible = "nordic,nrf-qdec";
193+
reg = <0x40012000 0x1000>;
194+
interrupts = <18 NRF_DEFAULT_IRQ_PRIORITY>;
195+
status = "disabled";
196+
label = "QDEC";
197+
};
198+
199+
pwm0: pwm@4001c000 {
200+
compatible = "nordic,nrf-pwm";
201+
reg = <0x4001c000 0x1000>;
202+
interrupts = <28 NRF_DEFAULT_IRQ_PRIORITY>;
203+
status = "disabled";
204+
label = "PWM_0";
205+
#pwm-cells = <1>;
206+
};
207+
208+
flash_controller: flash-controller@4001e000 {
209+
compatible = "nordic,nrf52-flash-controller";
210+
reg = <0x4001e000 0x1000>;
211+
212+
#address-cells = <1>;
213+
#size-cells = <1>;
214+
215+
label="NRF_FLASH_DRV_NAME";
216+
217+
flash0: flash@0 {
218+
compatible = "soc-nv-flash";
219+
label = "NRF_FLASH";
220+
erase-block-size = <4096>;
221+
write-block-size = <4>;
222+
};
223+
};
224+
225+
gpio0: gpio@50000000 {
226+
compatible = "nordic,nrf-gpio";
227+
gpio-controller;
228+
reg = <0x50000000 0x1000>;
229+
#gpio-cells = <2>;
230+
label = "GPIO_0";
231+
status = "disabled";
232+
port = <0>;
235233
};
236234
};
237235

0 commit comments

Comments
 (0)