diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch
index 6c95780ad7..d5be5c2bba 100644
--- a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch
+++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch
@@ -1834,9 +1834,9 @@ index 000000000000..ee4ff6f453d1
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
-+			spi1 = "/soc@1c00000/spi@1c06000";
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi0 = "/soc/spi@1c05000";
++			spi1 = "/soc/spi@1c06000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -1897,9 +1897,9 @@ index 000000000000..eac4f1e2d244
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
-+			spi1 = "/soc@1c00000/spi@1c06000";
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi0 = "/soc/spi@1c05000";
++			spi1 = "/soc/spi@1c06000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -1955,12 +1955,12 @@ index 000000000000..cad50d8a29a7
 +/plugin/;
 +
 +/ {
-+	compatible = "allwinner,sun7i-a20";
++	compatible = "allwinner,sun4i-a10";
 +
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
++			spi0 = "/soc/spi@1c05000";
 +		};
 +	};
 +
@@ -1984,12 +1984,12 @@ index 000000000000..8c606d6b06a1
 +/plugin/;
 +
 +/ {
-+	compatible = "allwinner,sun7i-a20";
++	compatible = "allwinner,sun4i-a10";
 +
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi1 = "/soc@1c00000/spi@1c06000";
++			spi1 = "/soc/spi@1c06000";
 +		};
 +	};
 +
@@ -2012,12 +2012,12 @@ index 000000000000..145f285588f8
 +/plugin/;
 +
 +/ {
-+	compatible = "allwinner,sun7i-a20";
++	compatible = "allwinner,sun4i-a10";
 +
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -2026,8 +2026,8 @@ index 000000000000..145f285588f8
 +		__overlay__ {
 +			status = "okay";
 +			pinctrl-names = "default", "default";
-+			pinctrl-0 = <&spi2_pins_a>;
-+			pinctrl-1 = <&spi2_cs0_pins_a>;
++			pinctrl-0 = <&spi2_pc_pins>;
++			pinctrl-1 = <&spi2_cs0_pc_pins>;
 +		};
 +	};
 +};
@@ -2046,7 +2046,7 @@ index 000000000000..89bb44d5aee0
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial2 = "/soc@1c00000/serial@1c28800";
++			serial2 = "/soc/serial@1c28800";
 +		};
 +	};
 +
@@ -2089,7 +2089,7 @@ index 000000000000..f599d92082e4
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial3 = "/soc@1c00000/serial@1c28c00";
++			serial3 = "/soc/serial@1c28c00";
 +		};
 +	};
 +
@@ -2142,7 +2142,7 @@ index 000000000000..b5e562a6477b
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial4 = "/soc@1c00000/serial@1c29000";
++			serial4 = "/soc/serial@1c29000";
 +		};
 +	};
 +
@@ -2185,7 +2185,7 @@ index 000000000000..12c3f9699b23
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial5 = "/soc@1c00000/serial@1c29400";
++			serial5 = "/soc/serial@1c29400";
 +		};
 +	};
 +
@@ -2223,7 +2223,7 @@ index 000000000000..6be41d505509
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial6 = "/soc@1c00000/serial@1c29800";
++			serial6 = "/soc/serial@1c29800";
 +		};
 +	};
 +
@@ -2261,7 +2261,7 @@ index 000000000000..967f6afbe7d3
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial7 = "/soc@1c00000/serial@1c29c00";
++			serial7 = "/soc/serial@1c29c00";
 +		};
 +	};
 +
@@ -2407,7 +2407,7 @@ index 000000000000..444c32ca01d5
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c1 = "/soc@1c00000/i2c@1c2b000";
++			i2c1 = "/soc/i2c@1c2b000";
 +		};
 +	};
 +
@@ -2435,7 +2435,7 @@ index 000000000000..7a30681ca287
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c2 = "/soc@1c00000/i2c@1c2b400";
++			i2c2 = "/soc/i2c@1c2b400";
 +		};
 +	};
 +
@@ -2793,7 +2793,7 @@ index 000000000000..6edad42bfcd7
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			uart0 = "/soc@1c00000/serial@1c28000";
++			uart0 = "/soc/serial@1c28000";
 +		};
 +	};
 +
@@ -2831,7 +2831,7 @@ index 000000000000..675b701ed535
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			uart1 = "/soc@1c00000/serial@1c28400";
++			uart1 = "/soc/serial@1c28400";
 +		};
 +	};
 +
@@ -2859,7 +2859,7 @@ index 000000000000..b3c4e3d7a0e2
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			uart2 = "/soc@1c00000/serial@1c28800";
++			uart2 = "/soc/serial@1c28800";
 +		};
 +	};
 +
@@ -2887,7 +2887,7 @@ index 000000000000..15c25d0c5992
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			uart3 = "/soc@1c00000/serial@1c28c00";
++			uart3 = "/soc/serial@1c28c00";
 +		};
 +	};
 +
