arm64: dts: renesas: spider: Move aliases and chosen

The serial console and serial debug ports on Spider are located on the
CPU board.  Hence move the aliases and chosen nodes containing serial
port configuration from the main Spider DTS file to the DTS file that
describes the CPU board.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/c03500bb10eae10caeb3f4f97bc979eeee6cce75.1663167551.git.geert+renesas@glider.be

diff --git a/arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi b/arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi
index 4a876d47f59b515eb87fd07e967c6d9715bd8a42..d4e087d1159cb7d03909aa50d51102521c7f8e9b 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi
@@ -11,6 +11,15 @@
        model = "Renesas Spider CPU board";
        compatible = "renesas,spider-cpu", "renesas,r8a779f0";
 
+       aliases {
+               serial0 = &scif3;
+               serial1 = &scif0;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        memory@48000000 {
                device_type = "memory";
                /* first 128MB is reserved for secure area. */

diff --git a/arch/arm64/boot/dts/renesas/r8a779f0-spider.dts b/arch/arm64/boot/dts/renesas/r8a779f0-spider.dts
index 7a7c8ffba7118a1f61bae97d6d5290ef0ae7602b..7aac3f4d319c330cf5e8ff570f66fa2bb808e876 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a779f0-spider.dts
+++ b/arch/arm64/boot/dts/renesas/r8a779f0-spider.dts
@@ -12,15 +12,6 @@
 / {
        model = "Renesas Spider CPU and Breakout boards based on r8a779f0";
        compatible = "renesas,spider-breakout", "renesas,spider-cpu", "renesas,r8a779f0";
-
-       aliases {
-               serial0 = &scif3;
-               serial1 = &scif0;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
 };
 
 &i2c4 {