arm64: dts: realtek: rtd129x: Carve out boot ROM from memory

commit 3040e132beda2aee56e6ea9be8db69889bcb2e7a upstream.

Update DS418j, MeLE V9, PROBOX2 AVA, Zidoo X9S and DS418 /memory nodes
to exclude 0..0x1efff from reg entry and update unit address to match.
Add this region to /soc ranges and for now just update the /memreserve/s.

Suggested-by: Rob Herring <robh@kernel.org>
Fixes: 72a7786c0a0d ("ARM64: dts: Add Realtek RTD1295 and Zidoo X9S")
Fixes: d938a964a966 ("arm64: dts: realtek: Add ProBox2 Ava")
Fixes: a9ce6f854581 ("arm64: dts: realtek: Add MeLE V9")
Fixes: cf976f660ee8 ("arm64: dts: realtek: Add RTD1293 and Synology DS418j")
Fixes: 5133636e41a2 ("arm64: dts: realtek: Add RTD1296 and Synology DS418")
Cc: James Tai <james.tai@realtek.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts b/arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts
index b2dd583146b4676c05bcd8168321c0c1f6f429cc..b2e44c6c2d220d85ec26ed6a46ca4b9395c67285 100644 (file)
--- a/arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts
+++ b/arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
 /*
- * Copyright (c) 2017 Andreas Färber
+ * Copyright (c) 2017-2019 Andreas Färber
  */
 
 /dts-v1/;
@@ -11,9 +11,9 @@
        compatible = "synology,ds418j", "realtek,rtd1293";
        model = "Synology DiskStation DS418j";
 
-       memory@0 {
+       memory@1f000 {
                device_type = "memory";
-               reg = <0x0 0x40000000>;
+               reg = <0x1f000 0x3ffe1000>; /* boot ROM to 1 GiB */
        };
 
        aliases {

diff --git a/arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts b/arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts
index bd584e99fff9dfac377e44445164784cebeff2c1..cf4a57c012a8ce7d5b230649e7b909ef1af21a27 100644 (file)
--- a/arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts
+++ b/arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Andreas Färber
+ * Copyright (c) 2017-2019 Andreas Färber
  *
  * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
@@ -12,9 +12,9 @@
        compatible = "mele,v9", "realtek,rtd1295";
        model = "MeLE V9";
 
-       memory@0 {
+       memory@1f000 {
                device_type = "memory";
-               reg = <0x0 0x80000000>;
+               reg = <0x1f000 0x7ffe1000>; /* boot ROM to 2 GiB */
        };
 
        aliases {

diff --git a/arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts b/arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts
index 8e2b0e75298ac65627f93e39308651f299f2a0ef..14161c3f304dec683bcf3db0931c8358208b7b90 100644 (file)
--- a/arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts
+++ b/arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Andreas Färber
+ * Copyright (c) 2017-2019 Andreas Färber
  *
  * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
@@ -12,9 +12,9 @@
        compatible = "probox2,ava", "realtek,rtd1295";
        model = "PROBOX2 AVA";
 
-       memory@0 {
+       memory@1f000 {
                device_type = "memory";
-               reg = <0x0 0x80000000>;
+               reg = <0x1f000 0x7ffe1000>; /* boot ROM to 2 GiB */
        };
 
        aliases {

diff --git a/arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts b/arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts
index e98e508b95145a2dde2ffcd4b5a4fd43234f8e4c..4beb37bb9522852c22440d15831a71c869210c35 100644 (file)
--- a/arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts
+++ b/arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts
@@ -11,9 +11,9 @@
        compatible = "zidoo,x9s", "realtek,rtd1295";
        model = "Zidoo X9S";
 
-       memory@0 {
+       memory@1f000 {
                device_type = "memory";
-               reg = <0x0 0x80000000>;
+               reg = <0x1f000 0x7ffe1000>; /* boot ROM to 2 GiB */
        };
 
        aliases {

diff --git a/arch/arm64/boot/dts/realtek/rtd1296-ds418.dts b/arch/arm64/boot/dts/realtek/rtd1296-ds418.dts
index 5a051a52bf88cdb03efe6fb5fa6361fab32d5616..cc706d13da8bf4f46939c4e029f0d35bcc3749f4 100644 (file)
--- a/arch/arm64/boot/dts/realtek/rtd1296-ds418.dts
+++ b/arch/arm64/boot/dts/realtek/rtd1296-ds418.dts
@@ -11,9 +11,9 @@
        compatible = "synology,ds418", "realtek,rtd1296";
        model = "Synology DiskStation DS418";
 
-       memory@0 {
+       memory@1f000 {
                device_type = "memory";
-               reg = <0x0 0x80000000>;
+               reg = <0x1f000 0x7ffe1000>; /* boot ROM to 2 GiB */
        };
 
        aliases {

diff --git a/arch/arm64/boot/dts/realtek/rtd129x.dtsi b/arch/arm64/boot/dts/realtek/rtd129x.dtsi
index 8d80cca945bcd038f5f97020e5cbe6770d9d8fb7..b63d0c03597a2cb981ac82a931130391bd1c053c 100644 (file)
--- a/arch/arm64/boot/dts/realtek/rtd129x.dtsi
+++ b/arch/arm64/boot/dts/realtek/rtd129x.dtsi
@@ -5,8 +5,8 @@
  * Copyright (c) 2016-2019 Andreas Färber
  */
 
-/memreserve/   0x0000000000000000 0x0000000000030000;
-/memreserve/   0x0000000000030000 0x00000000000d0000;
+/memreserve/   0x0000000000000000 0x000000000001f000;
+/memreserve/   0x000000000001f000 0x00000000000e1000;
 /memreserve/   0x0000000001b00000 0x00000000004be000;
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -52,8 +52,9 @@
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
-               /* Exclude up to 2 GiB of RAM */
-               ranges = <0x80000000 0x80000000 0x80000000>;
+               ranges = <0x00000000 0x00000000 0x0001f000>, /* boot ROM */
+                        /* Exclude up to 2 GiB of RAM */
+                        <0x80000000 0x80000000 0x80000000>;
 
                reset1: reset-controller@98000000 {
                        compatible = "snps,dw-low-reset";