@@ -3104,7 +3104,7 @@ index 000000000000..c5f6e9732d3a
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c1 = "/soc@1c00000/i2c@1c2b000";
++			i2c1 = "/soc/i2c@1c2b000";
 +		};
 +	};
 +
@@ -3132,7 +3132,7 @@ index 000000000000..fa93d1ed9b72
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c2 = "/soc@1c00000/i2c@1c2b400";
++			i2c2 = "/soc/i2c@1c2b400";
 +		};
 +	};
 +
@@ -3160,7 +3160,7 @@ index 000000000000..945795c338e8
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c3 = "/soc@1c00000/i2c@1c2b800";
++			i2c3 = "/soc/i2c@1c2b800";
 +		};
 +	};
 +
@@ -3188,7 +3188,7 @@ index 000000000000..4fcf08c2469b
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c4 = "/soc@1c00000/i2c@1c2c000";
++			i2c4 = "/soc/i2c@1c2c000";
 +		};
 +	};
 +
@@ -3543,9 +3543,9 @@ index 000000000000..b91097eca5b6
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
-+			spi1 = "/soc@1c00000/spi@1c06000";
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi0 = "/soc/spi@1c05000";
++			spi1 = "/soc/spi@1c06000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -3606,9 +3606,9 @@ index 000000000000..341fe3229ffc
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
-+			spi1 = "/soc@1c00000/spi@1c06000";
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi0 = "/soc/spi@1c05000";
++			spi1 = "/soc/spi@1c06000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -3669,7 +3669,7 @@ index 000000000000..cad50d8a29a7
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
++			spi0 = "/soc/spi@1c05000";
 +		};
 +	};
 +
@@ -3698,7 +3698,7 @@ index 000000000000..f0218eb9f76b
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi1 = "/soc@1c00000/spi@1c06000";
++			spi1 = "/soc/spi@1c06000";
 +		};
 +	};
 +
@@ -3726,7 +3726,7 @@ index 000000000000..effba42b48bd
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -3735,8 +3735,8 @@ index 000000000000..effba42b48bd
 +		__overlay__ {
 +			status = "okay";
 +			pinctrl-names = "default", "default";
-+			pinctrl-0 = <&spi2_pb_pins>;
-+			pinctrl-1 = <&spi2_pb_cs0_pin>;
++			pinctrl-0 = <&spi2_pc_pins>;
++			pinctrl-1 = <&spi2_cs0_pc_pin>;
 +		};
 +	};
 +};
@@ -3755,7 +3755,7 @@ index 000000000000..79d1dca7a311
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial2 = "/soc@1c00000/serial@1c28800";
++			serial2 = "/soc/serial@1c28800";
 +		};
 +	};
 +
@@ -3793,7 +3793,7 @@ index 000000000000..703acbcf377b
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial3 = "/soc@1c00000/serial@1c28c00";
++			serial3 = "/soc/serial@1c28c00";
 +		};
 +	};
 +
@@ -3841,7 +3841,7 @@ index 000000000000..19180341a67f
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial4 = "/soc@1c00000/serial@1c29000";
++			serial4 = "/soc/serial@1c29000";
 +		};
 +	};
 +
@@ -3869,7 +3869,7 @@ index 000000000000..a1369eee2917
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial5 = "/soc@1c00000/serial@1c29400";
++			serial5 = "/soc/serial@1c29400";
 +		};
 +	};
 +
@@ -3897,7 +3897,7 @@ index 000000000000..fb9efe2a9475
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial6 = "/soc@1c00000/serial@1c29800";
++			serial6 = "/soc/serial@1c29800";
 +		};
 +	};
 +
@@ -3925,7 +3925,7 @@ index 000000000000..bbdca3ec67ed
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial7 = "/soc@1c00000/serial@1c29c00";
++			serial7 = "/soc/serial@1c29c00";
 +		};
 +	};
 +
diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch
new file mode 100644
index 0000000000..08e7f4d33a
--- /dev/null
+++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ryzer58 <ryestar101@gmail.com>
+Date: Sun, 15 Dec 2024 23:29:14 +0000
+Subject: Re-introduce spi overlays for each bus so that pins are muxed corectly into SPI mode
+
+Signed-off-by: Ryzer58 <ryestar101@gmail.com>
+---
+ 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..44547b7d6afd 100644
+--- a/arch/arm/boot/dts/allwinner/overlay/Makefile
++++ b/arch/arm/boot/dts/allwinner/overlay/Makefile
+@@ -6,10 +6,13 @@ dtb-$(CONFIG_MACH_SUN4I) += \
+ 	sun4i-a10-i2c2.dtbo \
+ 	sun4i-a10-nand.dtbo \
+ 	sun4i-a10-pps-gpio.dtbo \
+ 	sun4i-a10-pwm.dtbo \
+ 	sun4i-a10-spdif-out.dtbo \
++	sun4i-a10-spi0.dtbo \
++	sun4i-a10-spi1.dtbo \
++	sun4i-a10-spi2.dtbo \
+ 	sun4i-a10-spi-jedec-nor.dtbo \
+ 	sun4i-a10-spi-spidev.dtbo \
+ 	sun4i-a10-uart2.dtbo \
+ 	sun4i-a10-uart3.dtbo \
+ 	sun4i-a10-uart4.dtbo \
+-- 
+Created with Armbian build tools https://github.com/armbian/build
+
diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch
new file mode 100644
index 0000000000..89a98b4578
--- /dev/null
+++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ryzer58 <ryestar101@gmail.com>
+Date: Sun, 15 Dec 2024 23:40:08 +0000
+Subject: Re-introduce spi overlays for each bus so that pins are muxed corectly into SPI mode
+
+
+Signed-off-by: Ryzer58 <ryestar101@gmail.com>
+---
+ 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 44547b7d6afd..01a91adea88b 100644
+--- a/arch/arm/boot/dts/allwinner/overlay/Makefile
++++ b/arch/arm/boot/dts/allwinner/overlay/Makefile
+@@ -47,10 +47,13 @@ dtb-$(CONFIG_MACH_SUN7I) += \
+ 	sun7i-a20-mmc2.dtbo \
+ 	sun7i-a20-nand.dtbo \
+ 	sun7i-a20-pps-gpio.dtbo \
+ 	sun7i-a20-pwm.dtbo \
+ 	sun7i-a20-spdif-out.dtbo \
++	sun7i-a20-spi0.dtbo \
++	sun7i-a20-spi1.dtbo \
++	sun7i-a20-spi2.dtbo \
+ 	sun7i-a20-spi-add-cs1.dtbo \
+ 	sun7i-a20-spi-jedec-nor.dtbo \
+ 	sun7i-a20-spi-spidev.dtbo \
+ 	sun7i-a20-uart2.dtbo \
+ 	sun7i-a20-uart3.dtbo \
+-- 
+Created with Armbian build tools https://github.com/armbian/build
+
diff --git a/patch/kernel/archive/sunxi-6.12/series.conf b/patch/kernel/archive/sunxi-6.12/series.conf
index 1fb34e7984..c5bfdc5ff6 100644
--- a/patch/kernel/archive/sunxi-6.12/series.conf
+++ b/patch/kernel/archive/sunxi-6.12/series.conf
@@ -419,6 +419,8 @@
 	patches.armbian/cb1-overlay.patch
 	patches.armbian/Correct-perf-interrupt-source-number-as-referenced-in-the-Allwi.patch
 	patches.armbian/Enable-DMA-support-for-the-Allwinner-A10-EMAC-which-already-exi.patch
+	patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.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
 	patches.armbian/arm-dts-sun5i-a13-olinuxino-Add-panel-lcd-olinuxino-4.3-needed-.patch
diff --git a/patch/kernel/archive/sunxi-6.14/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch b/patch/kernel/archive/sunxi-6.14/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch
index e3817995d7..4aa753bfe7 100644
--- a/patch/kernel/archive/sunxi-6.14/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch
+++ b/patch/kernel/archive/sunxi-6.14/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch
@@ -1569,7 +1569,7 @@ index 000000000000..4c104bf4a5f0
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c1 = "/soc@1c00000/i2c@1c2b000";
++			i2c1 = "/soc/i2c@1c2b000";
 +		};
 +	};
 +
@@ -1597,7 +1597,7 @@ index 000000000000..1c2c3e9aca81
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c2 = "/soc@1c00000/i2c@1c2b400";
++			i2c2 = "/soc/i2c@1c2b400";
 +		};
 +	};
 +
@@ -1834,9 +1834,9 @@ index 000000000000..ee4ff6f453d1
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
-+			spi1 = "/soc@1c00000/spi@1c06000";
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi0 = "/soc/spi@1c05000";
++			spi1 = "/soc/spi@1c06000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -1897,9 +1897,9 @@ index 000000000000..eac4f1e2d244
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
-+			spi1 = "/soc@1c00000/spi@1c06000";
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi0 = "/soc/spi@1c05000";
++			spi1 = "/soc/spi@1c06000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -1955,12 +1955,12 @@ index 000000000000..cad50d8a29a7
 +/plugin/;
 +
 +/ {
-+	compatible = "allwinner,sun7i-a20";
++	compatible = "allwinner,sun4i-a10";
 +
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
++			spi0 = "/soc/spi@1c05000";
 +		};
 +	};
 +
@@ -1984,12 +1984,12 @@ index 000000000000..8c606d6b06a1
 +/plugin/;
 +
 +/ {
-+	compatible = "allwinner,sun7i-a20";
++	compatible = "allwinner,sun4i-a10";
 +
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi1 = "/soc@1c00000/spi@1c06000";
++			spi1 = "/soc/spi@1c06000";
 +		};
 +	};
 +
