Qubot/armbian-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve bananapi-sm1 support (#5553)

Browse Source 
Linux 6.1 (current) / 6.4 (edge)

Add "current" to: config/boards/bananapim2pro.csc
Add uart_AO_B and uart_B to: meson-sm1-bananapi.dtsi
Add related pins to: meson-g12-common.dtsi
add wif/bt support to: meson-sm1-bananapi-m5.dts (BT = uart_A)
Add the ability to enable via overlays

NOTE: The overlay to enable the wifi on the BPI-M5 will be added
at a later date.

Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
Co-authored-by: Patrick Yavitz <pyavitz@xxxxx.com>
This commit is contained in:
c0rnelius 2023-08-03 14:01:15 -04:00 committed by GitHub
parent 154fdb83f9
commit 9b04e0faf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 532 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/boards/bananapim2pro.csc
View File

@ -4,7 +4,7 @@ BOARDFAMILY="meson-sm1"
BOARD_MAINTAINER=""
BOOTCONFIG="bananapi-m5_defconfig" # u-boot is still shared betwen m5 and m2pro
BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m2-pro.dtb"
KERNEL_TARGET="edge" # current does not carry the DTB yet; @TODO re-add when 6.2+ is current for meson64
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"
SERIALCON="ttyAML0"
BOOT_LOGO="desktop"

112
patch/kernel/archive/meson64-6.1/board-bananapim5-005-add-wifi-bt-support.patch Normal file
View File

@ -0,0 +1,112 @@
From ea805f1a15ff797f935bba6b7bd7fb995b81ed4f Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Wed, 2 Aug 2023 19:28:24 -0400
Subject: [PATCH] arch: arm64: dts: amlogic: add wifi/bt support to bananapi m5
The BPI-M5 has an optional RTL8822CS WiFi/BT mezzanine board. Describe
the board but mark the sd_emmc_a and uart_A nodes disabled so they can
be enabled via overlay or fdtput when the board is connected.
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
.../dts/amlogic/meson-sm1-bananapi-m5.dts | 66 ++++++++++++++++++-
1 file changed, 65 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
index f045bf851638..5f6071ee84a6 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
@@ -25,6 +25,20 @@ cvbs_connector_in: endpoint {
};
};
+ sdio_pwrseq: sdio-pwrseq {
+ compatible = "mmc-pwrseq-simple";
+ reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
+ clocks = <&wifi32k>;
+ clock-names = "ext_clock";
+ };
+
+ wifi32k: wifi32k {
+ compatible = "pwm-clock";
+ #clock-cells = <0>;
+ clock-frequency = <32768>;
+ pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
+ };
+
sound {
compatible = "amlogic,axg-sound-card";
model = "BPI-M5";
@@ -149,7 +163,6 @@ &acodec {
status = "okay";
};
-
&clkc_audio {
status = "okay";
};
@@ -172,6 +185,42 @@ &frddr_c {
status = "okay";
};
+&pwm_ef {
+ status = "okay";
+ pinctrl-0 = <&pwm_e_pins>;
+ pinctrl-names = "default";
+};
+
+/* SDIO */
+&sd_emmc_a {
+ /* enable if WiFi/BT board connected */
+ status = "disabled";
+ pinctrl-0 = <&sdio_pins>;
+ pinctrl-1 = <&sdio_clk_gate_pins>;
+ pinctrl-names = "default", "clk-gate";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ bus-width = <4>;
+ sd-uhs-sdr104;
+ max-frequency = <50000000>;
+
+ non-removable;
+ disable-wp;
+
+ /* WiFi firmware requires power in suspend */
+ keep-power-in-suspend;
+
+ mmc-pwrseq = <&sdio_pwrseq>;
+
+ vmmc-supply = <&vddao_3v3>;
+ vqmmc-supply = <&vddao_1v8>;
+
+ rtl8822cs: wifi@1 {
+ reg = <1>;
+ };
+};
+
&tdmif_b {
status = "okay";
};
@@ -219,3 +268,18 @@ &toddr_b {
&toddr_c {
status = "okay";
};
+
+&uart_A {
+ /* enable if WiFi/BT board connected */
+ status = "disabled";
+ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
+ pinctrl-names = "default";
+ uart-has-rtscts;
+
+ bluetooth {
+ compatible = "realtek,rtl8822cs-bt";
+ enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
+ host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
+ device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
+ };
+};
--
2.39.2

66
patch/kernel/archive/meson64-6.1/board-bananapism1-add-uart_AO_B-and-uart_B.patch Normal file
View File

@ -0,0 +1,66 @@
From 34095f1211659968d5bbd935d451e966ebd76946 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Wed, 2 Aug 2023 19:25:17 -0400
Subject: [PATCH] arm64: dts: amlogic: meson-sm1-bananapi: add uart AO_B and B
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
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 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.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
index ea4784a190da..7072d0e7bd4a 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 @@ key {
aliases {
serial0 = &uart_AO;
+ serial2 = &uart_B;
+ serial4 = &uart_AO_B;
ethernet0 = &ethmac;
};
@@ -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

89
patch/kernel/archive/meson64-6.1/general-xtra-meson64-overlays.patch
View File

@ -1,28 +1,38 @@
From aaecedc8d3a92722755c264fd5c75740b5f5136f Mon Sep 17 00:00:00 2001
From fc6857f815ed8454f16da6b273dc5026cd9c769c Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Sat, 29 Jul 2023 06:52:56 -0400
Date: Wed, 2 Aug 2023 07:51:52 -0400
Subject: [PATCH] general: extra: meson64 overlays
meson-g12a-radxa-zero-gpio-10-led.dtbo (rev 1.51 enable led)
meson-g12a-radxa-zero-gpio-8-led.dtbo (rev 1.4 enable led)
meson-g12b-odroid-n2-spi.dtbo (SPI-NOR enable via overlay)
meson-sm1-bananapi-uartA.dtbo (bpi-m5 bluetooth) *
meson-sm1-bananapi-uartAO_B.dtbo (serial 4) *
meson-sm1-bananapi-uartB.dtbo (serial 2) *
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
arch/arm64/boot/dts/amlogic/overlay/Makefile | 5 +++-
arch/arm64/boot/dts/amlogic/overlay/Makefile | 8 +++++-
.../meson-g12a-radxa-zero-gpio-10-led.dts | 26 +++++++++++++++++++
.../meson-g12a-radxa-zero-gpio-8-led.dts | 26 +++++++++++++++++++
.../overlay/meson-g12b-odroid-n2-spi.dts | 23 ++++++++++++++++
4 files changed, 79 insertions(+), 1 deletion(-)
.../overlay/meson-sm1-bananapi-uartA.dts | 15 +++++++++++
.../overlay/meson-sm1-bananapi-uartAO_B.dts | 14 ++++++++++
.../overlay/meson-sm1-bananapi-uartB.dts | 15 +++++++++++
7 files changed, 126 insertions(+), 1 deletion(-)
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-g12a-radxa-zero-gpio-10-led.dts
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-g12a-radxa-zero-gpio-8-led.dts
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-g12b-odroid-n2-spi.dts
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartA.dts
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartAO_B.dts
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartB.dts
diff --git a/arch/arm64/boot/dts/amlogic/overlay/Makefile b/arch/arm64/boot/dts/amlogic/overlay/Makefile
index 9d5c727602d1..4511a76d483c 100644
index 9d5c727602d1..8db9145ac471 100644
--- a/arch/arm64/boot/dts/amlogic/overlay/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlay/Makefile
@@ -6,7 +6,10 @@ dtbo-$(CONFIG_ARCH_MESON) += \
@@ -6,7 +6,13 @@ dtbo-$(CONFIG_ARCH_MESON) += \
meson-uartC.dtbo \
meson-w1-gpio.dtbo \
meson-w1AB-gpio.dtbo \
@ -30,7 +40,10 @@ index 9d5c727602d1..4511a76d483c 100644
+ meson-g12-gxl-cma-pool-896MB.dtbo \
+ meson-g12a-radxa-zero-gpio-8-led.dtbo \
+ meson-g12a-radxa-zero-gpio-10-led.dtbo \
+ meson-g12b-odroid-n2-spi.dtbo
+ meson-g12b-odroid-n2-spi.dtbo \
+ meson-sm1-bananapi-uartA.dtbo \
+ meson-sm1-bananapi-uartAO_B.dtbo \
+ meson-sm1-bananapi-uartB.dtbo
scr-$(CONFIG_ARCH_MESON) += \
meson-fixup.scr
@ -127,6 +140,68 @@ index 000000000000..658afb1fb58d
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartA.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartA.dts
new file mode 100644
index 000000000000..ea2f401786e6
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartA.dts
@@ -0,0 +1,15 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+ compatible = "bananapi,bpi-m5", "amlogic,sm1";
+
+ fragment@0 {
+ target = <&uart_A>;
+
+ __overlay__ {
+ status = "okay";
+ };
+ };
+};
+
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartAO_B.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartAO_B.dts
new file mode 100644
index 000000000000..efac8a5140b3
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartAO_B.dts
@@ -0,0 +1,14 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+ compatible = "bananapi,bpi-m5", "bananapi,bpi-m2-pro", "amlogic,sm1";
+
+ fragment@0 {
+ target = <&uart_AO_B>;
+
+ __overlay__ {
+ status = "okay";
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartB.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartB.dts
new file mode 100644
index 000000000000..1b87cebbafdd
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartB.dts
@@ -0,0 +1,15 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+ compatible = "bananapi,bpi-m5", "bananapi,bpi-m2-pro", "amlogic,sm1";
+
+ fragment@0 {
+ target = <&uart_B>;
+
+ __overlay__ {
+ status = "okay";
+ };
+ };
+};
+
--
2.39.2

45
patch/kernel/archive/meson64-6.4/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch Normal file
View File

@ -0,0 +1,45 @@
From 62f0db8b473e4746fb1790c9598def7f9de70b13 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Sat, 11 Feb 2023 18:30:00 +0100
Subject: [PATCH] BananaPi M5: 270 clock phase, via amlogic,mmc-phase
Rework of Ricardo Pardini <ricardo@pardini.net> patch.
Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
---
arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
index c914f1148..ea4784a19 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
@@ -8,6 +8,7 @@
#include <dt-bindings/leds/common.h>
#include <dt-bindings/input/linux-event-codes.h>
#include <dt-bindings/gpio/meson-g12a-gpio.h>
+#include <dt-bindings/mmc/meson-gx-mmc.h>
/ {
adc_keys {
@@ -394,6 +395,8 @@ &sd_emmc_b {
cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
vmmc-supply = <&tflash_vdd>;
vqmmc-supply = <&vddio_c>;
+
+ amlogic,mmc-phase = <CLK_PHASE_270 CLK_PHASE_0 CLK_PHASE_0>;
};
/* eMMC */
@@ -413,6 +416,8 @@ &sd_emmc_c {
mmc-pwrseq = <&emmc_pwrseq>;
vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&emmc_1v8>;
+
+ amlogic,mmc-phase = <CLK_PHASE_270 CLK_PHASE_0 CLK_PHASE_0>;
};
&uart_AO {
--
Created with Armbian build tools https://github.com/armbian/build

112
patch/kernel/archive/meson64-6.4/board-bananapim5-002-add-wifi-bt-support.patch Normal file
View File

@ -0,0 +1,112 @@
From 443731c57bc7e26912f02ffa65c216a3a9f06b88 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Wed, 2 Aug 2023 19:36:07 -0400
Subject: [PATCH] arch: arm64: dts: amlogic: add wifi/bt support to bananapi m5
The BPI-M5 has an optional RTL8822CS WiFi/BT mezzanine board. Describe
the board but mark the sd_emmc_a and uart_A nodes disabled so they can
be enabled via overlay or fdtput when the board is connected.
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
.../dts/amlogic/meson-sm1-bananapi-m5.dts | 66 ++++++++++++++++++-
1 file changed, 65 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
index f045bf851638..5f6071ee84a6 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
@@ -25,6 +25,20 @@ cvbs_connector_in: endpoint {
};
};
+ sdio_pwrseq: sdio-pwrseq {
+ compatible = "mmc-pwrseq-simple";
+ reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
+ clocks = <&wifi32k>;
+ clock-names = "ext_clock";
+ };
+
+ wifi32k: wifi32k {
+ compatible = "pwm-clock";
+ #clock-cells = <0>;
+ clock-frequency = <32768>;
+ pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
+ };
+
sound {
compatible = "amlogic,axg-sound-card";
model = "BPI-M5";
@@ -149,7 +163,6 @@ &acodec {
status = "okay";
};
-
&clkc_audio {
status = "okay";
};
@@ -172,6 +185,42 @@ &frddr_c {
status = "okay";
};
+&pwm_ef {
+ status = "okay";
+ pinctrl-0 = <&pwm_e_pins>;
+ pinctrl-names = "default";
+};
+
+/* SDIO */
+&sd_emmc_a {
+ /* enable if WiFi/BT board connected */
+ status = "disabled";
+ pinctrl-0 = <&sdio_pins>;
+ pinctrl-1 = <&sdio_clk_gate_pins>;
+ pinctrl-names = "default", "clk-gate";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ bus-width = <4>;
+ sd-uhs-sdr104;
+ max-frequency = <50000000>;
+
+ non-removable;
+ disable-wp;
+
+ /* WiFi firmware requires power in suspend */
+ keep-power-in-suspend;
+
+ mmc-pwrseq = <&sdio_pwrseq>;
+
+ vmmc-supply = <&vddao_3v3>;
+ vqmmc-supply = <&vddao_1v8>;
+
+ rtl8822cs: wifi@1 {
+ reg = <1>;
+ };
+};
+
&tdmif_b {
status = "okay";
};
@@ -219,3 +268,18 @@ &toddr_b {
&toddr_c {
status = "okay";
};
+
+&uart_A {
+ /* enable if WiFi/BT board connected */
+ status = "disabled";
+ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
+ pinctrl-names = "default";
+ uart-has-rtscts;
+
+ bluetooth {
+ compatible = "realtek,rtl8822cs-bt";
+ enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
+ host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
+ device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
+ };
+};
--
2.39.2

41
patch/kernel/archive/meson64-6.4/board-bananapim5-sd-use-270-mmc-clock-phase-via-dt.patch
View File

@ -1,41 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Mon, 9 Jan 2023 02:18:23 +0100
Subject: BananaPi M5: 270 clock phase, via amlogic,mmc-phase
BananaPi M5: 270 clock phase, via amlogic,mmc-phase
- rpardini: adapted for 6.4
---
arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 12 ++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
index f045bf851638..0c261b12ed8b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
@@ -9,6 +9,7 @@
#include "meson-sm1-bananapi.dtsi"
#include <dt-bindings/sound/meson-g12a-toacodec.h>
#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
+#include <dt-bindings/mmc/meson-gx-mmc.h>
/ {
compatible = "bananapi,bpi-m5", "amlogic,sm1";
@@ -219,3 +220,14 @@ &toddr_b {
&toddr_c {
status = "okay";
};
+
+/* SD card */
+&sd_emmc_b {
+ amlogic,mmc-phase = <CLK_PHASE_270 CLK_PHASE_0 CLK_PHASE_0>;
+};
+
+/* eMMC */
+&sd_emmc_c {
+ amlogic,mmc-phase = <CLK_PHASE_270 CLK_PHASE_0 CLK_PHASE_0>;
+};
+
--
Armbian

66
patch/kernel/archive/meson64-6.4/board-bananapism1-add-uart_AO_B-and-uart_B.patch Normal file
View File

@ -0,0 +1,66 @@
From 1f5b51a34ddd518703aabd84b1bbf435a4bd7512 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
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 <pyavitz@xxxxx.com>
---
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 = &ethmac;
};
@@ -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

5
patch/kernel/archive/meson64-6.4/overlay/Makefile
View File

@ -9,7 +9,10 @@ dtbo-$(CONFIG_ARCH_MESON) += \
meson-g12-gxl-cma-pool-896MB.dtbo \
meson-g12a-radxa-zero-gpio-8-led.dtbo \
meson-g12a-radxa-zero-gpio-10-led.dtbo \
meson-g12b-odroid-n2-spi.dtbo
meson-g12b-odroid-n2-spi.dtbo \
meson-sm1-bananapi-uartA.dtbo \
meson-sm1-bananapi-uartAO_B.dtbo \
meson-sm1-bananapi-uartB.dtbo
scr-$(CONFIG_ARCH_MESON) += \
meson-fixup.scr

15
patch/kernel/archive/meson64-6.4/overlay/meson-sm1-bananapi-uartA.dts Normal file
View File

@ -0,0 +1,15 @@
/dts-v1/;
/plugin/;
/ {
compatible = "bananapi,bpi-m5", "amlogic,sm1";
fragment@0 {
target = <&uart_A>;
__overlay__ {
status = "okay";
};
};
};

14
patch/kernel/archive/meson64-6.4/overlay/meson-sm1-bananapi-uartAO_B.dts Normal file
View File

@ -0,0 +1,14 @@
/dts-v1/;
/plugin/;
/ {
compatible = "bananapi,bpi-m5", "bananapi,bpi-m2-pro", "amlogic,sm1";
fragment@0 {
target = <&uart_AO_B>;
__overlay__ {
status = "okay";
};
};
};

15
patch/kernel/archive/meson64-6.4/overlay/meson-sm1-bananapi-uartB.dts Normal file
View File

@ -0,0 +1,15 @@
/dts-v1/;
/plugin/;
/ {
compatible = "bananapi,bpi-m5", "bananapi,bpi-m2-pro", "amlogic,sm1";
fragment@0 {
target = <&uart_B>;
__overlay__ {
status = "okay";
};
};
};