From 552281489ac950589df232e37b7aeb752717f468 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Mon, 16 Sep 2024 09:05:47 -0400 Subject: [PATCH] Move `serial0 = &uart_AO;` to meson-axg-amper-gateway-gz80x.dtsi Signed-off-by: Patrick Yavitz --- .../meson64-6.11/dt/meson-axg-amper-gateway-am-gz80x.dts | 1 - .../meson64-6.11/dt/meson-axg-amper-gateway-gz80x.dtsi | 4 ++++ .../meson64-6.6/dt/meson-axg-amper-gateway-am-gz80x.dts | 1 - .../archive/meson64-6.6/dt/meson-axg-amper-gateway-gz80x.dtsi | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/patch/kernel/archive/meson64-6.11/dt/meson-axg-amper-gateway-am-gz80x.dts b/patch/kernel/archive/meson64-6.11/dt/meson-axg-amper-gateway-am-gz80x.dts index 221ffa88afb8..57c9b607f0ae 100644 --- a/patch/kernel/archive/meson64-6.11/dt/meson-axg-amper-gateway-am-gz80x.dts +++ b/patch/kernel/archive/meson64-6.11/dt/meson-axg-amper-gateway-am-gz80x.dts @@ -12,7 +12,6 @@ model = "Amper Gateway AM-GZ80x"; aliases { - serial0 = &uart_AO; serial1 = &uart_B; serial2 = &uart_AO_B; ethernet0 = ðmac; diff --git a/patch/kernel/archive/meson64-6.11/dt/meson-axg-amper-gateway-gz80x.dtsi b/patch/kernel/archive/meson64-6.11/dt/meson-axg-amper-gateway-gz80x.dtsi index 57390ea6af81..951446925c74 100644 --- a/patch/kernel/archive/meson64-6.11/dt/meson-axg-amper-gateway-gz80x.dtsi +++ b/patch/kernel/archive/meson64-6.11/dt/meson-axg-amper-gateway-gz80x.dtsi @@ -11,6 +11,10 @@ #include / { + aliases { + serial0 = &uart_AO; + }; + chosen { stdout-path = "serial0:115200n8"; }; diff --git a/patch/kernel/archive/meson64-6.6/dt/meson-axg-amper-gateway-am-gz80x.dts b/patch/kernel/archive/meson64-6.6/dt/meson-axg-amper-gateway-am-gz80x.dts index 221ffa88afb8..57c9b607f0ae 100644 --- a/patch/kernel/archive/meson64-6.6/dt/meson-axg-amper-gateway-am-gz80x.dts +++ b/patch/kernel/archive/meson64-6.6/dt/meson-axg-amper-gateway-am-gz80x.dts @@ -12,7 +12,6 @@ model = "Amper Gateway AM-GZ80x"; aliases { - serial0 = &uart_AO; serial1 = &uart_B; serial2 = &uart_AO_B; ethernet0 = ðmac; diff --git a/patch/kernel/archive/meson64-6.6/dt/meson-axg-amper-gateway-gz80x.dtsi b/patch/kernel/archive/meson64-6.6/dt/meson-axg-amper-gateway-gz80x.dtsi index 57390ea6af81..951446925c74 100644 --- a/patch/kernel/archive/meson64-6.6/dt/meson-axg-amper-gateway-gz80x.dtsi +++ b/patch/kernel/archive/meson64-6.6/dt/meson-axg-amper-gateway-gz80x.dtsi @@ -11,6 +11,10 @@ #include / { + aliases { + serial0 = &uart_AO; + }; + chosen { stdout-path = "serial0:115200n8"; };