@@ -2012,12 +2012,12 @@ index 000000000000..145f285588f8
 +/plugin/;
 +
 +/ {
-+	compatible = "allwinner,sun7i-a20";
++	compatible = "allwinner,sun4i-a10";
 +
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -2026,8 +2026,8 @@ index 000000000000..145f285588f8
 +		__overlay__ {
 +			status = "okay";
 +			pinctrl-names = "default", "default";
-+			pinctrl-0 = <&spi2_pins_a>;
-+			pinctrl-1 = <&spi2_cs0_pins_a>;
++			pinctrl-0 = <&spi2_pc_pins>;
++			pinctrl-1 = <&spi2_cs0_pc_pins>;
 +		};
 +	};
 +};
@@ -2046,7 +2046,7 @@ index 000000000000..89bb44d5aee0
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial2 = "/soc@1c00000/serial@1c28800";
++			serial2 = "/soc/serial@1c28800";
 +		};
 +	};
 +
@@ -2089,7 +2089,7 @@ index 000000000000..f599d92082e4
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial3 = "/soc@1c00000/serial@1c28c00";
++			serial3 = "/soc/serial@1c28c00";
 +		};
 +	};
 +
@@ -2142,7 +2142,7 @@ index 000000000000..b5e562a6477b
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial4 = "/soc@1c00000/serial@1c29000";
++			serial4 = "/soc/serial@1c29000";
 +		};
 +	};
 +
@@ -2185,7 +2185,7 @@ index 000000000000..12c3f9699b23
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial5 = "/soc@1c00000/serial@1c29400";
++			serial5 = "/soc/serial@1c29400";
 +		};
 +	};
 +
@@ -2223,7 +2223,7 @@ index 000000000000..6be41d505509
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial6 = "/soc@1c00000/serial@1c29800";
++			serial6 = "/soc/serial@1c29800";
 +		};
 +	};
 +
@@ -2261,7 +2261,7 @@ index 000000000000..967f6afbe7d3
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial7 = "/soc@1c00000/serial@1c29c00";
++			serial7 = "/soc/serial@1c29c00";
 +		};
 +	};
 +
@@ -2407,7 +2407,7 @@ index 000000000000..444c32ca01d5
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c1 = "/soc@1c00000/i2c@1c2b000";
++			i2c1 = "/soc/i2c@1c2b000";
 +		};
 +	};
 +
@@ -2435,7 +2435,7 @@ index 000000000000..7a30681ca287
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c2 = "/soc@1c00000/i2c@1c2b400";
++			i2c2 = "/soc/i2c@1c2b400";
 +		};
 +	};
 +
@@ -2608,7 +2608,7 @@ index 000000000000..ad0685f8af18
 +/plugin/;
 +
 +/ {
-+	compatible = "allwinner,sun5i-a10";
++	compatible = "allwinner,sun5i-a13";
 +
 +	fragment@0 {
 +		target-path = "/aliases";
@@ -2793,7 +2793,7 @@ index 000000000000..6edad42bfcd7
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			uart0 = "/soc@1c00000/serial@1c28000";
++			uart0 = "/soc/serial@1c28000";
 +		};
 +	};
 +
@@ -2831,7 +2831,7 @@ index 000000000000..675b701ed535
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			uart1 = "/soc@1c00000/serial@1c28400";
++			uart1 = "/soc/serial@1c28400";
 +		};
 +	};
 +
@@ -2859,7 +2859,7 @@ index 000000000000..b3c4e3d7a0e2
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			uart2 = "/soc@1c00000/serial@1c28800";
++			uart2 = "/soc/serial@1c28800";
 +		};
 +	};
 +
@@ -2887,7 +2887,7 @@ index 000000000000..15c25d0c5992
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			uart3 = "/soc@1c00000/serial@1c28c00";
++			uart3 = "/soc/serial@1c28c00";
 +		};
 +	};
 +
@@ -3104,7 +3104,7 @@ index 000000000000..c5f6e9732d3a
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c1 = "/soc@1c00000/i2c@1c2b000";
++			i2c1 = "/soc/i2c@1c2b000";
 +		};
 +	};
 +
@@ -3132,7 +3132,7 @@ index 000000000000..fa93d1ed9b72
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c2 = "/soc@1c00000/i2c@1c2b400";
++			i2c2 = "/soc/i2c@1c2b400";
 +		};
 +	};
 +
@@ -3160,7 +3160,7 @@ index 000000000000..945795c338e8
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c3 = "/soc@1c00000/i2c@1c2b800";
++			i2c3 = "/soc/i2c@1c2b800";
 +		};
 +	};
 +
@@ -3188,7 +3188,7 @@ index 000000000000..4fcf08c2469b
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c4 = "/soc@1c00000/i2c@1c2c000";
++			i2c4 = "/soc/i2c@1c2c000";
 +		};
 +	};
 +
@@ -3543,9 +3543,9 @@ index 000000000000..b91097eca5b6
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
-+			spi1 = "/soc@1c00000/spi@1c06000";
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi0 = "/soc/spi@1c05000";
++			spi1 = "/soc/spi@1c06000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -3606,9 +3606,9 @@ index 000000000000..341fe3229ffc
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
-+			spi1 = "/soc@1c00000/spi@1c06000";
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi0 = "/soc/spi@1c05000";
++			spi1 = "/soc/spi@1c06000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -3669,7 +3669,7 @@ index 000000000000..cad50d8a29a7
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
++			spi0 = "/soc/spi@1c05000";
 +		};
 +	};
 +
