From dbdc2c3fa73eb9d229a3711c82dd14954f86ebdd Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Thu, 12 Dec 2024 14:22:12 -0500 Subject: [PATCH] BananaPi M4: Remove `-zero` from overlay names As they should also work with the other unit in the series, the M4 Berry. Signed-off-by: Patrick Yavitz --- .../Add-BananaPi-BPI-M4-Zero-overlays.patch | 100 +++++++++--------- .../Add-BananaPi-BPI-M4-Zero-overlays.patch | 100 +++++++++--------- 2 files changed, 100 insertions(+), 100 deletions(-) diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch index 231cfea8372a..7274bc95839d 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch @@ -7,28 +7,28 @@ Signed-off-by: Patrick Yavitz --- .../arm64/boot/dts/allwinner/overlay/Makefile | 11 +++++++ .../sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso | 29 +++++++++++++++++ - ...i-h616-bananapi-m4-zero-pg-15-16-i2c4.dtso | 13 ++++++++ - ...i-h616-bananapi-m4-zero-pg-17-18-i2c3.dtso | 13 ++++++++ - ...0i-h616-bananapi-m4-zero-ph-2-3-uart5.dtso | 13 ++++++++ - ...-h616-bananapi-m4-zero-pi-13-14-uart4.dtso | 13 ++++++++ - ...nanapi-m4-zero-pi-15-16-rts-cts-uart4.dtso | 16 ++++++++++ - ...50i-h616-bananapi-m4-zero-pi-5-6-i2c0.dtso | 13 ++++++++ - ...50i-h616-bananapi-m4-zero-pi-7-8-i2c1.dtso | 13 ++++++++ - ...-bananapi-m4-zero-spi1-cs0-cs1-spidev.dtso | 32 +++++++++++++++++++ - ...h616-bananapi-m4-zero-spi1-cs0-spidev.dtso | 24 ++++++++++++++ - ...h616-bananapi-m4-zero-spi1-cs1-spidev.dtso | 13 ++++++++ + ...i-h616-bananapi-m4-pg-15-16-i2c4.dtso | 13 ++++++++ + ...i-h616-bananapi-m4-pg-17-18-i2c3.dtso | 13 ++++++++ + ...0i-h616-bananapi-m4-ph-2-3-uart5.dtso | 13 ++++++++ + ...-h616-bananapi-m4-pi-13-14-uart4.dtso | 13 ++++++++ + ...nanapi-m4-pi-15-16-rts-cts-uart4.dtso | 16 ++++++++++ + ...50i-h616-bananapi-m4-pi-5-6-i2c0.dtso | 13 ++++++++ + ...50i-h616-bananapi-m4-pi-7-8-i2c1.dtso | 13 ++++++++ + ...-bananapi-m4-spi1-cs0-cs1-spidev.dtso | 32 +++++++++++++++++++ + ...h616-bananapi-m4-spi1-cs0-spidev.dtso | 24 ++++++++++++++ + ...h616-bananapi-m4-spi1-cs1-spidev.dtso | 13 ++++++++ 12 files changed, 203 insertions(+) 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-zero-pg-15-16-i2c4.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-17-18-i2c3.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-ph-2-3-uart5.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-13-14-uart4.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-15-16-rts-cts-uart4.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-5-6-i2c0.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-7-8-i2c1.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-cs1-spidev.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-spidev.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs1-spidev.dtso + 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-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-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 24383cb63770..544eaad5cddf 100644 @@ -39,16 +39,16 @@ index 24383cb63770..544eaad5cddf 100644 sun50i-h6-uart3.dtbo \ sun50i-h6-w1-gpio.dtbo \ + sun50i-h616-bananapi-m4-sdio-wifi-bt.dtbo \ -+ sun50i-h616-bananapi-m4-zero-pg-15-16-i2c4.dtbo \ -+ sun50i-h616-bananapi-m4-zero-pg-17-18-i2c3.dtbo \ -+ sun50i-h616-bananapi-m4-zero-ph-2-3-uart5.dtbo \ -+ sun50i-h616-bananapi-m4-zero-pi-13-14-uart4.dtbo \ -+ sun50i-h616-bananapi-m4-zero-pi-15-16-rts-cts-uart4.dtbo \ -+ sun50i-h616-bananapi-m4-zero-pi-5-6-i2c0.dtbo \ -+ sun50i-h616-bananapi-m4-zero-pi-7-8-i2c1.dtbo \ -+ sun50i-h616-bananapi-m4-zero-spi1-cs0-cs1-spidev.dtbo \ -+ sun50i-h616-bananapi-m4-zero-spi1-cs0-spidev.dtbo \ -+ sun50i-h616-bananapi-m4-zero-spi1-cs1-spidev.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 \ ++ sun50i-h616-bananapi-m4-pi-13-14-uart4.dtbo \ ++ 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-spi1-cs0-cs1-spidev.dtbo \ ++ sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtbo \ ++ sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtbo \ sun50i-h616-i2c2-ph.dtbo \ sun50i-h616-i2c3-ph.dtbo \ sun50i-h616-i2c4-ph.dtbo \ @@ -87,11 +87,11 @@ index 000000000000..b672807fab66 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-15-16-i2c4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-15-16-i2c4.dtso +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..4e78aa8f1f27 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-15-16-i2c4.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -106,11 +106,11 @@ index 000000000000..4e78aa8f1f27 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-17-18-i2c3.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-17-18-i2c3.dtso +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..3419eee0b70b --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-17-18-i2c3.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -125,11 +125,11 @@ index 000000000000..3419eee0b70b + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-ph-2-3-uart5.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-ph-2-3-uart5.dtso +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..aaa96e46d708 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-ph-2-3-uart5.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -144,11 +144,11 @@ index 000000000000..aaa96e46d708 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-13-14-uart4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-13-14-uart4.dtso +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..0373f7d25449 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-13-14-uart4.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -163,11 +163,11 @@ index 000000000000..0373f7d25449 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-15-16-rts-cts-uart4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-15-16-rts-cts-uart4.dtso +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..ef9394c8519c --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-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 @@ -0,0 +1,16 @@ +/dts-v1/; +/plugin/; @@ -185,11 +185,11 @@ index 000000000000..ef9394c8519c + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-5-6-i2c0.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-5-6-i2c0.dtso +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..60c75e4d61b5 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-5-6-i2c0.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -204,11 +204,11 @@ index 000000000000..60c75e4d61b5 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-7-8-i2c1.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-7-8-i2c1.dtso +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..99c7e2b8c5f6 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-7-8-i2c1.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -223,11 +223,11 @@ index 000000000000..99c7e2b8c5f6 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-cs1-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-cs1-spidev.dtso +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..7fa3b94bcc8d --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-cs1-spidev.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso @@ -0,0 +1,32 @@ +/dts-v1/; +/plugin/; @@ -261,11 +261,11 @@ index 000000000000..7fa3b94bcc8d + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-spidev.dtso +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..fef73f1afa52 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-spidev.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso @@ -0,0 +1,24 @@ +/dts-v1/; +/plugin/; @@ -291,11 +291,11 @@ index 000000000000..fef73f1afa52 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs1-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs1-spidev.dtso +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..840357f2e9e0 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs1-spidev.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; 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 ad3d707e058c..ee958de00b3c 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 @@ -7,28 +7,28 @@ Signed-off-by: Patrick Yavitz --- .../arm64/boot/dts/allwinner/overlay/Makefile | 11 +++++++ .../sun50i-h616-bananapi-m4-sdio-wifi-bt.dtso | 29 +++++++++++++++++ - ...i-h616-bananapi-m4-zero-pg-15-16-i2c4.dtso | 13 ++++++++ - ...i-h616-bananapi-m4-zero-pg-17-18-i2c3.dtso | 13 ++++++++ - ...0i-h616-bananapi-m4-zero-ph-2-3-uart5.dtso | 13 ++++++++ - ...-h616-bananapi-m4-zero-pi-13-14-uart4.dtso | 13 ++++++++ - ...nanapi-m4-zero-pi-15-16-rts-cts-uart4.dtso | 16 ++++++++++ - ...50i-h616-bananapi-m4-zero-pi-5-6-i2c0.dtso | 13 ++++++++ - ...50i-h616-bananapi-m4-zero-pi-7-8-i2c1.dtso | 13 ++++++++ - ...-bananapi-m4-zero-spi1-cs0-cs1-spidev.dtso | 32 +++++++++++++++++++ - ...h616-bananapi-m4-zero-spi1-cs0-spidev.dtso | 24 ++++++++++++++ - ...h616-bananapi-m4-zero-spi1-cs1-spidev.dtso | 13 ++++++++ + ...i-h616-bananapi-m4-pg-15-16-i2c4.dtso | 13 ++++++++ + ...i-h616-bananapi-m4-pg-17-18-i2c3.dtso | 13 ++++++++ + ...0i-h616-bananapi-m4-ph-2-3-uart5.dtso | 13 ++++++++ + ...-h616-bananapi-m4-pi-13-14-uart4.dtso | 13 ++++++++ + ...nanapi-m4-pi-15-16-rts-cts-uart4.dtso | 16 ++++++++++ + ...50i-h616-bananapi-m4-pi-5-6-i2c0.dtso | 13 ++++++++ + ...50i-h616-bananapi-m4-pi-7-8-i2c1.dtso | 13 ++++++++ + ...-bananapi-m4-spi1-cs0-cs1-spidev.dtso | 32 +++++++++++++++++++ + ...h616-bananapi-m4-spi1-cs0-spidev.dtso | 24 ++++++++++++++ + ...h616-bananapi-m4-spi1-cs1-spidev.dtso | 13 ++++++++ 12 files changed, 203 insertions(+) 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-zero-pg-15-16-i2c4.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-17-18-i2c3.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-ph-2-3-uart5.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-13-14-uart4.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-15-16-rts-cts-uart4.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-5-6-i2c0.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-7-8-i2c1.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-cs1-spidev.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-spidev.dtso - create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs1-spidev.dtso + 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-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-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 76a4952e3ecc..1e76bbcb67af 100644 @@ -39,16 +39,16 @@ index 76a4952e3ecc..1e76bbcb67af 100644 sun50i-h6-uart3.dtbo \ sun50i-h6-w1-gpio.dtbo \ + sun50i-h616-bananapi-m4-sdio-wifi-bt.dtbo \ -+ sun50i-h616-bananapi-m4-zero-pg-15-16-i2c4.dtbo \ -+ sun50i-h616-bananapi-m4-zero-pg-17-18-i2c3.dtbo \ -+ sun50i-h616-bananapi-m4-zero-ph-2-3-uart5.dtbo \ -+ sun50i-h616-bananapi-m4-zero-pi-13-14-uart4.dtbo \ -+ sun50i-h616-bananapi-m4-zero-pi-15-16-rts-cts-uart4.dtbo \ -+ sun50i-h616-bananapi-m4-zero-pi-5-6-i2c0.dtbo \ -+ sun50i-h616-bananapi-m4-zero-pi-7-8-i2c1.dtbo \ -+ sun50i-h616-bananapi-m4-zero-spi1-cs0-cs1-spidev.dtbo \ -+ sun50i-h616-bananapi-m4-zero-spi1-cs0-spidev.dtbo \ -+ sun50i-h616-bananapi-m4-zero-spi1-cs1-spidev.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 \ ++ sun50i-h616-bananapi-m4-pi-13-14-uart4.dtbo \ ++ 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-spi1-cs0-cs1-spidev.dtbo \ ++ sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtbo \ ++ sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtbo \ sun50i-h616-i2c2-ph.dtbo \ sun50i-h616-i2c3-ph.dtbo \ sun50i-h616-i2c4-ph.dtbo \ @@ -87,11 +87,11 @@ index 000000000000..b672807fab66 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-15-16-i2c4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-15-16-i2c4.dtso +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..4e78aa8f1f27 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-15-16-i2c4.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-15-16-i2c4.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -106,11 +106,11 @@ index 000000000000..4e78aa8f1f27 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-17-18-i2c3.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-17-18-i2c3.dtso +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..3419eee0b70b --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pg-17-18-i2c3.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pg-17-18-i2c3.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -125,11 +125,11 @@ index 000000000000..3419eee0b70b + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-ph-2-3-uart5.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-ph-2-3-uart5.dtso +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..aaa96e46d708 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-ph-2-3-uart5.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-ph-2-3-uart5.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -144,11 +144,11 @@ index 000000000000..aaa96e46d708 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-13-14-uart4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-13-14-uart4.dtso +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..0373f7d25449 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-13-14-uart4.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-13-14-uart4.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -163,11 +163,11 @@ index 000000000000..0373f7d25449 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-15-16-rts-cts-uart4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-15-16-rts-cts-uart4.dtso +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..ef9394c8519c --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-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 @@ -0,0 +1,16 @@ +/dts-v1/; +/plugin/; @@ -185,11 +185,11 @@ index 000000000000..ef9394c8519c + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-5-6-i2c0.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-5-6-i2c0.dtso +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..60c75e4d61b5 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-5-6-i2c0.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-5-6-i2c0.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -204,11 +204,11 @@ index 000000000000..60c75e4d61b5 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-7-8-i2c1.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-7-8-i2c1.dtso +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..99c7e2b8c5f6 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-pi-7-8-i2c1.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-pi-7-8-i2c1.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -223,11 +223,11 @@ index 000000000000..99c7e2b8c5f6 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-cs1-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-cs1-spidev.dtso +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..7fa3b94bcc8d --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-cs1-spidev.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-cs1-spidev.dtso @@ -0,0 +1,32 @@ +/dts-v1/; +/plugin/; @@ -261,11 +261,11 @@ index 000000000000..7fa3b94bcc8d + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-spidev.dtso +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..fef73f1afa52 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs0-spidev.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs0-spidev.dtso @@ -0,0 +1,24 @@ +/dts-v1/; +/plugin/; @@ -291,11 +291,11 @@ index 000000000000..fef73f1afa52 + }; + }; +}; -diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs1-spidev.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs1-spidev.dtso +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..840357f2e9e0 --- /dev/null -+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-zero-spi1-cs1-spidev.dtso ++++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-bananapi-m4-spi1-cs1-spidev.dtso @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/;