Update Mjolnir /memory node to exclude 0..0x2dfff from reg entry.
Add this region to /soc ranges instead.
Suggested-by: Rob Herring <robh@xxxxxxxxxx>
Cc: James Tai <james.tai@xxxxxxxxxxx>
Signed-off-by: Andreas Färber <afaerber@xxxxxxx>
---
TODO: Add Fixes header once RTD1619 has a stable -rc1 based commit hash.
To be followed up by patch unshadowing more RAM from /soc 0x98000000..0xffffffff,
once we know the higher RAM windows.
v2: New
arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts | 5 +++--
arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts b/arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts
index 44dd67e04335..90ed6681468f 100644
--- a/arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts
+++ b/arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
/*
* Copyright (c) 2019 Realtek Semiconductor Corp.
+ * Copyright (c) 2019 Andreas Färber
*/
/dts-v1/;
@@ -11,9 +12,9 @@
compatible = "realtek,mjolnir", "realtek,rtd1619";
model = "Realtek Mjolnir EVB";
- memory@0 {
+ memory@2e000 {
device_type = "memory";
- reg = <0x0 0x80000000>;
+ reg = <0x2e000 0x7ffd2000>; /* boot ROM to 2 GiB */
};
chosen {
diff --git a/arch/arm64/boot/dts/realtek/rtd16xx.dtsi b/arch/arm64/boot/dts/realtek/rtd16xx.dtsi
index c7bbf2c7bb7c..69cc0d941c8d 100644
--- a/arch/arm64/boot/dts/realtek/rtd16xx.dtsi
+++ b/arch/arm64/boot/dts/realtek/rtd16xx.dtsi
@@ -3,6 +3,7 @@
* Realtek RTD16xx SoC family
*
* Copyright (c) 2019 Realtek Semiconductor Corp.
+ * Copyright (c) 2019 Andreas Färber
*/
#include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -107,7 +108,8 @@
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
- ranges = <0x98000000 0x98000000 0x68000000>;
+ ranges = <0x00000000 0x00000000 0x0002e000>, /* boot ROM */
+ <0x98000000 0x98000000 0x68000000>;
rbus: bus@98000000 {
compatible = "simple-bus";
--
2.16.4