@@ -3698,7 +3698,7 @@ index 000000000000..f0218eb9f76b
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi1 = "/soc@1c00000/spi@1c06000";
++			spi1 = "/soc/spi@1c06000";
 +		};
 +	};
 +
@@ -3726,7 +3726,7 @@ index 000000000000..effba42b48bd
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -3735,8 +3735,8 @@ index 000000000000..effba42b48bd
 +		__overlay__ {
 +			status = "okay";
 +			pinctrl-names = "default", "default";
-+			pinctrl-0 = <&spi2_pb_pins>;
-+			pinctrl-1 = <&spi2_pb_cs0_pin>;
++			pinctrl-0 = <&spi2_pc_pins>;
++			pinctrl-1 = <&spi2_cs0_pc_pin>;
 +		};
 +	};
 +};
@@ -3755,7 +3755,7 @@ index 000000000000..79d1dca7a311
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial2 = "/soc@1c00000/serial@1c28800";
++			serial2 = "/soc/serial@1c28800";
 +		};
 +	};
 +
@@ -3793,7 +3793,7 @@ index 000000000000..703acbcf377b
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial3 = "/soc@1c00000/serial@1c28c00";
++			serial3 = "/soc/serial@1c28c00";
 +		};
 +	};
 +
@@ -3841,7 +3841,7 @@ index 000000000000..19180341a67f
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial4 = "/soc@1c00000/serial@1c29000";
++			serial4 = "/soc/serial@1c29000";
 +		};
 +	};
 +
@@ -3869,7 +3869,7 @@ index 000000000000..a1369eee2917
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial5 = "/soc@1c00000/serial@1c29400";
++			serial5 = "/soc/serial@1c29400";
 +		};
 +	};
 +
@@ -3897,7 +3897,7 @@ index 000000000000..fb9efe2a9475
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial6 = "/soc@1c00000/serial@1c29800";
++			serial6 = "/soc/serial@1c29800";
 +		};
 +	};
 +
@@ -3925,7 +3925,7 @@ index 000000000000..bbdca3ec67ed
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial7 = "/soc@1c00000/serial@1c29c00";
++			serial7 = "/soc/serial@1c29c00";
 +		};
 +	};
 +
diff --git a/patch/kernel/archive/sunxi-6.14/patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch b/patch/kernel/archive/sunxi-6.14/patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch
new file mode 100644
index 0000000000..1465fc5062
--- /dev/null
+++ b/patch/kernel/archive/sunxi-6.14/patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ryzer58 <ryestar101@gmail.com>
+Date: Thu, 22 May 2025 23:29:14 +0000
+Subject: Re-introduce spi overlays for each bus so that pins are muxed corectly into SPI mode
+
+Signed-off-by: Ryzer58 <ryestar101@gmail.com>
+---
+ 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..44547b7d6afd 100644
+--- a/arch/arm/boot/dts/allwinner/overlay/Makefile
++++ b/arch/arm/boot/dts/allwinner/overlay/Makefile
+@@ -6,10 +6,13 @@ dtb-$(CONFIG_MACH_SUN4I) += \
+ 	sun4i-a10-i2c2.dtbo \
+ 	sun4i-a10-nand.dtbo \
+ 	sun4i-a10-pps-gpio.dtbo \
+ 	sun4i-a10-pwm.dtbo \
+ 	sun4i-a10-spdif-out.dtbo \
++	sun4i-a10-spi0.dtbo \
++	sun4i-a10-spi1.dtbo \
++	sun4i-a10-spi2.dtbo \
+ 	sun4i-a10-spi-jedec-nor.dtbo \
+ 	sun4i-a10-spi-spidev.dtbo \
+ 	sun4i-a10-uart2.dtbo \
+ 	sun4i-a10-uart3.dtbo \
+ 	sun4i-a10-uart4.dtbo \
+-- 
+Created with Armbian build tools https://github.com/armbian/build
+
diff --git a/patch/kernel/archive/sunxi-6.14/patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch b/patch/kernel/archive/sunxi-6.14/patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch
new file mode 100644
index 0000000000..d567786121
--- /dev/null
+++ b/patch/kernel/archive/sunxi-6.14/patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ryzer58 <ryestar101@gmail.com>
+Date: Thu, 22 May 2025 23:40:08 +0000
+Subject: Re-introduce spi overlays for each bus so that pins are muxed corectly into SPI mode
+
+
+Signed-off-by: Ryzer58 <ryestar101@gmail.com>
+---
+ 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 44547b7d6afd..01a91adea88b 100644
+--- a/arch/arm/boot/dts/allwinner/overlay/Makefile
++++ b/arch/arm/boot/dts/allwinner/overlay/Makefile
+@@ -47,10 +47,13 @@ dtb-$(CONFIG_MACH_SUN7I) += \
+ 	sun7i-a20-mmc2.dtbo \
+ 	sun7i-a20-nand.dtbo \
+ 	sun7i-a20-pps-gpio.dtbo \
+ 	sun7i-a20-pwm.dtbo \
+ 	sun7i-a20-spdif-out.dtbo \
++	sun7i-a20-spi0.dtbo \
++	sun7i-a20-spi1.dtbo \
++	sun7i-a20-spi2.dtbo \
+ 	sun7i-a20-spi-add-cs1.dtbo \
+ 	sun7i-a20-spi-jedec-nor.dtbo \
+ 	sun7i-a20-spi-spidev.dtbo \
+ 	sun7i-a20-uart2.dtbo \
+ 	sun7i-a20-uart3.dtbo \
+-- 
+Created with Armbian build tools https://github.com/armbian/build
+
diff --git a/patch/kernel/archive/sunxi-6.14/series.conf b/patch/kernel/archive/sunxi-6.14/series.conf
index c8449546b4..c46a5178aa 100644
--- a/patch/kernel/archive/sunxi-6.14/series.conf
+++ b/patch/kernel/archive/sunxi-6.14/series.conf
@@ -424,6 +424,8 @@
 	patches.armbian/Move-sun50i-h6-pwm-settings-to-its-own-overlay.patch
 	patches.armbian/Compile-the-pwm-overlay.patch
 	patches.armbian/cb1-overlay.patch
