From 8e8cb150352b2c0caf2a9d2f64718ef266413f72 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Tue, 7 Jan 2025 07:05:01 -0500 Subject: [PATCH] BananaPi BPI-M4-Zero: REV1 uart1 support via overlay Signed-off-by: Patrick Yavitz --- .../Add-BananaPi-BPI-M4-Zero-overlays.patch | 137 ++++++++++++++---- .../Add-board-BananaPi-BPI-M4-Zero.patch | 56 ++++--- .../Add-BananaPi-BPI-M4-Zero-overlays.patch | 137 ++++++++++++++---- .../Add-board-BananaPi-BPI-M4-Zero.patch | 56 ++++--- 4 files changed, 260 insertions(+), 126 deletions(-) diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch index 873189eea3..374cfc9c1d 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch @@ -1,33 +1,49 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From dfee1d3e9957e15537f3b05e13e6970eeaccfe94 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz -Date: Thu, 12 Dec 2024 06:53:20 -0500 -Subject: Add BananaPi BPI-M4-Zero overlays +Date: Tue, 7 Jan 2025 06:39:30 -0500 +Subject: [PATCH] Add BananaPi BPI-M4-Zero overlays Signed-off-by: Patrick Yavitz --- - arch/arm64/boot/dts/allwinner/overlay/Makefile | 11 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso | 13 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso | 13 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso | 13 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso | 13 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtso | 16 +++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso | 13 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso | 13 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso | 29 +++++++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso | 32 ++++++++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso | 24 +++++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso | 13 ++++ - 12 files changed, 203 insertions(+) + .../arm64/boot/dts/allwinner/overlay/Makefile | 13 ++++++ + ...sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso | 13 ++++++ + ...sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso | 13 ++++++ + .../sun50i-h616-bananapi-m4-pg-6-7-uart1.dtso | 13 ++++++ + ...h616-bananapi-m4-pg-8-9-rts-cts-uart1.dtso | 16 +++++++ + .../sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso | 13 ++++++ + ...un50i-h616-bananapi-m4-pi-13-14-uart4.dtso | 13 ++++++ + ...16-bananapi-m4-pi-15-16-rts-cts-uart4.dtso | 16 +++++++ + .../sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso | 13 ++++++ + .../sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso | 13 ++++++ + .../sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso | 44 +++++++++++++++++++ + ...-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso | 32 ++++++++++++++ + ...n50i-h616-bananapi-m4-spi1-cs0-spidev.dtso | 24 ++++++++++ + ...n50i-h616-bananapi-m4-spi1-cs1-spidev.dtso | 13 ++++++ + 14 files changed, 249 insertions(+) + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-6-7-uart1.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-8-9-rts-cts-uart1.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso diff --git a/arch/arm64/boot/dts/allwinner/overlay/Makefile b/arch/arm64/boot/dts/allwinner/overlay/Makefile -index 111111111111..222222222222 100644 +index 24383cb63770..16c739b56350 100644 --- a/arch/arm64/boot/dts/allwinner/overlay/Makefile +++ b/arch/arm64/boot/dts/allwinner/overlay/Makefile -@@ -49,6 +49,17 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ +@@ -49,6 +49,19 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ sun50i-h6-uart2.dtbo \ sun50i-h6-uart3.dtbo \ sun50i-h6-w1-gpio.dtbo \ -+ sun50i-h616-bananapi-m4-sdio-wifi-bt.dtbo \ ++ sun50i-h616-bananapi-m4-pg-6-7-uart1.dtbo \ ++ sun50i-h616-bananapi-m4-pg-8-9-rts-cts-uart1.dtbo \ + sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtbo \ + sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtbo \ + sun50i-h616-bananapi-m4-ph-2-3-uart5.dtbo \ @@ -35,6 +51,7 @@ index 111111111111..222222222222 100644 + sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtbo \ + sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtbo \ + sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtbo \ ++ sun50i-h616-bananapi-m4-sdio-wifi-bt.dtbo \ + sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtbo \ + sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtbo \ + sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtbo \ @@ -43,7 +60,7 @@ index 111111111111..222222222222 100644 sun50i-h616-i2c4-ph.dtbo \ diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..4e78aa8f1f27 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso @@ -0,0 +1,13 @@ @@ -62,7 +79,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..3419eee0b70b --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso @@ -0,0 +1,13 @@ @@ -79,9 +96,50 @@ index 000000000000..111111111111 + }; + }; +}; +diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-6-7-uart1.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-6-7-uart1.dtso +new file mode 100644 +index 000000000000..7001781f42d2 +--- /dev/null ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-6-7-uart1.dtso +@@ -0,0 +1,13 @@ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "sinovoip,bpi-m4-zero", "allwinner,sun50i-h616", "allwinner,sun50i-h618"; ++ ++ fragment@0 { ++ target = <&uart1>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++}; +diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-8-9-rts-cts-uart1.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-8-9-rts-cts-uart1.dtso +new file mode 100644 +index 000000000000..1317a9b3b52f +--- /dev/null ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-8-9-rts-cts-uart1.dtso +@@ -0,0 +1,16 @@ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "sinovoip,bpi-m4-zero", "allwinner,sun50i-h616", "allwinner,sun50i-h618"; ++ ++ fragment@0 { ++ target = <&uart1>; ++ __overlay__ { ++ status = "okay"; ++ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ }; ++ }; ++}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..aaa96e46d708 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso @@ -0,0 +1,13 @@ @@ -100,7 +158,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..0373f7d25449 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso @@ -0,0 +1,13 @@ @@ -119,7 +177,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..ef9394c8519c --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtso @@ -0,0 +1,16 @@ @@ -141,7 +199,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..60c75e4d61b5 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso @@ -0,0 +1,13 @@ @@ -160,7 +218,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..99c7e2b8c5f6 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso @@ -0,0 +1,13 @@ @@ -179,13 +237,15 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..307f6e5e921c --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso -@@ -0,0 +1,29 @@ +@@ -0,0 +1,44 @@ +/dts-v1/; +/plugin/; + ++#include ++ +/ { + compatible = "sinovoip,bpi-m4-zero", "allwinner,sun50i-h616", "allwinner,sun50i-h618"; + @@ -209,12 +269,25 @@ index 000000000000..111111111111 + target = <&uart1>; + __overlay__ { + status = "okay"; ++ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ bluetooth { ++ compatible = "brcm,bcm43540-bt"; ++ host-wakeup-gpios = <&pio 6 16 GPIO_ACTIVE_HIGH>; ++ device-wakeup-gpios = <&pio 6 17 GPIO_ACTIVE_HIGH>; ++ shutdown-gpios = <&pio 6 19 GPIO_ACTIVE_HIGH>; ++ max-speed = <1500000>; ++ vbat-supply = <®_vcc3v3>; ++ vddio-supply = <®_vcc1v8>; ++ }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..7fa3b94bcc8d --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso @@ -0,0 +1,32 @@ @@ -252,7 +325,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..fef73f1afa52 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso @@ -0,0 +1,24 @@ @@ -282,7 +355,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..840357f2e9e0 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso @@ -0,0 +1,13 @@ @@ -300,5 +373,5 @@ index 000000000000..111111111111 + }; +}; -- -Armbian +2.39.5 diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-board-BananaPi-BPI-M4-Zero.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-board-BananaPi-BPI-M4-Zero.patch index acabba92f1..13dd76c5f9 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-board-BananaPi-BPI-M4-Zero.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/Add-board-BananaPi-BPI-M4-Zero.patch @@ -1,20 +1,22 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 0db8b2bef6fdd2bda67296809de46ad57e08ab00 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz -Date: Thu, 12 Dec 2024 06:51:36 -0500 -Subject: Add board BananaPi BPI-M4-Zero +Date: Tue, 7 Jan 2025 06:58:55 -0500 +Subject: [PATCH] Add board BananaPi BPI-M4-Zero Signed-off-by: Patrick Yavitz --- - arch/arm64/boot/dts/allwinner/Makefile | 1 + - arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts | 126 +++++ - arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi | 248 ++++++++++ - 3 files changed, 375 insertions(+) + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../sun50i-h618-bananapi-m4-zero.dts | 110 ++++++++ + .../allwinner/sun50i-h618-bananapi-m4.dtsi | 256 ++++++++++++++++++ + 3 files changed, 367 insertions(+) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile -index 111111111111..222222222222 100644 +index 87ecd81bcb9f..0a206c422625 100644 --- a/arch/arm64/boot/dts/allwinner/Makefile +++ b/arch/arm64/boot/dts/allwinner/Makefile -@@ -59,6 +59,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-emmc.dtb +@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-emmc.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-pi.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-x96-mate.dtb @@ -24,10 +26,10 @@ index 111111111111..222222222222 100644 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero3.dtb diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts new file mode 100644 -index 000000000000..111111111111 +index 000000000000..73da25a79fdd --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts -@@ -0,0 +1,126 @@ +@@ -0,0 +1,110 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2024 Patrick Yavitz @@ -95,6 +97,7 @@ index 000000000000..111111111111 + }; +}; + ++/* SDIO */ +&mmc1 { + status = "disabled"; + bus-width = <4>; @@ -129,23 +132,6 @@ index 000000000000..111111111111 + status = "okay"; +}; + -+&uart1 { -+ status = "disabled"; -+ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; -+ pinctrl-names = "default"; -+ uart-has-rtscts; -+ -+ bluetooth { -+ compatible = "brcm,bcm43540-bt"; -+ host-wakeup-gpios = <&pio 6 16 GPIO_ACTIVE_HIGH>; -+ device-wakeup-gpios = <&pio 6 17 GPIO_ACTIVE_HIGH>; -+ shutdown-gpios = <&pio 6 19 GPIO_ACTIVE_HIGH>; -+ max-speed = <1500000>; -+ vbat-supply = <®_vcc3v3>; -+ vddio-supply = <®_vcc1v8>; -+ }; -+}; -+ +&usbotg { + status = "okay"; + dr_mode = "peripheral"; @@ -156,10 +142,10 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi new file mode 100644 -index 000000000000..111111111111 +index 000000000000..32359f169124 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi -@@ -0,0 +1,248 @@ +@@ -0,0 +1,256 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2024 Patrick Yavitz @@ -295,6 +281,7 @@ index 000000000000..111111111111 + pinctrl-names = "default"; +}; + ++/* SD card */ +&mmc0 { + status = "okay"; + bus-width = <4>; @@ -306,6 +293,7 @@ index 000000000000..111111111111 + vmmc-supply = <®_vcc3v3>; +}; + ++/* eMMC */ +&mmc2 { + status = "okay"; + bus-width = <8>; @@ -397,6 +385,12 @@ index 000000000000..111111111111 + pinctrl-names = "default"; +}; + ++&uart1 { ++ status = "disabled"; ++ pinctrl-0 = <&uart1_pins>; ++ pinctrl-names = "default"; ++}; ++ +&uart4 { + status = "disabled"; + pinctrl-0 = <&uart4_pi_pins>; @@ -409,5 +403,5 @@ index 000000000000..111111111111 + pinctrl-names = "default"; +}; -- -Armbian +2.39.5 diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch index b64114959a..374cfc9c1d 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch @@ -1,33 +1,49 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From dfee1d3e9957e15537f3b05e13e6970eeaccfe94 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz -Date: Wed, 11 Dec 2024 12:23:10 -0500 -Subject: Add BananaPi BPI-M4-Zero overlays +Date: Tue, 7 Jan 2025 06:39:30 -0500 +Subject: [PATCH] Add BananaPi BPI-M4-Zero overlays Signed-off-by: Patrick Yavitz --- - arch/arm64/boot/dts/allwinner/overlay/Makefile | 11 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso | 13 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso | 13 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso | 13 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso | 13 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtso | 16 +++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso | 13 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso | 13 ++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso | 29 +++++++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso | 32 ++++++++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso | 24 +++++++ - arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso | 13 ++++ - 12 files changed, 203 insertions(+) + .../arm64/boot/dts/allwinner/overlay/Makefile | 13 ++++++ + ...sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso | 13 ++++++ + ...sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso | 13 ++++++ + .../sun50i-h616-bananapi-m4-pg-6-7-uart1.dtso | 13 ++++++ + ...h616-bananapi-m4-pg-8-9-rts-cts-uart1.dtso | 16 +++++++ + .../sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso | 13 ++++++ + ...un50i-h616-bananapi-m4-pi-13-14-uart4.dtso | 13 ++++++ + ...16-bananapi-m4-pi-15-16-rts-cts-uart4.dtso | 16 +++++++ + .../sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso | 13 ++++++ + .../sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso | 13 ++++++ + .../sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso | 44 +++++++++++++++++++ + ...-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso | 32 ++++++++++++++ + ...n50i-h616-bananapi-m4-spi1-cs0-spidev.dtso | 24 ++++++++++ + ...n50i-h616-bananapi-m4-spi1-cs1-spidev.dtso | 13 ++++++ + 14 files changed, 249 insertions(+) + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-6-7-uart1.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-8-9-rts-cts-uart1.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso + create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso diff --git a/arch/arm64/boot/dts/allwinner/overlay/Makefile b/arch/arm64/boot/dts/allwinner/overlay/Makefile -index 111111111111..222222222222 100644 +index 24383cb63770..16c739b56350 100644 --- a/arch/arm64/boot/dts/allwinner/overlay/Makefile +++ b/arch/arm64/boot/dts/allwinner/overlay/Makefile -@@ -49,6 +49,17 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ +@@ -49,6 +49,19 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ sun50i-h6-uart2.dtbo \ sun50i-h6-uart3.dtbo \ sun50i-h6-w1-gpio.dtbo \ -+ sun50i-h616-bananapi-m4-sdio-wifi-bt.dtbo \ ++ sun50i-h616-bananapi-m4-pg-6-7-uart1.dtbo \ ++ sun50i-h616-bananapi-m4-pg-8-9-rts-cts-uart1.dtbo \ + sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtbo \ + sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtbo \ + sun50i-h616-bananapi-m4-ph-2-3-uart5.dtbo \ @@ -35,6 +51,7 @@ index 111111111111..222222222222 100644 + sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtbo \ + sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtbo \ + sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtbo \ ++ sun50i-h616-bananapi-m4-sdio-wifi-bt.dtbo \ + sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtbo \ + sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtbo \ + sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtbo \ @@ -43,7 +60,7 @@ index 111111111111..222222222222 100644 sun50i-h616-i2c4-ph.dtbo \ diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..4e78aa8f1f27 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso @@ -0,0 +1,13 @@ @@ -62,7 +79,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..3419eee0b70b --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso @@ -0,0 +1,13 @@ @@ -79,9 +96,50 @@ index 000000000000..111111111111 + }; + }; +}; +diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-6-7-uart1.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-6-7-uart1.dtso +new file mode 100644 +index 000000000000..7001781f42d2 +--- /dev/null ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-6-7-uart1.dtso +@@ -0,0 +1,13 @@ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "sinovoip,bpi-m4-zero", "allwinner,sun50i-h616", "allwinner,sun50i-h618"; ++ ++ fragment@0 { ++ target = <&uart1>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++}; +diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-8-9-rts-cts-uart1.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-8-9-rts-cts-uart1.dtso +new file mode 100644 +index 000000000000..1317a9b3b52f +--- /dev/null ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-8-9-rts-cts-uart1.dtso +@@ -0,0 +1,16 @@ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "sinovoip,bpi-m4-zero", "allwinner,sun50i-h616", "allwinner,sun50i-h618"; ++ ++ fragment@0 { ++ target = <&uart1>; ++ __overlay__ { ++ status = "okay"; ++ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ }; ++ }; ++}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..aaa96e46d708 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso @@ -0,0 +1,13 @@ @@ -100,7 +158,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..0373f7d25449 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso @@ -0,0 +1,13 @@ @@ -119,7 +177,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..ef9394c8519c --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-15-16-rts-cts-uart4.dtso @@ -0,0 +1,16 @@ @@ -141,7 +199,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..60c75e4d61b5 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso @@ -0,0 +1,13 @@ @@ -160,7 +218,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..99c7e2b8c5f6 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso @@ -0,0 +1,13 @@ @@ -179,13 +237,15 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..307f6e5e921c --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso -@@ -0,0 +1,29 @@ +@@ -0,0 +1,44 @@ +/dts-v1/; +/plugin/; + ++#include ++ +/ { + compatible = "sinovoip,bpi-m4-zero", "allwinner,sun50i-h616", "allwinner,sun50i-h618"; + @@ -209,12 +269,25 @@ index 000000000000..111111111111 + target = <&uart1>; + __overlay__ { + status = "okay"; ++ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ bluetooth { ++ compatible = "brcm,bcm43540-bt"; ++ host-wakeup-gpios = <&pio 6 16 GPIO_ACTIVE_HIGH>; ++ device-wakeup-gpios = <&pio 6 17 GPIO_ACTIVE_HIGH>; ++ shutdown-gpios = <&pio 6 19 GPIO_ACTIVE_HIGH>; ++ max-speed = <1500000>; ++ vbat-supply = <®_vcc3v3>; ++ vddio-supply = <®_vcc1v8>; ++ }; + }; + }; +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..7fa3b94bcc8d --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso @@ -0,0 +1,32 @@ @@ -252,7 +325,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..fef73f1afa52 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso @@ -0,0 +1,24 @@ @@ -282,7 +355,7 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso new file mode 100644 -index 000000000000..111111111111 +index 000000000000..840357f2e9e0 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso @@ -0,0 +1,13 @@ @@ -300,5 +373,5 @@ index 000000000000..111111111111 + }; +}; -- -Armbian +2.39.5 diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/Add-board-BananaPi-BPI-M4-Zero.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/Add-board-BananaPi-BPI-M4-Zero.patch index f1ec16cae7..7bcb588691 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.armbian/Add-board-BananaPi-BPI-M4-Zero.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/Add-board-BananaPi-BPI-M4-Zero.patch @@ -1,20 +1,22 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 49eb52ecb53d46b5ac7e4775ad5adbb87333f560 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz -Date: Thu, 12 Dec 2024 03:52:49 -0500 -Subject: Add board BananaPi BPI-M4-Zero +Date: Tue, 7 Jan 2025 06:24:13 -0500 +Subject: [PATCH] Add board BananaPi BPI-M4-Zero Signed-off-by: Patrick Yavitz --- - arch/arm64/boot/dts/allwinner/Makefile | 1 + - arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts | 126 +++++ - arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi | 253 ++++++++++ - 3 files changed, 380 insertions(+) + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../sun50i-h618-bananapi-m4-zero.dts | 110 ++++++++ + .../allwinner/sun50i-h618-bananapi-m4.dtsi | 261 ++++++++++++++++++ + 3 files changed, 372 insertions(+) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile -index 111111111111..222222222222 100644 +index f3bbee2fcc5f..733e76270ea5 100644 --- a/arch/arm64/boot/dts/allwinner/Makefile +++ b/arch/arm64/boot/dts/allwinner/Makefile -@@ -53,6 +53,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb +@@ -52,6 +52,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-x96-mate.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-sd.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-emmc.dtb @@ -24,10 +26,10 @@ index 111111111111..222222222222 100644 subdir-y := $(dts-dirs) overlay diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts new file mode 100644 -index 000000000000..111111111111 +index 000000000000..73da25a79fdd --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-zero.dts -@@ -0,0 +1,126 @@ +@@ -0,0 +1,110 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2024 Patrick Yavitz @@ -95,6 +97,7 @@ index 000000000000..111111111111 + }; +}; + ++/* SDIO */ +&mmc1 { + status = "disabled"; + bus-width = <4>; @@ -129,23 +132,6 @@ index 000000000000..111111111111 + status = "okay"; +}; + -+&uart1 { -+ status = "disabled"; -+ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; -+ pinctrl-names = "default"; -+ uart-has-rtscts; -+ -+ bluetooth { -+ compatible = "brcm,bcm43540-bt"; -+ host-wakeup-gpios = <&pio 6 16 GPIO_ACTIVE_HIGH>; -+ device-wakeup-gpios = <&pio 6 17 GPIO_ACTIVE_HIGH>; -+ shutdown-gpios = <&pio 6 19 GPIO_ACTIVE_HIGH>; -+ max-speed = <1500000>; -+ vbat-supply = <®_vcc3v3>; -+ vddio-supply = <®_vcc1v8>; -+ }; -+}; -+ +&usbotg { + status = "okay"; + dr_mode = "peripheral"; @@ -156,10 +142,10 @@ index 000000000000..111111111111 +}; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi new file mode 100644 -index 000000000000..111111111111 +index 000000000000..05d95a271d83 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4.dtsi -@@ -0,0 +1,253 @@ +@@ -0,0 +1,261 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2024 Patrick Yavitz @@ -295,6 +281,7 @@ index 000000000000..111111111111 + pinctrl-names = "default"; +}; + ++/* SD card */ +&mmc0 { + status = "okay"; + bus-width = <4>; @@ -306,6 +293,7 @@ index 000000000000..111111111111 + vmmc-supply = <®_vcc3v3>; +}; + ++/* eMMC */ +&mmc2 { + status = "okay"; + bus-width = <8>; @@ -402,6 +390,12 @@ index 000000000000..111111111111 + pinctrl-names = "default"; +}; + ++&uart1 { ++ status = "disabled"; ++ pinctrl-0 = <&uart1_pins>; ++ pinctrl-names = "default"; ++}; ++ +&uart4 { + status = "disabled"; + pinctrl-0 = <&uart4_pi_pins>; @@ -414,5 +408,5 @@ index 000000000000..111111111111 + pinctrl-names = "default"; +}; -- -Armbian +2.39.5