From 1f5b51a34ddd518703aabd84b1bbf435a4bd7512 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Wed, 2 Aug 2023 19:34:52 -0400 Subject: [PATCH] arm64: dts: amlogic: meson-sm1-bananapi: add uart AO_B and B Signed-off-by: Patrick Yavitz --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9 +++++++++ .../arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 0c49655cc90c..016529233345 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -1899,6 +1899,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.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi index 7e80151874f1..e42c35868fc7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi @@ -26,6 +26,8 @@ button-sw3 { aliases { serial0 = &uart_AO; + serial2 = &uart_B; + serial4 = &uart_AO_B; ethernet0 = ðmac; }; @@ -426,6 +428,18 @@ &uart_AO { pinctrl-names = "default"; }; +&uart_AO_B { + status = "disabled"; + pinctrl-0 = <&uart_ao_b_pins>; + pinctrl-names = "default"; +}; + +&uart_B { + status = "disabled"; + pinctrl-0 = <&uart_b_pins>; + pinctrl-names = "default"; +}; + &usb { status = "okay"; }; -- 2.39.2 From 5011768f6f31aa33ce3fcd65d14778fc17fe256c Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Fri, 4 Aug 2023 05:42:36 -0400 Subject: [PATCH] arm64: dts: amlogic: meson-sm1-bananapi-m2-pro: add uart_A Signed-off-by: Patrick Yavitz --- .../boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 10 ++++++++++ 1 file changed, 10 insertions(+) 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>; +}; -- 2.39.2