+	patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch
+	patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch
 	patches.armbian/Correct-perf-interrupt-source-number-as-referenced-in-the-Allwi.patch
 	patches.armbian/Enable-DMA-support-for-the-Allwinner-A10-EMAC-which-already-exi.patch
 	patches.armbian/arm-dts-sunxi-h3-h5.dtsi-add-i2s0-i2s1-pins.patch
diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch
index 33bbcbae23..7be4625b06 100644
--- a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch
+++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch
@@ -1569,7 +1569,7 @@ index 000000000000..4c104bf4a5f0
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c1 = "/soc@1c00000/i2c@1c2b000";
++			i2c1 = "/soc/i2c@1c2b000";
 +		};
 +	};
 +
@@ -1597,7 +1597,7 @@ index 000000000000..1c2c3e9aca81
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c2 = "/soc@1c00000/i2c@1c2b400";
++			i2c2 = "/soc/i2c@1c2b400";
 +		};
 +	};
 +
@@ -1834,9 +1834,9 @@ index 000000000000..ee4ff6f453d1
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
-+			spi1 = "/soc@1c00000/spi@1c06000";
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi0 = "/soc/spi@1c05000";
++			spi1 = "/soc/spi@1c06000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -1897,9 +1897,9 @@ index 000000000000..eac4f1e2d244
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
-+			spi1 = "/soc@1c00000/spi@1c06000";
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi0 = "/soc/spi@1c05000";
++			spi1 = "/soc/spi@1c06000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -1955,12 +1955,12 @@ index 000000000000..cad50d8a29a7
 +/plugin/;
 +
 +/ {
-+	compatible = "allwinner,sun7i-a20";
++	compatible = "allwinner,sun4i-a10";
 +
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
++			spi0 = "/soc/spi@1c05000";
 +		};
 +	};
 +
@@ -1984,12 +1984,12 @@ index 000000000000..8c606d6b06a1
 +/plugin/;
 +
 +/ {
-+	compatible = "allwinner,sun7i-a20";
++	compatible = "allwinner,sun4i-a10";
 +
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi1 = "/soc@1c00000/spi@1c06000";
++			spi1 = "/soc/spi@1c06000";
 +		};
 +	};
 +
@@ -2012,12 +2012,12 @@ index 000000000000..145f285588f8
 +/plugin/;
 +
 +/ {
-+	compatible = "allwinner,sun7i-a20";
++	compatible = "allwinner,sun4i-a10";
 +
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -2026,8 +2026,8 @@ index 000000000000..145f285588f8
 +		__overlay__ {
 +			status = "okay";
 +			pinctrl-names = "default", "default";
-+			pinctrl-0 = <&spi2_pins_a>;
-+			pinctrl-1 = <&spi2_cs0_pins_a>;
++			pinctrl-0 = <&spi2_pc_pins>;
++			pinctrl-1 = <&spi2_cs0_pc_pins>;
 +		};
 +	};
 +};
@@ -2046,7 +2046,7 @@ index 000000000000..89bb44d5aee0
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial2 = "/soc@1c00000/serial@1c28800";
++			serial2 = "/soc/serial@1c28800";
 +		};
 +	};
 +
@@ -2089,7 +2089,7 @@ index 000000000000..f599d92082e4
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial3 = "/soc@1c00000/serial@1c28c00";
++			serial3 = "/soc/serial@1c28c00";
 +		};
 +	};
 +
@@ -2142,7 +2142,7 @@ index 000000000000..b5e562a6477b
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial4 = "/soc@1c00000/serial@1c29000";
++			serial4 = "/soc/serial@1c29000";
 +		};
 +	};
 +
