From 3252f85be0129364248e90ffea77c3ce5d1a4623 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Thu, 21 Sep 2023 07:46:59 -0400 Subject: [PATCH] arm64: dts: amlogic: meson-sm1-bananapi: add uart A and AO_B Signed-off-by: Patrick Yavitz --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9 +++++++++ .../boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 10 ++++++++++ arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 7 +++++++ 3 files changed, 26 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 88b848c65b0d..7e85b7dc356d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -1893,6 +1893,15 @@ mux { }; }; + uart_ao_b_pins: uart-b-ao { + mux { + groups = "uart_ao_b_tx_8", + "uart_ao_b_rx_9"; + function = "uart_ao_b"; + bias-disable; + }; + }; + uart_ao_a_cts_rts_pins: uart-ao-a-cts-rts { mux { groups = "uart_ao_a_cts", diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts index 586034316ec3..5ccdc91ac276 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts @@ -13,6 +13,10 @@ / { compatible = "bananapi,bpi-m2-pro", "amlogic,sm1"; model = "Banana Pi BPI-M2-PRO"; + aliases { + serial1 = &uart_A; + }; + sound { compatible = "amlogic,axg-sound-card"; model = "BPI-M2-PRO"; @@ -95,3 +99,9 @@ &tdmout_b { &tohdmitx { status = "okay"; }; + +&uart_A { + status = "disabled"; + pinctrl-names = "default"; + pinctrl-0 = <&uart_a_pins>; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi index ea4784a190da..4f7c11481133 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi @@ -26,6 +26,7 @@ key { aliases { serial0 = &uart_AO; + serial4 = &uart_AO_B; ethernet0 = ðmac; }; @@ -426,6 +427,12 @@ &uart_AO { pinctrl-names = "default"; }; +&uart_AO_B { + status = "disabled"; + pinctrl-0 = <&uart_ao_b_pins>; + pinctrl-names = "default"; +}; + &usb { status = "okay"; }; -- 2.39.2