From 446ae8dd02b421a1a053abe951ab7c8f54eb3202 Mon Sep 17 00:00:00 2001 From: Ryan L Date: Mon, 12 Aug 2024 00:05:49 +0100 Subject: [PATCH 1/2] Fix typo in patch entries --- patch/kernel/archive/sunxi-6.6/series.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patch/kernel/archive/sunxi-6.6/series.conf b/patch/kernel/archive/sunxi-6.6/series.conf index 1ee78584ebb0..036a829f98b4 100644 --- a/patch/kernel/archive/sunxi-6.6/series.conf +++ b/patch/kernel/archive/sunxi-6.6/series.conf @@ -404,9 +404,9 @@ patches.armbian/Move-sun50i-h6-pwm-settings-to-its-own-overlay.patch patches.armbian/Compile-the-pwm-overlay.patch patches.armbian/arm64-dts-overlay-sun50i-h616-bigtreetech-cb1.patch - patches/armbian/arm-dts-sun4i-a10-port-aliases-fix.patch - patches/armbian/arm-dts-sun4i-a13-port-aliases-fix.patch - patches/armbian/arm-dts-sun7i-a20-port-aliases-fix.patch + patches.armbian/arm-dts-sun4i-a10-port-aliases-fix.patch + patches.armbian/arm-dts-sun5i-a13-port-aliases-fix.patch + patches.armbian/arm-dts-sun7i-a20-port-aliases-fix.patch ################### patches.armbian/arm-dts-sunxi-h3-h5.dtsi-add-i2s0-i2s1-pins.patch patches.armbian/arm-dts-sun5i-a13-olinuxino-micro-add-panel-lcd-olinuxino-4.3.patch From 0fefbdce84a7a303d5108fe208ca23d49535f1a4 Mon Sep 17 00:00:00 2001 From: Ryan L Date: Mon, 19 Aug 2024 23:35:04 +0100 Subject: [PATCH 2/2] Restore The Creation of SPI overlays for the Allwinner A10 and A20, so that when used in conjunction with the spidev overlay, the gpio pins are configured in SPI mode --- ...m-dts-sun4i-a10-reapply-spi-overlays.patch | 32 +++++++++++++++++++ ...m-dts-sun7i-a20-reapply-spi-overlays.patch | 31 ++++++++++++++++++ patch/kernel/archive/sunxi-6.6/series.conf | 2 ++ 3 files changed, 65 insertions(+) create mode 100644 patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch create mode 100644 patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch new file mode 100644 index 000000000000..20bd842f0582 --- /dev/null +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ryzer +Date: Mon, 12 Aug 2024 00:25:36 +0100 +Subject: Restore Allwinner A10 SPI 0 - 2 overlay creation so that pins can be corrected muxed into +SPI mode + +Signed-off-by: Ryzer +--- + arch/arm/boot/dts/allwinner/overlay/Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/arm/boot/dts/allwinner/overlay/Makefile b/arch/arm/boot/dts/allwinner/overlay/Makefile +index 23ecb62e2478..0a1c94e1eb12 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/Makefile ++++ b/arch/arm/boot/dts/allwinner/overlay/Makefile +@@ -5,10 +5,13 @@ dtb-$(CONFIG_MACH_SUN4I) += \ + sun4i-a10-i2c1.dtbo \ + sun4i-a10-i2c2.dtbo \ + sun4i-a10-nand.dtbo \ + sun4i-a10-pps-gpio.dtbo \ + sun4i-a10-pwm.dtbo \ ++ sun4i-a10-spi0.dtbo \ ++ sun4i-a10-spi1.dtbo \ ++ sun4i-a10-spi2.dtbo \ + sun4i-a10-spdif-out.dtbo \ + sun4i-a10-spi-jedec-nor.dtbo \ + sun4i-a10-spi-spidev.dtbo \ + sun4i-a10-uart2.dtbo \ + sun4i-a10-uart3.dtbo \ +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch new file mode 100644 index 000000000000..f0a933694b49 --- /dev/null +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ryzer +Date: Mon, 12 Aug 2024 00:32:49 +0100 +Subject: Restore Allwinner A20 SPI 0 - 2 overlay creation so that pins can be corrected muxed into +SPI mode +Signed-off-by: Ryzer +--- + arch/arm/boot/dts/allwinner/overlay/Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/arm/boot/dts/allwinner/overlay/Makefile b/arch/arm/boot/dts/allwinner/overlay/Makefile +index 0a1c94e1eb12..2e3d756bc429 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/Makefile ++++ b/arch/arm/boot/dts/allwinner/overlay/Makefile +@@ -46,10 +46,13 @@ dtb-$(CONFIG_MACH_SUN7I) += \ + sun7i-a20-i2c4.dtbo \ + sun7i-a20-mmc2.dtbo \ + sun7i-a20-nand.dtbo \ + sun7i-a20-pps-gpio.dtbo \ + sun7i-a20-pwm.dtbo \ ++ sun7i-a20-spi0.dtbo \ ++ sun7i-a20-spi1.dbto \ ++ sun7i-a20-spi2.dbto \ + sun7i-a20-spdif-out.dtbo \ + sun7i-a20-spi-add-cs1.dtbo \ + sun7i-a20-spi-jedec-nor.dtbo \ + sun7i-a20-spi-spidev.dtbo \ + sun7i-a20-uart2.dtbo \ +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/archive/sunxi-6.6/series.conf b/patch/kernel/archive/sunxi-6.6/series.conf index 036a829f98b4..934b0743464c 100644 --- a/patch/kernel/archive/sunxi-6.6/series.conf +++ b/patch/kernel/archive/sunxi-6.6/series.conf @@ -405,8 +405,10 @@ patches.armbian/Compile-the-pwm-overlay.patch patches.armbian/arm64-dts-overlay-sun50i-h616-bigtreetech-cb1.patch patches.armbian/arm-dts-sun4i-a10-port-aliases-fix.patch + patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch patches.armbian/arm-dts-sun5i-a13-port-aliases-fix.patch patches.armbian/arm-dts-sun7i-a20-port-aliases-fix.patch + patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch ################### patches.armbian/arm-dts-sunxi-h3-h5.dtsi-add-i2s0-i2s1-pins.patch patches.armbian/arm-dts-sun5i-a13-olinuxino-micro-add-panel-lcd-olinuxino-4.3.patch