Skip to content

Commit e107e28

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

File tree

1 file changed

+111
-112
lines changed

1 file changed

+111
-112
lines changed

‎dts/arm/nordic/nrf52811.dtsi‎

Lines changed: 111 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -26,37 +26,22 @@
2626
};
2727

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

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

4741
sram0: memory@20000000 {
4842
compatible = "mmio-sram";
4943
};
5044

51-
adc: adc@40007000 {
52-
compatible = "nordic,nrf-saadc";
53-
reg = <0x40007000 0x1000>;
54-
interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
55-
status = "disabled";
56-
label = "ADC_0";
57-
#io-channel-cells = <1>;
58-
};
59-
6045
clock: clock@40000000 {
6146
compatible = "nordic,nrf-clock";
6247
reg = <0x40000000 0x1000>;
@@ -65,14 +50,6 @@
6550
label = "CLOCK";
6651
};
6752

68-
ecb: ecb@4000e000 {
69-
compatible = "nordic,nrf-ecb";
70-
reg = <0x4000e000 0x1000>;
71-
interrupts = <14 NRF_DEFAULT_IRQ_PRIORITY>;
72-
status = "okay";
73-
label = "ECB";
74-
};
75-
7653
uart0: uart@40002000 {
7754
/* uart can be either UART or UARTE, for the user to pick */
7855
/* compatible = "nordic,nrf-uarte" or "nordic,nrf-uart"; */
@@ -82,27 +59,6 @@
8259
label = "UART_0";
8360
};
8461

85-
gpiote: gpiote@40006000 {
86-
compatible = "nordic,nrf-gpiote";
87-
reg = <0x40006000 0x1000>;
88-
interrupts = <6 5>;
89-
status = "disabled";
90-
label = "GPIOTE_0";
91-
};
92-
93-
gpio0: gpio@50000000 {
94-
compatible = "nordic,nrf-gpio";
95-
gpio-controller;
96-
/* This way of addressing is used to be compatible */
97-
/* with nrf52840.dtsi */
98-
reg = <0x50000000 0x200
99-
0x50000500 0x300>;
100-
#gpio-cells = <2>;
101-
label = "GPIO_0";
102-
status = "disabled";
103-
port = <0>;
104-
};
105-
10662
i2c0: i2c@40003000 {
10763
/*
10864
* This i2c node can be TWI, TWIM, or TWIS,
@@ -120,32 +76,8 @@
12076
label = "I2C_0";
12177
};
12278

123-
pwm0: pwm@4001c000 {
124-
compatible = "nordic,nrf-pwm";
125-
reg = <0x4001c000 0x1000>;
126-
interrupts = <28 NRF_DEFAULT_IRQ_PRIORITY>;
127-
status = "disabled";
128-
label = "PWM_0";
129-
#pwm-cells = <1>;
130-
};
131-
132-
qdec: qdec@40012000 {
133-
compatible = "nordic,nrf-qdec";
134-
reg = <0x40012000 0x1000>;
135-
interrupts = <18 NRF_DEFAULT_IRQ_PRIORITY>;
136-
status = "disabled";
137-
label = "QDEC";
138-
};
139-
140-
rng: random@4000d000 {
141-
compatible = "nordic,nrf-rng";
142-
reg = <0x4000d000 0x1000>;
143-
interrupts = <13 NRF_DEFAULT_IRQ_PRIORITY>;
144-
status = "okay";
145-
label = "RNG";
146-
};
147-
148-
spi0: spi@40004000 {
79+
spi1: spi@40003000 {
80+
/* cannot be used with i2c0 */
14981
/*
15082
* This spi node can be SPI, SPIM, or SPIS,
15183
* for the user to pick:
@@ -155,14 +87,13 @@
15587
*/
15688
#address-cells = <1>;
15789
#size-cells = <0>;
158-
reg = <0x40004000 0x1000>;
159-
interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
90+
reg = <0x40003000 0x1000>;
91+
interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
16092
status = "disabled";
161-
label = "SPI_0";
93+
label = "SPI_1";
16294
};
16395

