summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2024-07-09 23:21:43 +0200
committerArnd Bergmann <arnd@arndb.de>2024-07-09 23:21:43 +0200
commit4b1a54b2696f9fcb714c94d5a58db59f867e4caa (patch)
tree2e847160ad5a6cca65159d7953a91c9e0eb232e9 /arch/arm
parent95ab7b209bd94ef5beea9419b8e8464788b28e75 (diff)
parentc1842643a3df6004d1bc9df74e34d8b72997d886 (diff)
Merge tag 'qcom-arm32-for-6.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
One more Arm32 DeviceTree update for v6.11 This fixes the DeviceTree validation warning about MSM8960 /memory node not having a unit address. * tag 'qcom-arm32-for-6.11-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: ARM: dts: qcom: msm8960: correct memory base Link: https://lore.kernel.org/r/20240709191506.3285-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/qcom/qcom-msm8960.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
index a9c6d2dbb460..ebc43c5c6e5f 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
@@ -47,9 +47,9 @@
};
};
- memory {
+ memory@80000000 {
device_type = "memory";
- reg = <0x0 0x0>;
+ reg = <0x80000000 0>;
};
cpu-pmu {