@@ -2185,7 +2185,7 @@ index 000000000000..12c3f9699b23
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial5 = "/soc@1c00000/serial@1c29400";
++			serial5 = "/soc/serial@1c29400";
 +		};
 +	};
 +
@@ -2223,7 +2223,7 @@ index 000000000000..6be41d505509
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial6 = "/soc@1c00000/serial@1c29800";
++			serial6 = "/soc/serial@1c29800";
 +		};
 +	};
 +
@@ -2261,7 +2261,7 @@ index 000000000000..967f6afbe7d3
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial7 = "/soc@1c00000/serial@1c29c00";
++			serial7 = "/soc/serial@1c29c00";
 +		};
 +	};
 +
@@ -2407,7 +2407,7 @@ index 000000000000..444c32ca01d5
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c1 = "/soc@1c00000/i2c@1c2b000";
++			i2c1 = "/soc/i2c@1c2b000";
 +		};
 +	};
 +
@@ -2435,7 +2435,7 @@ index 000000000000..7a30681ca287
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c2 = "/soc@1c00000/i2c@1c2b400";
++			i2c2 = "/soc/i2c@1c2b400";
 +		};
 +	};
 +
@@ -2793,7 +2793,7 @@ index 000000000000..6edad42bfcd7
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			uart0 = "/soc@1c00000/serial@1c28000";
++			uart0 = "/soc/serial@1c28000";
 +		};
 +	};
 +
@@ -2831,7 +2831,7 @@ index 000000000000..675b701ed535
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			uart1 = "/soc@1c00000/serial@1c28400";
++			uart1 = "/soc/serial@1c28400";
 +		};
 +	};
 +
@@ -2859,7 +2859,7 @@ index 000000000000..b3c4e3d7a0e2
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			uart2 = "/soc@1c00000/serial@1c28800";
++			uart2 = "/soc/serial@1c28800";
 +		};
 +	};
 +
@@ -2887,7 +2887,7 @@ index 000000000000..15c25d0c5992
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			uart3 = "/soc@1c00000/serial@1c28c00";
++			uart3 = "/soc/serial@1c28c00";
 +		};
 +	};
 +
@@ -3104,7 +3104,7 @@ index 000000000000..c5f6e9732d3a
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c1 = "/soc@1c00000/i2c@1c2b000";
++			i2c1 = "/soc/i2c@1c2b000";
 +		};
 +	};
 +
@@ -3132,7 +3132,7 @@ index 000000000000..fa93d1ed9b72
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c2 = "/soc@1c00000/i2c@1c2b400";
++			i2c2 = "/soc/i2c@1c2b400";
 +		};
 +	};
 +
@@ -3160,7 +3160,7 @@ index 000000000000..945795c338e8
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c3 = "/soc@1c00000/i2c@1c2b800";
++			i2c3 = "/soc/i2c@1c2b800";
 +		};
 +	};
 +
@@ -3188,7 +3188,7 @@ index 000000000000..4fcf08c2469b
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			i2c4 = "/soc@1c00000/i2c@1c2c000";
++			i2c4 = "/soc/i2c@1c2c000";
 +		};
 +	};
 +
@@ -3543,9 +3543,9 @@ index 000000000000..b91097eca5b6
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
-+			spi1 = "/soc@1c00000/spi@1c06000";
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi0 = "/soc/spi@1c05000";
++			spi1 = "/soc/spi@1c06000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -3606,9 +3606,9 @@ index 000000000000..341fe3229ffc
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
-+			spi1 = "/soc@1c00000/spi@1c06000";
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi0 = "/soc/spi@1c05000";
++			spi1 = "/soc/spi@1c06000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -3669,7 +3669,7 @@ index 000000000000..cad50d8a29a7
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi0 = "/soc@1c00000/spi@1c05000";
++			spi0 = "/soc/spi@1c05000";
 +		};
 +	};
 +
@@ -3698,7 +3698,7 @@ index 000000000000..f0218eb9f76b
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi1 = "/soc@1c00000/spi@1c06000";
++			spi1 = "/soc/spi@1c06000";
 +		};
 +	};
 +
@@ -3726,7 +3726,7 @@ index 000000000000..effba42b48bd
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			spi2 = "/soc@1c00000/spi@1c17000";
++			spi2 = "/soc/spi@1c17000";
 +		};
 +	};
 +
@@ -3735,8 +3735,8 @@ index 000000000000..effba42b48bd
 +		__overlay__ {
 +			status = "okay";
 +			pinctrl-names = "default", "default";
-+			pinctrl-0 = <&spi2_pb_pins>;
-+			pinctrl-1 = <&spi2_pb_cs0_pin>;
++			pinctrl-0 = <&spi2_pc_pins>;
++			pinctrl-1 = <&spi2_cs0_pc_pin>;
 +		};
 +	};
 +};
