From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com>
Date: Thu, 21 Sep 2023 13:46:59 +0200
Subject: arm64: dts: amlogic: meson-sm1-bananapi: add uart A and AO_B

- rpardini: rebase on 6.11-rc7

Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
---
 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi         |  9 +++++++++
 arch/arm64/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 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -1922,6 +1922,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 111111111111..222222222222 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";
@@ -99,3 +103,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 111111111111..222222222222 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 @@ button-sw3 {
 
 	aliases {
 		serial0 = &uart_AO;
+		serial4 = &uart_AO_B;
 		ethernet0 = &ethmac;
 	};
 
@@ -424,6 +425,12 @@ &uart_AO {
 	pinctrl-names = "default";
 };
 
+&uart_AO_B {
+	status = "disabled";
+	pinctrl-0 = <&uart_ao_b_pins>;
+	pinctrl-names = "default";
+};
+
 &usb {
 	status = "okay";
 };
-- 
Armbian