diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun4i-a10-port-aliases-fix.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun4i-a10-port-aliases-fix.patch new file mode 100644 index 000000000000..9260d5163d33 --- /dev/null +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun4i-a10-port-aliases-fix.patch @@ -0,0 +1,270 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ryzer58 +Date: Sat, 10 Aug 2024 00:09:43 +0100 +Subject: Amend port aliases for the Allwinner A10 so that now the port number issued correctly aligns with the physical port +number for interfaces I2C, SPI and UART + +Signed-off-by: Ryzer58 +--- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-i2c1.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-i2c2.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi-jedec-nor.dtso | 6 +++--- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi-spidev.dtso | 6 +++--- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi0.dtso | 4 ++-- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi1.dtso | 4 ++-- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi2.dtso | 4 ++-- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart2.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart3.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart4.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart5.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart6.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart7.dtso | 2 +- + 13 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-i2c1.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-i2c1.dtso +index 4c104bf4a5f0..e54a780bd04d 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-i2c1.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-i2c1.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun4i-a10"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- i2c1 = "/soc@1c00000/i2c@1c2b000"; ++ i2c1 = "/soc/i2c@1c2b000"; + }; + }; + + fragment@1 { + target = <&i2c1>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-i2c2.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-i2c2.dtso +index 1c2c3e9aca81..b94426bf0332 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-i2c2.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-i2c2.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun4i-a10"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- i2c2 = "/soc@1c00000/i2c@1c2b400"; ++ i2c2 = "/soc/i2c@1c2b400"; + }; + }; + + fragment@1 { + target = <&i2c2>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi-jedec-nor.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi-jedec-nor.dtso +index ee4ff6f453d1..bf6142fd0e2c 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi-jedec-nor.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi-jedec-nor.dtso +@@ -5,13 +5,13 @@ / { + compatible = "allwinner,sun4i-a10"; + + 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"; + }; + }; + + fragment@1 { + target = <&spi0>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi-spidev.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi-spidev.dtso +index eac4f1e2d244..b3258c8d6d47 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi-spidev.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi-spidev.dtso +@@ -5,13 +5,13 @@ / { + compatible = "allwinner,sun4i-a10"; + + 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"; + }; + }; + + fragment@1 { + target = <&spi0>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi0.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi0.dtso +index cad50d8a29a7..41190d19535d 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi0.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi0.dtso +@@ -1,15 +1,15 @@ + /dts-v1/; + /plugin/; + + / { +- compatible = "allwinner,sun7i-a20"; ++ compatible = "allwinner,sun4i-a10"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- spi0 = "/soc@1c00000/spi@1c05000"; ++ spi0 = "/soc/spi@1c05000"; + }; + }; + + fragment@1 { + target = <&spi0>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi1.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi1.dtso +index 8c606d6b06a1..15a7015455ac 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi1.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi1.dtso +@@ -1,15 +1,15 @@ + /dts-v1/; + /plugin/; + + / { +- compatible = "allwinner,sun7i-a20"; ++ compatible = "allwinner,sun4i-a10"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- spi1 = "/soc@1c00000/spi@1c06000"; ++ spi1 = "/soc/spi@1c06000"; + }; + }; + + fragment@1 { + target = <&spi1>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi2.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi2.dtso +index 145f285588f8..acdfdb346ab7 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi2.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-spi2.dtso +@@ -1,15 +1,15 @@ + /dts-v1/; + /plugin/; + + / { +- compatible = "allwinner,sun7i-a20"; ++ compatible = "allwinner,sun4i-a10"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- spi2 = "/soc@1c00000/spi@1c17000"; ++ spi2 = "/soc/spi@1c17000"; + }; + }; + + fragment@1 { + target = <&spi2>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart2.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart2.dtso +index 89bb44d5aee0..073b93d59383 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart2.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart2.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun4i-a10"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- serial2 = "/soc@1c00000/serial@1c28800"; ++ serial2 = "/soc/serial@1c28800"; + }; + }; + + fragment@1 { + target = <&pio>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart3.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart3.dtso +index f599d92082e4..aeedb9fc5774 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart3.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart3.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun4i-a10"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- serial3 = "/soc@1c00000/serial@1c28c00"; ++ serial3 = "/soc/serial@1c28c00"; + }; + }; + + fragment@1 { + target = <&pio>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart4.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart4.dtso +index b5e562a6477b..02a18c281884 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart4.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart4.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun4i-a10"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- serial4 = "/soc@1c00000/serial@1c29000"; ++ serial4 = "/soc/serial@1c29000"; + }; + }; + + fragment@1 { + target = <&pio>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart5.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart5.dtso +index 12c3f9699b23..3ce3416ea527 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart5.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart5.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun4i-a10"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- serial5 = "/soc@1c00000/serial@1c29400"; ++ serial5 = "/soc/serial@1c29400"; + }; + }; + + fragment@1 { + target = <&pio>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart6.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart6.dtso +index 6be41d505509..5c7a1e3d473d 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart6.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart6.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun4i-a10"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- serial6 = "/soc@1c00000/serial@1c29800"; ++ serial6 = "/soc/serial@1c29800"; + }; + }; + + fragment@1 { + target = <&pio>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart7.dtso b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart7.dtso +index 967f6afbe7d3..d66610c19991 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart7.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun4i-a10-uart7.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun4i-a10"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- serial7 = "/soc@1c00000/serial@1c29c00"; ++ serial7 = "/soc/serial@1c29c00"; + }; + }; + + fragment@1 { + target = <&pio>; +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun5i-a13-port-aliases-fix.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun5i-a13-port-aliases-fix.patch new file mode 100644 index 000000000000..264a49884b43 --- /dev/null +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun5i-a13-port-aliases-fix.patch @@ -0,0 +1,103 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ryzer58 +Date: Sun, 11 Aug 2024 22:07:54 +0100 +Subject: Amend port aliases for the Allwinner A13 so that now the port number issued correctly aligns with the physical port +number for interfaces I2C and UART + +Signed-off-by: Ryzer58 +--- + arch/arm/boot/dts/allwinner/overlay/sun5i-a13-i2c1.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun5i-a13-i2c2.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart1.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart2.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart3.dtso | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-i2c1.dtso b/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-i2c1.dtso +index 444c32ca01d5..ea9b150fb9ca 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-i2c1.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-i2c1.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun5i-a13"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- i2c1 = "/soc@1c00000/i2c@1c2b000"; ++ i2c1 = "/soc/i2c@1c2b000"; + }; + }; + + fragment@1 { + target = <&i2c1>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-i2c2.dtso b/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-i2c2.dtso +index 7a30681ca287..5c19a5dcb5c6 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-i2c2.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-i2c2.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun5i-a13"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- i2c2 = "/soc@1c00000/i2c@1c2b400"; ++ i2c2 = "/soc/i2c@1c2b400"; + }; + }; + + fragment@1 { + target = <&i2c2>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart1.dtso b/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart1.dtso +index 675b701ed535..70b98ea8fdc2 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart1.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart1.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun5i-a13"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- uart1 = "/soc@1c00000/serial@1c28400"; ++ uart1 = "/soc/serial@1c28400"; + }; + }; + + fragment@1 { + target = <&uart1>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart2.dtso b/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart2.dtso +index b3c4e3d7a0e2..e53c9acfaf5b 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart2.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart2.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun5i-a13"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- uart2 = "/soc@1c00000/serial@1c28800"; ++ uart2 = "/soc/serial@1c28800"; + }; + }; + + fragment@1 { + target = <&uart2>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart3.dtso b/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart3.dtso +index 15c25d0c5992..4fe2e93e29c8 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart3.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun5i-a13-uart3.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun5i-a13"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- uart3 = "/soc@1c00000/serial@1c28c00"; ++ uart3 = "/soc/serial@1c28c00"; + }; + }; + + fragment@1 { + target = <&uart3>; +-- +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-port-aliases-fix.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun7i-a20-port-aliases-fix.patch new file mode 100644 index 000000000000..f198ccb1302e --- /dev/null +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-sun7i-a20-port-aliases-fix.patch @@ -0,0 +1,291 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ryzer58 +Date: Sat, 10 Aug 2024 00:30:53 +0100 +Subject: Amend port aliases for the Allwinner A20 so that now the port number issued correctly aligns with the physical port +number for interfaces I2C, SPI and UART + +Signed-off-by: Ryzer58 +--- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c1.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c2.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c3.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c4.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi-jedec-nor.dtso | 6 +++--- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi-spidev.dtso | 6 +++--- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi0.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi1.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi2.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart2.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart3.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart4.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart5.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart6.dtso | 2 +- + arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart7.dtso | 2 +- + 15 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c1.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c1.dtso +index c5f6e9732d3a..de7df6df380c 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c1.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c1.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- i2c1 = "/soc@1c00000/i2c@1c2b000"; ++ i2c1 = "/soc/i2c@1c2b000"; + }; + }; + + fragment@1 { + target = <&i2c1>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c2.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c2.dtso +index fa93d1ed9b72..34c8b74055f9 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c2.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c2.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- i2c2 = "/soc@1c00000/i2c@1c2b400"; ++ i2c2 = "/soc/i2c@1c2b400"; + }; + }; + + fragment@1 { + target = <&i2c2>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c3.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c3.dtso +index 945795c338e8..cb8657ca060c 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c3.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c3.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- i2c3 = "/soc@1c00000/i2c@1c2b800"; ++ i2c3 = "/soc/i2c@1c2b800"; + }; + }; + + fragment@1 { + target = <&i2c3>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c4.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c4.dtso +index 4fcf08c2469b..d0136aea2afa 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c4.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-i2c4.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- i2c4 = "/soc@1c00000/i2c@1c2c000"; ++ i2c4 = "/soc/i2c@1c2c000"; + }; + }; + + fragment@1 { + target = <&pio>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi-jedec-nor.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi-jedec-nor.dtso +index b91097eca5b6..3c02c58fc082 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi-jedec-nor.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi-jedec-nor.dtso +@@ -5,13 +5,13 @@ / { + compatible = "allwinner,sun7i-a20"; + + 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"; + }; + }; + + fragment@1 { + target = <&spi0>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi-spidev.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi-spidev.dtso +index 341fe3229ffc..f0f6453ff7b3 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi-spidev.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi-spidev.dtso +@@ -5,13 +5,13 @@ / { + compatible = "allwinner,sun7i-a20"; + + 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"; + }; + }; + + fragment@1 { + target = <&spi0>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi0.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi0.dtso +index cad50d8a29a7..7b4274d1540e 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi0.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi0.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- spi0 = "/soc@1c00000/spi@1c05000"; ++ spi0 = "/soc/spi@1c05000"; + }; + }; + + fragment@1 { + target = <&spi0>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi1.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi1.dtso +index f0218eb9f76b..91edb0f87d12 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi1.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi1.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- spi1 = "/soc@1c00000/spi@1c06000"; ++ spi1 = "/soc/spi@1c06000"; + }; + }; + + fragment@1 { + target = <&spi1>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi2.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi2.dtso +index effba42b48bd..5a41644b9086 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi2.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-spi2.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- spi2 = "/soc@1c00000/spi@1c17000"; ++ spi2 = "/soc/spi@1c17000"; + }; + }; + + fragment@1 { + target = <&spi2>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart2.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart2.dtso +index 79d1dca7a311..4642c4106cf6 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart2.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart2.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- serial2 = "/soc@1c00000/serial@1c28800"; ++ serial2 = "/soc/serial@1c28800"; + }; + }; + + fragment@1 { + target = <&pio>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart3.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart3.dtso +index 703acbcf377b..f151c6eb0ce3 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart3.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart3.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- serial3 = "/soc@1c00000/serial@1c28c00"; ++ serial3 = "/soc/serial@1c28c00"; + }; + }; + + fragment@1 { + target = <&pio>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart4.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart4.dtso +index 19180341a67f..6f9915173f51 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart4.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart4.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- serial4 = "/soc@1c00000/serial@1c29000"; ++ serial4 = "/soc/serial@1c29000"; + }; + }; + + fragment@1 { + target = <&uart4>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart5.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart5.dtso +index a1369eee2917..474d406c78d3 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart5.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart5.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- serial5 = "/soc@1c00000/serial@1c29400"; ++ serial5 = "/soc/serial@1c29400"; + }; + }; + + fragment@1 { + target = <&uart5>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart6.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart6.dtso +index fb9efe2a9475..7a5518a86a02 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart6.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart6.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- serial6 = "/soc@1c00000/serial@1c29800"; ++ serial6 = "/soc/serial@1c29800"; + }; + }; + + fragment@1 { + target = <&uart6>; +diff --git a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart7.dtso b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart7.dtso +index bbdca3ec67ed..7687a012fcbd 100644 +--- a/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart7.dtso ++++ b/arch/arm/boot/dts/allwinner/overlay/sun7i-a20-uart7.dtso +@@ -5,11 +5,11 @@ / { + compatible = "allwinner,sun7i-a20"; + + fragment@0 { + target-path = "/aliases"; + __overlay__ { +- serial7 = "/soc@1c00000/serial@1c29c00"; ++ serial7 = "/soc/serial@1c29c00"; + }; + }; + + fragment@1 { + target = <&uart7>; +-- +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 e0dd3f7cb795..a76c3345878e 100644 --- a/patch/kernel/archive/sunxi-6.6/series.conf +++ b/patch/kernel/archive/sunxi-6.6/series.conf @@ -376,7 +376,11 @@ 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/cb1-overlay-light-fix.patch patches.armbian/ARM64-DTS-sun50i-h616-overlays-fix-sun50i-h616-light-overlay.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-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