Skip to content

Commit 5c04a5b

Browse files
robherringarndb
authored andcommitted
arm64: dts: Add/fix /memory node unit-addresses
'/memory' nodes always have a 'reg' property, and therefore should have a unit-address with just plain hex (i.e. no commas). Fix all the arm64 '/memory' nodes. It's possible that some bootloader depends on /memory (arm32 ATAG to DT code does for example). If so, the memory node should be commented with that requirement. Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Reviewed-by: Chanho Min <chanho.min@lge.com> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20240430191856.874600-2-robh@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 7ecef37 commit 5c04a5b

15 files changed

Lines changed: 15 additions & 15 deletions

File tree

arch/arm64/boot/dts/actions/s700-cubieboard7.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
reg = <0x0 0x0 0x0 0x80000000>;
2525
};
2626

27-
memory@1,e0000000 {
27+
memory@1e0000000 {
2828
device_type = "memory";
2929
reg = <0x1 0xe0000000 0x0 0x0>;
3030
};

arch/arm64/boot/dts/apm/apm-merlin.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
chosen { };
1717

18-
memory {
18+
memory@100000000 {
1919
device_type = "memory";
2020
reg = < 0x1 0x00000000 0x0 0x80000000 >;
2121
};

arch/arm64/boot/dts/apm/apm-mustang.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
chosen { };
1717

18-
memory {
18+
memory@100000000 {
1919
device_type = "memory";
2020
reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */
2121
};

arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
bootargs = "earlycon=uart8250,mmio32,0x66130000";
5151
};
5252

53-
memory {
53+
memory@80000000 {
5454
device_type = "memory";
5555
reg = <0x00000000 0x80000000 0x00000000 0x40000000>;
5656
};

arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
bootargs = "earlycon=uart8250,mmio32,0x66130000";
4848
};
4949

50-
memory {
50+
memory@80000000 {
5151
device_type = "memory";
5252
reg = <0x00000000 0x80000000 0x00000001 0x00000000>;
5353
};

arch/arm64/boot/dts/cavium/thunder2-99xx.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
model = "Cavium ThunderX2 CN99XX";
1515
compatible = "cavium,thunderx2-cn9900", "brcm,vulcan-soc";
1616

17-
memory {
17+
memory@80000000 {
1818
device_type = "memory";
1919
reg = <0x00000000 0x80000000 0x0 0x80000000>, /* 2G @ 2G */
2020
<0x00000008 0x80000000 0x0 0x80000000>; /* 2G @ 34G */

arch/arm64/boot/dts/lg/lg1312-ref.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
serial2 = &uart2;
2323
};
2424

25-
memory {
25+
memory@0 {
2626
device_type = "memory";
2727
reg = <0x0 0x00000000 0x20000000>;
2828
};

arch/arm64/boot/dts/lg/lg1313-ref.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
serial2 = &uart2;
2323
};
2424

25-
memory {
25+
memory@0 {
2626
device_type = "memory";
2727
reg = <0x0 0x00000000 0x20000000>;
2828
};

arch/arm64/boot/dts/nuvoton/nuvoton-npcm845-evb.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
stdout-path = &serial0;
1717
};
1818

19-
memory {
19+
memory@0 {
2020
reg = <0x0 0x0 0x0 0x40000000>;
2121
};
2222
};

arch/arm64/boot/dts/nvidia/tegra210-smaug.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
stdout-path = "serial0:115200n8";
2626
};
2727

28-
memory {
28+
memory@80000000 {
2929
device_type = "memory";
3030
reg = <0x0 0x80000000 0x0 0xc0000000>;
3131
};

0 commit comments

Comments
 (0)