arm64: dts: renesas: rzg3s-smarc: Fix the debug serial alias

The debug serial of the RZ/G3S is SCIF0 which is routed on the Renesas
RZ SMARC Carrier II board on the SER3_UART. Use serial3 alias for it for
better hardware description. Along with it, the chosen properties were
moved to the device tree corresponding to the RZ SMARC Carrier II board.

Fixes: adb4f0c5699c ("arm64: dts: renesas: Add initial support for RZ/G3S SMARC SoM")
Fixes: d1ae4200bb26 ("arm64: dts: renesas: Add initial device tree for RZ SMARC Carrier-II Board")
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/20241115134401.3893008-6-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi b/arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi
index 2ed01d391554b559b405705c0f0987e7dc491929..55c72c8a07350800b700f51bbaa9ab2eab84eee8 100644 (file)
--- a/arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi
+++ b/arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi
@@ -43,11 +43,6 @@
 #endif
        };
 
-       chosen {
-               bootargs = "ignore_loglevel";
-               stdout-path = "serial0:115200n8";
-       };
-
        memory@48000000 {
                device_type = "memory";
                /* First 128MB is reserved for secure area. */

diff --git a/arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi b/arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi
index 4509151344c430de9a24ea015ebef09e003c90cc..33b9873b225a822cd2fa74ccdbb0135854947000 100644 (file)
--- a/arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi
+++ b/arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi
@@ -12,10 +12,15 @@
 / {
        aliases {
                i2c0 = &i2c0;
-               serial0 = &scif0;
+               serial3 = &scif0;
                mmc1 = &sdhi1;
        };
 
+       chosen {
+               bootargs = "ignore_loglevel";
+               stdout-path = "serial3:115200n8";
+       };
+
        keys {
                compatible = "gpio-keys";