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

Meson Bananapi: additions and modification

Browse Source 
BPI-CM4: Add support for the waveshare cm4-io-base-b
https://www.waveshare.com/wiki/CM4-IO-BASE-B

BPI-CM4: Enable usb support on waveshare baseboards via overlay

BPI-SM1: Removed UART_B overlay. Short of it being an available
option in the vendor kernel via overlay. I can not find any docs
to support why that is. I feel it is safer that we just remove it.

BPI-SM1: Add UART_A "pin-ctrl: cts rts"

Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
This commit is contained in:
Patrick Yavitz 2023-09-21 07:49:42 -04:00 committed by Igor
parent 0a2892aeba
commit f4507dceda
8 changed files with 267 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
patch/kernel/archive/meson64-6.1/add-board-waveshare-cm4-io-base-b.patch Normal file
View File

@ -0,0 +1,64 @@
From ae66ecb93473ab39aff1d838bf9a24dcc2da9157 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Thu, 21 Sep 2023 07:19:43 -0400
Subject: [PATCH] arch: arm64: dts: amlogic: meson-g12b-waveshare-cm4-io-base-b
https://www.waveshare.com/wiki/CM4-IO-BASE-B
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
arch/arm64/boot/dts/amlogic/Makefile | 1 +
.../meson-g12b-waveshare-cm4-io-base-b.dts | 29 +++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-waveshare-cm4-io-base-b.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index ba9d7292f4a3..8a90b7869878 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-bananapi-m2s.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-waveshare-cm4-io-base-b.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-waveshare-cm4-io-base-b.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-waveshare-cm4-io-base-b.dts
new file mode 100644
index 000000000000..3a65d7c9c1dc
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-waveshare-cm4-io-base-b.dts
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2023 Patrick Yavitz <pyavitz@xxxxx.com>
+ */
+
+/dts-v1/;
+
+#include "meson-g12b-bananapi-cm4-cm4io.dts"
+
+/ {
+ compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
+ model = "Waveshare CM4-IO-BASE-B with BPI-CM4 Module";
+
+ aliases {
+ rtc0 = &rtc;
+ };
+};
+
+&i2c1 {
+ rtc: rtc@51 {
+ compatible = "nxp,pcf85063a";
+ reg = <0x51>;
+ wakeup-source;
+ };
+};
+
+&usb {
+ dr_mode = "host";
+};
--
2.39.2

83
patch/kernel/archive/meson64-6.1/board-bananapism1-add-uart_AO_B-and-uart_B.patch → patch/kernel/archive/meson64-6.1/board-bananapism1-add-uart_A-and-AO_B.patch
View File

@ -1,13 +1,14 @@
From 34095f1211659968d5bbd935d451e966ebd76946 Mon Sep 17 00:00:00 2001
From 3252f85be0129364248e90ffea77c3ce5d1a4623 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
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 <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(+)
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
@ -29,51 +30,6 @@ index 88b848c65b0d..7e85b7dc356d 100644
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
From ce5cc12ce8e33f9089c2c9b6ab6deb7cf2759cb2 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Fri, 4 Aug 2023 05:36:52 -0400
Subject: [PATCH] arm64: dts: amlogic: meson-sm1-bananapi-m2-pro: add uart_A
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
.../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
@ -99,6 +55,31 @@ index 586034316ec3..5ccdc91ac276 100644
+ 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 = &ethmac;
};
@@ -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

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

