arm64: dts: Add/fix /memory node unit-addresses
authorRob Herring <robh@kernel.org>
Tue, 30 Apr 2024 19:18:54 +0000 (14:18 -0500)
committerArnd Bergmann <arnd@arndb.de>
Thu, 2 May 2024 12:56:02 +0000 (14:56 +0200)
'/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>
15 files changed:
arch/arm64/boot/dts/actions/s700-cubieboard7.dts
arch/arm64/boot/dts/apm/apm-merlin.dts
arch/arm64/boot/dts/apm/apm-mustang.dts
arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts
arch/arm64/boot/dts/cavium/thunder2-99xx.dts
arch/arm64/boot/dts/lg/lg1312-ref.dts
arch/arm64/boot/dts/lg/lg1313-ref.dts
arch/arm64/boot/dts/nuvoton/nuvoton-npcm845-evb.dts
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
arch/arm64/boot/dts/rockchip/rk3368-r88.dts
arch/arm64/boot/dts/sprd/sp9860g-1h10.dts

index 63e375cd9eb40eb4c39885031d6986e7b1311e60..bd54b516512978f1301ea7f54c10f0d853a68296 100644 (file)
@@ -24,7 +24,7 @@
                reg = <0x0 0x0 0x0 0x80000000>;
        };
 
-       memory@1,e0000000 {
+       memory@1e0000000 {
                device_type = "memory";
                reg = <0x1 0xe0000000 0x0 0x0>;
        };
index 2e8069002ec1d5dc4da7e453bad76b34b7a019f1..6e05cf1a3df653772c166d21e8b13f9268088c31 100644 (file)
@@ -15,7 +15,7 @@
 
        chosen { };
 
-       memory {
+       memory@100000000 {
                device_type = "memory";
                reg = < 0x1 0x00000000 0x0 0x80000000 >;
        };
index 033e10e12b18557b87835ec6e2b4233dc435a8e1..e7644cddf06ff93884b8be592cfcf4446acf05f7 100644 (file)
@@ -15,7 +15,7 @@
 
        chosen { };
 
-       memory {
+       memory@100000000 {
                device_type = "memory";
                reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */
        };
index dec5a110f1e80d5859e3d7c0cb306e84fed31fd5..f43cfe66b6af65fa5d0f6c5bb09c1409ca91711e 100644 (file)
@@ -50,7 +50,7 @@
                bootargs = "earlycon=uart8250,mmio32,0x66130000";
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x00000000 0x80000000 0x00000000 0x40000000>;
        };
index 1d314f17bbdda9c9f1a49372a3a7f8088037e80b..c50df1d027974ffa73c0b3cda84c6611e0595b83 100644 (file)
@@ -47,7 +47,7 @@
                bootargs = "earlycon=uart8250,mmio32,0x66130000";
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x00000000 0x80000000 0x00000001 0x00000000>;
        };
index d005e1e79c3d284c9fc902bbe37f616907f5e29c..89fc4107a0c47ddb74dfc4ee9aec2664aaf02a36 100644 (file)
@@ -14,7 +14,7 @@
        model = "Cavium ThunderX2 CN99XX";
        compatible = "cavium,thunderx2-cn9900", "brcm,vulcan-soc";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x00000000 0x80000000 0x0 0x80000000>,  /* 2G @ 2G  */
                      <0x00000008 0x80000000 0x0 0x80000000>;  /* 2G @ 34G */
index 260a2c5b19e50812122f0efef90023b10cf472d8..cdd10f1380986686d9a023b40648a6883a27f13d 100644 (file)
@@ -22,7 +22,7 @@
                serial2 = &uart2;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x00000000 0x20000000>;
        };
index e89ae853788a2ee23efc362bd2d618be19b4781e..6ace977ff4cff0e5629ab7d100780e0a7ef6f2e6 100644 (file)
@@ -22,7 +22,7 @@
                serial2 = &uart2;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x00000000 0x20000000>;
        };
index a5ab2bc0f8359a8688dca60b0be36216b1d4d352..eeceb5b292a8ff1959b7e4c88f772d3202f82a7b 100644 (file)
@@ -16,7 +16,7 @@
                stdout-path = &serial0;
        };
 
-       memory {
+       memory@0 {
                reg = <0x0 0x0 0x0 0x40000000>;
        };
 };
index 9ebb7369256e02aa28ff75c8f608f7409b07a437..2e5b6b2c1f56ba56eb6c64acbddb7d9e2f033998 100644 (file)
@@ -25,7 +25,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x0 0x80000000 0x0 0xc0000000>;
        };
index 1b8379ba87f9c778cae214fda62a1cfe5aa01004..34e2f80514a3daf2be4e51c00cbff338d105fef7 100644 (file)
@@ -16,7 +16,7 @@
                stdout-path = "serial0";
        };
 
-       memory {
+       memory@40000000 {
                device_type = "memory";
                reg = <0x0 0x40000000 0x0 0x20000000>;
        };
index b48b98c13705c385ccceb1c66066eb24be854636..e5c0dbf794ae7e112dca6bc8d9cd09baca14d910 100644 (file)
@@ -17,7 +17,7 @@
                stdout-path = "serial2:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x0 0x0 0x40000000>;
        };
index dcee2e28916f710faa519de1adda98c070fc222d..23ae2d9de38226f922694409c66a1a26ec87a234 100644 (file)
@@ -21,7 +21,7 @@
                stdout-path = "serial2:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x0 0x0 0x80000000>;
        };
index b16b7ca02379a82f5daceb56ea516bc69744e539..7f14206d53c396b4c90ea3d7bc6d673113c61fb5 100644 (file)
@@ -21,7 +21,7 @@
                stdout-path = "serial2:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x0 0x0 0x40000000>;
        };
index ed8aee9e1828d8d8d074d47dd6d9012202255905..1ce3cbbd966844b1138ae3b829335077abb5c4ee 100644 (file)
@@ -24,7 +24,7 @@
                spi0 = &adi_bus;
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x0 0x80000000 0 0x60000000>,
                      <0x1 0x80000000 0 0x60000000>;