@@ -3755,7 +3755,7 @@ index 000000000000..79d1dca7a311
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial2 = "/soc@1c00000/serial@1c28800";
++			serial2 = "/soc/serial@1c28800";
 +		};
 +	};
 +
@@ -3793,7 +3793,7 @@ index 000000000000..703acbcf377b
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial3 = "/soc@1c00000/serial@1c28c00";
++			serial3 = "/soc/serial@1c28c00";
 +		};
 +	};
 +
@@ -3841,7 +3841,7 @@ index 000000000000..19180341a67f
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial4 = "/soc@1c00000/serial@1c29000";
++			serial4 = "/soc/serial@1c29000";
 +		};
 +	};
 +
@@ -3869,7 +3869,7 @@ index 000000000000..a1369eee2917
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial5 = "/soc@1c00000/serial@1c29400";
++			serial5 = "/soc/serial@1c29400";
 +		};
 +	};
 +
@@ -3897,7 +3897,7 @@ index 000000000000..fb9efe2a9475
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial6 = "/soc@1c00000/serial@1c29800";
++			serial6 = "/soc/serial@1c29800";
 +		};
 +	};
 +
@@ -3925,7 +3925,7 @@ index 000000000000..bbdca3ec67ed
 +	fragment@0 {
 +		target-path = "/aliases";
 +		__overlay__ {
-+			serial7 = "/soc@1c00000/serial@1c29c00";
++			serial7 = "/soc/serial@1c29c00";
 +		};
 +	};
 +
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 0000000000..08e7f4d33a
--- /dev/null
+++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ryzer58 <ryestar101@gmail.com>
+Date: Sun, 15 Dec 2024 23:29:14 +0000
+Subject: Re-introduce spi overlays for each bus so that pins are muxed corectly into SPI mode
+
+Signed-off-by: Ryzer58 <ryestar101@gmail.com>
+---
+ 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..44547b7d6afd 100644
+--- a/arch/arm/boot/dts/allwinner/overlay/Makefile
++++ b/arch/arm/boot/dts/allwinner/overlay/Makefile
+@@ -6,10 +6,13 @@ dtb-$(CONFIG_MACH_SUN4I) += \
+ 	sun4i-a10-i2c2.dtbo \
+ 	sun4i-a10-nand.dtbo \
+ 	sun4i-a10-pps-gpio.dtbo \
+ 	sun4i-a10-pwm.dtbo \
+ 	sun4i-a10-spdif-out.dtbo \
++	sun4i-a10-spi0.dtbo \
++	sun4i-a10-spi1.dtbo \
++	sun4i-a10-spi2.dtbo \
+ 	sun4i-a10-spi-jedec-nor.dtbo \
+ 	sun4i-a10-spi-spidev.dtbo \
+ 	sun4i-a10-uart2.dtbo \
+ 	sun4i-a10-uart3.dtbo \
+ 	sun4i-a10-uart4.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 0000000000..4f98467077
--- /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: Ryzer58 <ryestar101@gmail.com>
+Date: Sun, 15 Dec 2024 23:40:08 +0000
+Subject: Re-introduce spi overlays for each bus so that pins are muxed corectly into SPI mode
+
+Signed-off-by: Ryzer58 <ryestar101@gmail.com>
+---
+ 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 44547b7d6afd..01a91adea88b 100644
+--- a/arch/arm/boot/dts/allwinner/overlay/Makefile
++++ b/arch/arm/boot/dts/allwinner/overlay/Makefile
+@@ -47,10 +47,13 @@ dtb-$(CONFIG_MACH_SUN7I) += \
+ 	sun7i-a20-mmc2.dtbo \
+ 	sun7i-a20-nand.dtbo \
+ 	sun7i-a20-pps-gpio.dtbo \
+ 	sun7i-a20-pwm.dtbo \
+ 	sun7i-a20-spdif-out.dtbo \
++	sun7i-a20-spi0.dtbo \
++	sun7i-a20-spi1.dtbo \
++	sun7i-a20-spi2.dtbo \
+ 	sun7i-a20-spi-add-cs1.dtbo \
+ 	sun7i-a20-spi-jedec-nor.dtbo \
+ 	sun7i-a20-spi-spidev.dtbo \
+ 	sun7i-a20-uart2.dtbo \
+ 	sun7i-a20-uart3.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 7dd3e383e4..897df94e2e 100644
--- a/patch/kernel/archive/sunxi-6.6/series.conf
+++ b/patch/kernel/archive/sunxi-6.6/series.conf
@@ -375,6 +375,8 @@
 	patches.armbian/Move-sun50i-h6-pwm-settings-to-its-own-overlay.patch
 	patches.armbian/Compile-the-pwm-overlay.patch
 	patches.armbian/cb1-overlay.patch
+	patches.armbian/arm-dts-sun4i-a10-reapply-spi-overlays.patch
+	patches.armbian/arm-dts-sun7i-a20-reapply-spi-overlays.patch
 	patches.armbian/ARM64-DTS-sun50i-h616-overlays-fix-sun50i-h616-light-overlay.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