Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Rob Herring and committed by
Arnd Bergmann
5c04a5b0 7ecef37e

+15 -15
+1 -1
arch/arm64/boot/dts/actions/s700-cubieboard7.dts
··· 24 24 reg = <0x0 0x0 0x0 0x80000000>; 25 25 }; 26 26 27 - memory@1,e0000000 { 27 + memory@1e0000000 { 28 28 device_type = "memory"; 29 29 reg = <0x1 0xe0000000 0x0 0x0>; 30 30 };
+1 -1
arch/arm64/boot/dts/apm/apm-merlin.dts
··· 15 15 16 16 chosen { }; 17 17 18 - memory { 18 + memory@100000000 { 19 19 device_type = "memory"; 20 20 reg = < 0x1 0x00000000 0x0 0x80000000 >; 21 21 };
+1 -1
arch/arm64/boot/dts/apm/apm-mustang.dts
··· 15 15 16 16 chosen { }; 17 17 18 - memory { 18 + memory@100000000 { 19 19 device_type = "memory"; 20 20 reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */ 21 21 };
+1 -1
arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
··· 50 50 bootargs = "earlycon=uart8250,mmio32,0x66130000"; 51 51 }; 52 52 53 - memory { 53 + memory@80000000 { 54 54 device_type = "memory"; 55 55 reg = <0x00000000 0x80000000 0x00000000 0x40000000>; 56 56 };
+1 -1
arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts
··· 47 47 bootargs = "earlycon=uart8250,mmio32,0x66130000"; 48 48 }; 49 49 50 - memory { 50 + memory@80000000 { 51 51 device_type = "memory"; 52 52 reg = <0x00000000 0x80000000 0x00000001 0x00000000>; 53 53 };
+1 -1
arch/arm64/boot/dts/cavium/thunder2-99xx.dts
··· 14 14 model = "Cavium ThunderX2 CN99XX"; 15 15 compatible = "cavium,thunderx2-cn9900", "brcm,vulcan-soc"; 16 16 17 - memory { 17 + memory@80000000 { 18 18 device_type = "memory"; 19 19 reg = <0x00000000 0x80000000 0x0 0x80000000>, /* 2G @ 2G */ 20 20 <0x00000008 0x80000000 0x0 0x80000000>; /* 2G @ 34G */
+1 -1
arch/arm64/boot/dts/lg/lg1312-ref.dts
··· 22 22 serial2 = &uart2; 23 23 }; 24 24 25 - memory { 25 + memory@0 { 26 26 device_type = "memory"; 27 27 reg = <0x0 0x00000000 0x20000000>; 28 28 };
+1 -1
arch/arm64/boot/dts/lg/lg1313-ref.dts
··· 22 22 serial2 = &uart2; 23 23 }; 24 24 25 - memory { 25 + memory@0 { 26 26 device_type = "memory"; 27 27 reg = <0x0 0x00000000 0x20000000>; 28 28 };
+1 -1
arch/arm64/boot/dts/nuvoton/nuvoton-npcm845-evb.dts
··· 16 16 stdout-path = &serial0; 17 17 }; 18 18 19 - memory { 19 + memory@0 { 20 20 reg = <0x0 0x0 0x0 0x40000000>; 21 21 }; 22 22 };
+1 -1
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
··· 25 25 stdout-path = "serial0:115200n8"; 26 26 }; 27 27 28 - memory { 28 + memory@80000000 { 29 29 device_type = "memory"; 30 30 reg = <0x0 0x80000000 0x0 0xc0000000>; 31 31 };
+1 -1
arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
··· 16 16 stdout-path = "serial0"; 17 17 }; 18 18 19 - memory { 19 + memory@40000000 { 20 20 device_type = "memory"; 21 21 reg = <0x0 0x40000000 0x0 0x20000000>; 22 22 };
+1 -1
arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
··· 17 17 stdout-path = "serial2:115200n8"; 18 18 }; 19 19 20 - memory { 20 + memory@0 { 21 21 device_type = "memory"; 22 22 reg = <0x0 0x0 0x0 0x40000000>; 23 23 };
+1 -1
arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
··· 21 21 stdout-path = "serial2:115200n8"; 22 22 }; 23 23 24 - memory { 24 + memory@0 { 25 25 device_type = "memory"; 26 26 reg = <0x0 0x0 0x0 0x80000000>; 27 27 };
+1 -1
arch/arm64/boot/dts/rockchip/rk3368-r88.dts
··· 21 21 stdout-path = "serial2:115200n8"; 22 22 }; 23 23 24 - memory { 24 + memory@0 { 25 25 device_type = "memory"; 26 26 reg = <0x0 0x0 0x0 0x40000000>; 27 27 };
+1 -1
arch/arm64/boot/dts/sprd/sp9860g-1h10.dts
··· 24 24 spi0 = &adi_bus; 25 25 }; 26 26 27 - memory { 27 + memory@80000000 { 28 28 device_type = "memory"; 29 29 reg = <0x0 0x80000000 0 0x60000000>, 30 30 <0x1 0x80000000 0 0x60000000>;