arm64: dts: renesas: white-hawk: Move aliases and chosen

The serial console port on White Hawk is located on the CPU board.
Hence move the aliases and chosen nodes containing serial console
configuration from the main White Hawk DTS file to the DTS file that
describes the CPU board.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/b03b74f4b5ee3c3e828e753beb334ec43162c132.1662715538.git.geert+renesas@glider.be

diff --git a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi b/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi
index f2ad18912f83296a4bc532ed9be010e309e24c06..e382b2d5c8d49fd30f990b1b45dfa6e736b8db30 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi
@@ -15,6 +15,14 @@
        model = "Renesas White Hawk CPU board";
        compatible = "renesas,white-hawk-cpu", "renesas,r8a779g0";
 
+       aliases {
+               serial0 = &hscif0;
+       };
+
+       chosen {
+               stdout-path = "serial0:921600n8";
+       };
+
        keys {
                compatible = "gpio-keys";
 

diff --git a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts b/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts
index e8be90903081bb5dcbb497236b0c6f15377b6d6d..04a2b6b83e743f326c9b88d8c98c915175512254 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts
+++ b/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts
@@ -13,14 +13,6 @@
 / {
        model = "Renesas White Hawk CPU and Breakout boards based on r8a779g0";
        compatible = "renesas,white-hawk-breakout", "renesas,white-hawk-cpu", "renesas,r8a779g0";
-
-       aliases {
-               serial0 = &hscif0;
-       };
-
-       chosen {
-               stdout-path = "serial0:921600n8";
-       };
 };
 
 &i2c0 {