@ -1,42 +1,34 @@
From 6179f0113224e7d4e87dfc741fa4033911f4282c Mon Sep 17 00:00:00 2001
From 4db87d7e0c989bc692926169a773dcc48fa9f88c Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Fri, 18 Aug 2023 11:22:03 -0400
Date: Thu, 21 Sep 2023 07:38:16 -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
meson-sm1-bananapi-uartAO_B.dtbo (serial 4)
meson-sm1-bananapi-uartB.dtbo (serial 2)
meson-sm1-bananapi-rtl8822cs.dtbo *
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
arch/arm64/boot/dts/amlogic/overlay/Makefile | 9 ++++++-
arch/arm64/boot/dts/amlogic/overlay/Makefile | 10 ++++++-
.../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 ++++++++++++++++
.../meson-g12b-waveshare-cm4-io-base-usb.dts | 20 ++++++++++++++
.../overlay/meson-sm1-bananapi-rtl8822cs.dts | 23 ++++++++++++++++
.../overlay/meson-sm1-bananapi-uartA.dts | 15 +++++++++++
.../overlay/meson-sm1-bananapi-uartAO_B.dts | 14 ++++++++++
.../overlay/meson-sm1-bananapi-uartB.dts | 15 +++++++++++
8 files changed, 150 insertions(+), 1 deletion(-)
.../meson-sm1-bananapi-uartA_cts_rts.dts | 17 ++++++++++++
9 files changed, 173 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-g12b-waveshare-cm4-io-base-usb.dts
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-rtl8822cs.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
create mode 100644 arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartA_cts_rts.dts
diff --git a/arch/arm64/boot/dts/amlogic/overlay/Makefile b/arch/arm64/boot/dts/amlogic/overlay/Makefile
index 9d5c727602d1..aa1be0fb1844 100644
index 9d5c727602d1..ea322cfee8c1 100644
--- a/arch/arm64/boot/dts/amlogic/overlay/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlay/Makefile
@@ -6,7 +6,14 @@ dtbo-$(CONFIG_ARCH_MESON) += \
@@ -6,7 +6,15 @@ dtbo-$(CONFIG_ARCH_MESON) += \
meson-uartC.dtbo \
meson-w1-gpio.dtbo \
meson-w1AB-gpio.dtbo \
@ -45,10 +37,11 @@ index 9d5c727602d1..aa1be0fb1844 100644
+ meson-g12a-radxa-zero-gpio-8-led.dtbo \
+ meson-g12a-radxa-zero-gpio-10-led.dtbo \
+ meson-g12b-odroid-n2-spi.dtbo \
+ meson-g12b-waveshare-cm4-io-base-usb.dtbo \
+ meson-sm1-bananapi-rtl8822cs.dtbo \
+ meson-sm1-bananapi-uartA.dtbo \
+ meson-sm1-bananapi-uartAO_B.dtbo \
+ meson-sm1-bananapi-uartB.dtbo
+ meson-sm1-bananapi-uartA_cts_rts.dtbo \
+ meson-sm1-bananapi-uartAO_B.dtbo
scr-$(CONFIG_ARCH_MESON) += \
meson-fixup.scr
@ -145,6 +138,32 @@ index 000000000000..658afb1fb58d
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-g12b-waveshare-cm4-io-base-usb.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-g12b-waveshare-cm4-io-base-usb.dts
new file mode 100644
index 000000000000..0516113267d3
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-g12b-waveshare-cm4-io-base-usb.dts
@@ -0,0 +1,20 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+ compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
+
+ fragment@0 {
+ target-path = "/";
+ __overlay__ {
+ model = "Waveshare CM4-IO Baseboard with BPI-CM4 Module";
+ };
+ };
+
+ fragment@1 {
+ target = <&usb>;
+ __overlay__ {
+ dr_mode = "host";
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-rtl8822cs.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-rtl8822cs.dts
new file mode 100644
index 000000000000..f9d014f03789
@ -215,12 +234,12 @@ index 000000000000..efac8a5140b3
+ };
+ };
+};
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
diff --git a/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartA_cts_rts.dts b/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartA_cts_rts.dts
new file mode 100644
index 000000000000..1b87cebbafdd
index 000000000000..40276d8e5f8f
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartB.dts
@@ -0,0 +1,15 @@
+++ b/arch/arm64/boot/dts/amlogic/overlay/meson-sm1-bananapi-uartA_cts_rts.dts
@@ -0,0 +1,17 @@
+/dts-v1/;
+/plugin/;
+
@ -228,10 +247,12 @@ index 000000000000..1b87cebbafdd
+ compatible = "bananapi,bpi-m5", "bananapi,bpi-m2-pro", "amlogic,sm1";
+
+ fragment@0 {
+ target = <&uart_B>;
+ target = <&uart_A>;
+
+ __overlay__ {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart_a_cts_rts_pins>;
+ };
+ };
+};

64
patch/kernel/archive/meson64-6.5/add-board-waveshare-cm4-io-base-b.patch Normal file
View File

