Skip to content

Commit 2522082

Browse files
mbolivar-nordiccfriedt
authored andcommitted
dts: nrf5340: sort /soc nodes
Sort by unit address. This involves multiple files since there are includes and secure/non-secure files to deal with. Signed-off-by: Martí Bolívar <[email protected]>
1 parent 33aae5b commit 2522082

File tree

4 files changed

+447
-447
lines changed

4 files changed

+447
-447
lines changed

dts/arm/nordic/nrf5340_cpuapp.dtsi

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,18 @@
3232
};
3333

3434
soc {
35+
ficr: ficr@ff0000 {
36+
compatible = "nordic,nrf-ficr";
37+
reg = <0xff0000 0x1000>;
38+
status = "okay";
39+
};
40+
41+
uicr: uicr@ff8000 {
42+
compatible = "nordic,nrf-uicr";
43+
reg = <0xff8000 0x1000>;
44+
status = "okay";
45+
};
46+
3547
sram0: memory@20000000 {
3648
compatible = "mmio-sram";
3749
};
@@ -48,19 +60,12 @@
4860
};
4961

5062
/* Additional Secure peripherals */
51-
cryptocell: crypto@50844000 {
52-
compatible = "nordic,nrf-cc312";
53-
reg = <0x50844000 0x1000>;
54-
label = "CRYPTOCELL";
63+
64+
spu: spu@50003000 {
65+
compatible = "nordic,nrf-spu";
66+
reg = <0x50003000 0x1000>;
67+
interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
5568
status = "okay";
56-
#address-cells = <1>;
57-
#size-cells = <1>;
58-
cryptocell312: crypto@50845000 {
59-
compatible = "arm,cryptocell-312";
60-
reg = <0x50845000 0x1000>;
61-
interrupts = <68 NRF_DEFAULT_IRQ_PRIORITY>;
62-
label = "CRYPTOCELL312";
63-
};
6469
};
6570

6671
/*
@@ -76,23 +81,19 @@
7681
label = "GPIOTE_0";
7782
};
7883

79-
spu: spu@50003000 {
80-
compatible = "nordic,nrf-spu";
81-
reg = <0x50003000 0x1000>;
82-
interrupts = <3 NRF_DEFAULT_IRQ_PRIORITY>;
83-
status = "okay";
84-
};
85-
86-
ficr: ficr@ff0000 {
87-
compatible = "nordic,nrf-ficr";
88-
reg = <0xff0000 0x1000>;
89-
status = "okay";
90-
};
91-
92-
uicr: uicr@ff8000 {
93-
compatible = "nordic,nrf-uicr";
94-
reg = <0xff8000 0x1000>;
84+
cryptocell: crypto@50844000 {
85+
compatible = "nordic,nrf-cc312";
86+
reg = <0x50844000 0x1000>;
87+
label = "CRYPTOCELL";
9588
status = "okay";
89+
#address-cells = <1>;
90+
#size-cells = <1>;
91+
cryptocell312: crypto@50845000 {
92+
compatible = "arm,cryptocell-312";
93+
reg = <0x50845000 0x1000>;
94+
interrupts = <68 NRF_DEFAULT_IRQ_PRIORITY>;
95+
label = "CRYPTOCELL312";
96+
};
9697
};
9798
};
9899
};

0 commit comments

Comments
 (0)