164-
spi1: spi@40003000 {
165-
/* cannot be used with i2c0 */
96+
spi0: spi@40004000 {
16697
/*
16798
* This spi node can be SPI, SPIM, or SPIS,
16899
* for the user to pick:
@@ -172,32 +103,27 @@
172103
*/
173104
#address-cells = <1>;
174105
#size-cells = <0>;
175-
reg = <0x40003000 0x1000>;
176-
interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
106+
reg = <0x40004000 0x1000>;
107+
interrupts = <4 NRF_DEFAULT_IRQ_PRIORITY>;
177108
status = "disabled";
178-
label = "SPI_1";
109+
label = "SPI_0";
179110
};
180111

181-
rtc0: rtc@4000b000 {
182-
compatible = "nordic,nrf-rtc";
183-
reg = <0x4000b000 0x1000>;
184-
cc-num = <3>;
185-
interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
186-
status = "okay";
187-
clock-frequency = <32768>;
188-
prescaler = <1>;
189-
label = "RTC_0";
112+
gpiote: gpiote@40006000 {
113+
compatible = "nordic,nrf-gpiote";
114+
reg = <0x40006000 0x1000>;
115+
interrupts = <6 5>;
116+
status = "disabled";
117+
label = "GPIOTE_0";
190118
};
191119

192-
rtc1: rtc@40011000 {
193-
compatible = "nordic,nrf-rtc";
194-
reg = <0x40011000 0x1000>;
195-
cc-num = <4>;
196-
interrupts = <17 NRF_DEFAULT_IRQ_PRIORITY>;
197-
status = "okay";
198-
clock-frequency = <32768>;
199-
prescaler = <1>;
200-
label = "RTC_1";
120+
adc: adc@40007000 {
121+
compatible = "nordic,nrf-saadc";
122+
reg = <0x40007000 0x1000>;
123+
interrupts = <7 NRF_DEFAULT_IRQ_PRIORITY>;
124+
status = "disabled";
125+
label = "ADC_0";
126+
#io-channel-cells = <1>;
201127
};
202128

203129
timer0: timer@40008000 {
@@ -230,6 +156,17 @@
230156
label = "TIMER_2";
231157
};
232158

159+
rtc0: rtc@4000b000 {
160+
compatible = "nordic,nrf-rtc";
161+
reg = <0x4000b000 0x1000>;
162+
cc-num = <3>;
163+
interrupts = <11 NRF_DEFAULT_IRQ_PRIORITY>;
164+
status = "okay";
165+
clock-frequency = <32768>;
166+
prescaler = <1>;
167+
label = "RTC_0";
168+
};
169+
233170
temp: temp@4000c000 {
234171
compatible = "nordic,nrf-temp";
235172
reg = <0x4000c000 0x1000>;
@@ -238,6 +175,22 @@
238175
label = "TEMP_0";
239176
};
240177

178+
rng: random@4000d000 {
179+
compatible = "nordic,nrf-rng";
180+
reg = <0x4000d000 0x1000>;
181+
interrupts = <13 NRF_DEFAULT_IRQ_PRIORITY>;
182+
status = "okay";
183+
label = "RNG";
184+
};
185+
186+
ecb: ecb@4000e000 {
187+
compatible = "nordic,nrf-ecb";
188+
reg = <0x4000e000 0x1000>;
189+
interrupts = <14 NRF_DEFAULT_IRQ_PRIORITY>;
190+
status = "okay";
191+
label = "ECB";
192+
};
193+
241194
wdt: wdt0: watchdog@40010000 {
242195
compatible = "nordic,nrf-watchdog";
243196
reg = <0x40010000 0x1000>;
@@ -246,16 +199,62 @@
246199
label = "WDT";
247200
};
248201

249-
ficr: ficr@10000000 {
250-
compatible = "nordic,nrf-ficr";
251-
reg = <0x10000000 0x1000>;
202+
rtc1: rtc@40011000 {
203+
compatible = "nordic,nrf-rtc";
204+
reg = <0x40011000 0x1000>;
205+
cc-num = <4>;
206+
interrupts = <17 NRF_DEFAULT_IRQ_PRIORITY>;
252207
status = "okay";
208+
clock-frequency = <32768>;
209+
prescaler = <1>;
210+
label = "RTC_1";
253211
};
254212

255-
uicr: uicr@10001000 {
256-
compatible = "nordic,nrf-uicr";
257-
reg = <0x10001000 0x1000>;
258-
status = "okay";
213+
qdec: qdec@40012000 {
214+
compatible = "nordic,nrf-qdec";
215+
reg = <0x40012000 0x1000>;
216+
interrupts = <18 NRF_DEFAULT_IRQ_PRIORITY>;
217+
status = "disabled";
218+
label = "QDEC";
219+
};
220+
221+
pwm0: pwm@4001c000 {
222+
compatible = "nordic,nrf-pwm";
223+
reg = <0x4001c000 0x1000>;
224+
interrupts = <28 NRF_DEFAULT_IRQ_PRIORITY>;
225+
status = "disabled";
226+
label = "PWM_0";
227+
#pwm-cells = <1>;
228+
};
229+
230+
flash_controller: flash-controller@4001e000 {
231+
compatible = "nordic,nrf52-flash-controller";
232+
reg = <0x4001e000 0x1000>;
233+
234+
#address-cells = <1>;
235+
#size-cells = <1>;
236+
237+
label="NRF_FLASH_DRV_NAME";
238+
239+
flash0: flash@0 {
240+
compatible = "soc-nv-flash";
241+
label = "NRF_FLASH";
242+
erase-block-size = <4096>;
243+
write-block-size = <4>;
244+
};
245+
};
246+
247+
gpio0: gpio@50000000 {
248+
compatible = "nordic,nrf-gpio";
249+
gpio-controller;
250+
/* This way of addressing is used to be compatible */
251+
/* with nrf52840.dtsi */
252+
reg = <0x50000000 0x200
253+
0x50000500 0x300>;
254+
#gpio-cells = <2>;
255+
label = "GPIO_0";
256+
status = "disabled";
257+
port = <0>;
259258
};
260259
};
261260

0 commit comments

Comments
 (0)