@ -0,0 +1,64 @@
From 3e3978156fb2347e813ed8cc41d6be7fd1cd7cff Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Thu, 21 Sep 2023 07:29:08 -0400
Subject: [PATCH] arch: arm64: dts: amlogic: meson-g12b-waveshare-cm4-io-base-b
https://www.waveshare.com/wiki/CM4-IO-BASE-B
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
arch/arm64/boot/dts/amlogic/Makefile | 1 +
.../meson-g12b-waveshare-cm4-io-base-b.dts | 29 +++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-waveshare-cm4-io-base-b.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 6f61798a109f..9a9a754c77c7 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -23,6 +23,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-bananapi-m2s.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-waveshare-cm4-io-base-b.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-waveshare-cm4-io-base-b.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-waveshare-cm4-io-base-b.dts
new file mode 100644
index 000000000000..3a65d7c9c1dc
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-waveshare-cm4-io-base-b.dts
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2023 Patrick Yavitz <pyavitz@xxxxx.com>
+ */
+
+/dts-v1/;
+
+#include "meson-g12b-bananapi-cm4-cm4io.dts"
+
+/ {
+ compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
+ model = "Waveshare CM4-IO-BASE-B with BPI-CM4 Module";
+
+ aliases {
+ rtc0 = &rtc;
+ };
+};
+
+&i2c1 {
+ rtc: rtc@51 {
+ compatible = "nxp,pcf85063a";
+ reg = <0x51>;
+ wakeup-source;
+ };
+};
+
+&usb {
+ dr_mode = "host";
+};
--
2.39.2

89
patch/kernel/archive/meson64-6.5/board-bananapism1-add-uart_AO_B-and-uart_B.patch → patch/kernel/archive/meson64-6.5/board-bananapism1-add-uart_A-and-AO_B.patch
View File

@ -1,19 +1,20 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 3252f85be0129364248e90ffea77c3ce5d1a4623 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Wed, 2 Aug 2023 19:34:52 -0400
Subject: arm64: dts: amlogic: meson-sm1-bananapi: add uart AO_B and B
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 <pyavitz@xxxxx.com>
---
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9 ++++++
arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 14 ++++++++++
2 files changed, 23 insertions(+)
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 0c49655cc90c..016529233345 100644
index 88b848c65b0d..7e85b7dc356d 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 {
@@ -1893,6 +1893,15 @@ mux {
};
};
@ -29,51 +30,6 @@ index 0c49655cc90c..016529233345 100644
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";
};
--
Armbian
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Fri, 4 Aug 2023 05:42:36 -0400
Subject: arm64: dts: amlogic: meson-sm1-bananapi-m2-pro: add uart_A
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
---
arch/arm64/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
@ -99,6 +55,31 @@ index 586034316ec3..5ccdc91ac276 100644
+ 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 = &ethmac;
};
@@ -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";
};
--
Armbian
2.39.2

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

@ -10,10 +10,11 @@ dtbo-$(CONFIG_ARCH_MESON) += \
meson-g12a-radxa-zero-gpio-8-led.dtbo \
meson-g12a-radxa-zero-gpio-10-led.dtbo \
meson-g12b-odroid-n2-spi.dtbo \
meson-g12b-waveshare-cm4-io-base-usb.dtbo \
meson-sm1-bananapi-rtl8822cs.dtbo \
meson-sm1-bananapi-uartA.dtbo \
meson-sm1-bananapi-uartAO_B.dtbo \
meson-sm1-bananapi-uartB.dtbo
meson-sm1-bananapi-uartA_cts_rts.dtbo \
meson-sm1-bananapi-uartAO_B.dtbo
scr-$(CONFIG_ARCH_MESON) += \
meson-fixup.scr

20
patch/kernel/archive/meson64-6.5/overlay/meson-g12b-waveshare-cm4-io-base-usb.dts Normal file
View File

@ -0,0 +1,20 @@
/dts-v1/;
/plugin/;
/ {
compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
fragment@0 {
target-path = "/";
__overlay__ {
model = "Waveshare CM4-IO Baseboard with BPI-CM4 Module";
};
};
fragment@1 {
target = <&usb>;
__overlay__ {
dr_mode = "host";
};
};
};

4
patch/kernel/archive/meson64-6.5/overlay/meson-sm1-bananapi-uartB.dts → patch/kernel/archive/meson64-6.5/overlay/meson-sm1-bananapi-uartA_cts_rts.dts
View File

@ -5,10 +5,12 @@
compatible = "bananapi,bpi-m5", "bananapi,bpi-m2-pro", "amlogic,sm1";
fragment@0 {
target = <&uart_B>;
target = <&uart_A>;
__overlay__ {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&uart_a_cts_rts_pins>;
};
};
};