sunxi: re-order patches

Re-order the kernel patches according to generic/PATCHES.md,
and refresh them as required.

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

diff --git a/target/linux/sunxi/patches-6.18/102-sunxi-add-OF-node-for-USB-eth-on-NanoPi-R1S-H5.patch b/target/linux/sunxi/patches-6.18/100-sunxi-add-OF-node-for-USB-eth-on-NanoPi-R1S-H5.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/102-sunxi-add-OF-node-for-USB-eth-on-NanoPi-R1S-H5.patch
rename to target/linux/sunxi/patches-6.18/100-sunxi-add-OF-node-for-USB-eth-on-NanoPi-R1S-H5.patch

diff --git a/target/linux/sunxi/patches-6.18/410-sunxi-add-bananapi-p2-zero.patch b/target/linux/sunxi/patches-6.18/101-sunxi-add-bananapi-p2-zero.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/410-sunxi-add-bananapi-p2-zero.patch
rename to target/linux/sunxi/patches-6.18/101-sunxi-add-bananapi-p2-zero.patch

diff --git a/target/linux/sunxi/patches-6.18/430-arm64-dts-allwinner-a64-olinuxino-add-status-LED-ali.patch b/target/linux/sunxi/patches-6.18/300-arm64-dts-allwinner-a64-olinuxino-add-status-LED-ali.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/430-arm64-dts-allwinner-a64-olinuxino-add-status-LED-ali.patch
rename to target/linux/sunxi/patches-6.18/300-arm64-dts-allwinner-a64-olinuxino-add-status-LED-ali.patch

diff --git a/target/linux/sunxi/patches-6.18/431-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch b/target/linux/sunxi/patches-6.18/301-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/431-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch
rename to target/linux/sunxi/patches-6.18/301-arm64-dts-allwinner-nanopi-r1s-h5-add-status-LED.patch

diff --git a/target/linux/sunxi/patches-6.18/442-arm64-dts-orangepi-one-plus-enable-PWM.patch b/target/linux/sunxi/patches-6.18/302-arm64-dts-orangepi-one-plus-enable-PWM.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/442-arm64-dts-orangepi-one-plus-enable-PWM.patch
rename to target/linux/sunxi/patches-6.18/302-arm64-dts-orangepi-one-plus-enable-PWM.patch

diff --git a/target/linux/sunxi/patches-6.18/541-ARM-dts-riscv-add-uart0_pins-on-Port-E-pins.patch b/target/linux/sunxi/patches-6.18/303-ARM-dts-riscv-add-uart0_pins-on-Port-E-pins.patch
similarity index 89%
rename from target/linux/sunxi/patches-6.18/541-ARM-dts-riscv-add-uart0_pins-on-Port-E-pins.patch
rename to target/linux/sunxi/patches-6.18/303-ARM-dts-riscv-add-uart0_pins-on-Port-E-pins.patch
index c93cee4c291dd4aed5bce997f71d830ce8b70a13..26616ea98df0e35b1fc5399d294a996718eb0e5d 100644 (file)
--- a/target/linux/sunxi/patches-6.18/541-ARM-dts-riscv-add-uart0_pins-on-Port-E-pins.patch
+++ b/target/linux/sunxi/patches-6.18/303-ARM-dts-riscv-add-uart0_pins-on-Port-E-pins.patch
@@ -10,9 +10,9 @@ Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
 
 --- a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
 +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
-@@ -198,6 +198,12 @@
-                                      "PC7";
-                               function = "spi0";
+@@ -191,6 +191,12 @@
+                               pins = "PB6", "PB7";
+                               function = "uart3";
                        };
 +
 +                      /omit-if-no-ref/

diff --git a/target/linux/sunxi/patches-6.18/542-ARM-dts-sunxi-add-support-for-MangoPI-MQDual-T113-va.patch b/target/linux/sunxi/patches-6.18/304-ARM-dts-sunxi-add-support-for-MangoPI-MQDual-T113-va.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/542-ARM-dts-sunxi-add-support-for-MangoPI-MQDual-T113-va.patch
rename to target/linux/sunxi/patches-6.18/304-ARM-dts-sunxi-add-support-for-MangoPI-MQDual-T113-va.patch

diff --git a/target/linux/sunxi/patches-6.18/543-ARM-dts-add-support-for-MYIR-MYD-YT113X-boards.patch b/target/linux/sunxi/patches-6.18/305-ARM-dts-add-support-for-MYIR-MYD-YT113X-boards.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/543-ARM-dts-add-support-for-MYIR-MYD-YT113X-boards.patch
rename to target/linux/sunxi/patches-6.18/305-ARM-dts-add-support-for-MYIR-MYD-YT113X-boards.patch

diff --git a/target/linux/sunxi/patches-6.18/544-ARM-dts-add-support-for-Rongpin-RP-T113-board.patch b/target/linux/sunxi/patches-6.18/306-ARM-dts-add-support-for-Rongpin-RP-T113-board.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/544-ARM-dts-add-support-for-Rongpin-RP-T113-board.patch
rename to target/linux/sunxi/patches-6.18/306-ARM-dts-add-support-for-Rongpin-RP-T113-board.patch

diff --git a/target/linux/sunxi/patches-6.18/550-ARM-dts-sunxi-add-support-for-LctechPi-PC-T113.patch b/target/linux/sunxi/patches-6.18/307-ARM-dts-sunxi-add-support-for-LctechPi-PC-T113.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/550-ARM-dts-sunxi-add-support-for-LctechPi-PC-T113.patch
rename to target/linux/sunxi/patches-6.18/307-ARM-dts-sunxi-add-support-for-LctechPi-PC-T113.patch

diff --git a/target/linux/sunxi/patches-6.18/551-dts-support-uart4-on-pd.patch b/target/linux/sunxi/patches-6.18/308-dts-support-uart4-on-pd.patch
similarity index 94%
rename from target/linux/sunxi/patches-6.18/551-dts-support-uart4-on-pd.patch
rename to target/linux/sunxi/patches-6.18/308-dts-support-uart4-on-pd.patch
index 7f5d500c4fd0f656bc32ebe9696d0c162e30a950..a2c2441768863e3577ff78a56814f391b68a66f6 100644 (file)
--- a/target/linux/sunxi/patches-6.18/551-dts-support-uart4-on-pd.patch
+++ b/target/linux/sunxi/patches-6.18/308-dts-support-uart4-on-pd.patch
@@ -1,6 +1,6 @@
 --- a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
 +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
-@@ -204,6 +204,12 @@
+@@ -197,6 +197,12 @@
                                pins = "PE2", "PE3";
                                function = "uart0";
                        };

diff --git a/target/linux/sunxi/patches-6.18/552-dts-add-olimex-t113-olinuxino.patch b/target/linux/sunxi/patches-6.18/309-dts-add-olimex-t113-olinuxino.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/552-dts-add-olimex-t113-olinuxino.patch
rename to target/linux/sunxi/patches-6.18/309-dts-add-olimex-t113-olinuxino.patch

diff --git a/target/linux/sunxi/patches-6.18/553-dts-add-aliases-to-olinuxino-t113.patch b/target/linux/sunxi/patches-6.18/310-dts-add-aliases-to-olinuxino-t113.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/553-dts-add-aliases-to-olinuxino-t113.patch
rename to target/linux/sunxi/patches-6.18/310-dts-add-aliases-to-olinuxino-t113.patch

diff --git a/target/linux/sunxi/patches-6.18/554-dts-allwinner-d1-add-led-controller-node.patch b/target/linux/sunxi/patches-6.18/311-dts-allwinner-d1-add-led-controller-node.patch
similarity index 98%
rename from target/linux/sunxi/patches-6.18/554-dts-allwinner-d1-add-led-controller-node.patch
rename to target/linux/sunxi/patches-6.18/311-dts-allwinner-d1-add-led-controller-node.patch
index 49e96f1a8f49f7e2f8593db78e44196566b52df4..096d02f835e4de95079707dfa609a5b8c48cef50 100644 (file)
--- a/target/linux/sunxi/patches-6.18/554-dts-allwinner-d1-add-led-controller-node.patch
+++ b/target/linux/sunxi/patches-6.18/311-dts-allwinner-d1-add-led-controller-node.patch
@@ -36,7 +36,7 @@ Changes in v5:
                function = "uart0";
 --- a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
 +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
-@@ -223,6 +223,21 @@
+@@ -216,6 +216,21 @@
                        #reset-cells = <1>;
                };
  

diff --git a/target/linux/sunxi/patches-6.18/555-dts-add-rgb-leds-to-olinuxino.patch b/target/linux/sunxi/patches-6.18/312-dts-add-rgb-leds-to-olinuxino.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/555-dts-add-rgb-leds-to-olinuxino.patch
rename to target/linux/sunxi/patches-6.18/312-dts-add-rgb-leds-to-olinuxino.patch

diff --git a/target/linux/sunxi/patches-6.18/540-riscv-dts-allwinner-d1-Add-QSPI-pins-node-for-pinmux.patch b/target/linux/sunxi/patches-6.18/401-riscv-dts-allwinner-d1-Add-QSPI-pins-node-for-pinmux.patch
similarity index 91%
rename from target/linux/sunxi/patches-6.18/540-riscv-dts-allwinner-d1-Add-QSPI-pins-node-for-pinmux.patch
rename to target/linux/sunxi/patches-6.18/401-riscv-dts-allwinner-d1-Add-QSPI-pins-node-for-pinmux.patch
index 984471ed2368e2cfb88f3fe3fb3155903643e6a2..cd1246fd047bdcb3d33634d8f67d2936408388ff 100644 (file)
--- a/target/linux/sunxi/patches-6.18/540-riscv-dts-allwinner-d1-Add-QSPI-pins-node-for-pinmux.patch
+++ b/target/linux/sunxi/patches-6.18/401-riscv-dts-allwinner-d1-Add-QSPI-pins-node-for-pinmux.patch
@@ -14,9 +14,9 @@ Signed-off-by: Maksim Kiselev <bigunclemax@gmail.com>
 
 --- a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
 +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
-@@ -191,6 +191,13 @@
-                               pins = "PB6", "PB7";
-                               function = "uart3";
+@@ -203,6 +203,13 @@
+                               pins = "PD7", "PD8";
+                               function = "uart4";
                        };
 +
 +                      /omit-if-no-ref/

diff --git a/target/linux/sunxi/patches-6.18/450-arm64-dts-enable-wifi-on-pine64-boards.patch b/target/linux/sunxi/patches-6.18/700-arm64-dts-enable-wifi-on-pine64-boards.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/450-arm64-dts-enable-wifi-on-pine64-boards.patch
rename to target/linux/sunxi/patches-6.18/700-arm64-dts-enable-wifi-on-pine64-boards.patch

diff --git a/target/linux/sunxi/patches-6.18/451-sunxi-add-csi-video-support-for-nanopi-neo-air.patch b/target/linux/sunxi/patches-6.18/800-sunxi-add-csi-video-support-for-nanopi-neo-air.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/451-sunxi-add-csi-video-support-for-nanopi-neo-air.patch
rename to target/linux/sunxi/patches-6.18/800-sunxi-add-csi-video-support-for-nanopi-neo-air.patch

diff --git a/target/linux/sunxi/patches-6.18/460-f1c100s-sram-driver.patch b/target/linux/sunxi/patches-6.18/801-f1c100s-sram-driver.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/460-f1c100s-sram-driver.patch
rename to target/linux/sunxi/patches-6.18/801-f1c100s-sram-driver.patch

diff --git a/target/linux/sunxi/patches-6.18/461-f1c100s-watchdog-compat.patch b/target/linux/sunxi/patches-6.18/802-f1c100s-watchdog-compat.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/461-f1c100s-watchdog-compat.patch
rename to target/linux/sunxi/patches-6.18/802-f1c100s-watchdog-compat.patch

diff --git a/target/linux/sunxi/patches-6.18/545-riscv-dts-allwinner-d1-Add-thermal-sensor.patch b/target/linux/sunxi/patches-6.18/803-riscv-dts-allwinner-d1-Add-thermal-sensor.patch
similarity index 97%
rename from target/linux/sunxi/patches-6.18/545-riscv-dts-allwinner-d1-Add-thermal-sensor.patch
rename to target/linux/sunxi/patches-6.18/803-riscv-dts-allwinner-d1-Add-thermal-sensor.patch
index 1898087d11f1cd5208fc056f06b9db385ebc3f82..c419a4f883aa441fa6a6cef71082d22f83e300b3 100644 (file)
--- a/target/linux/sunxi/patches-6.18/545-riscv-dts-allwinner-d1-Add-thermal-sensor.patch
+++ b/target/linux/sunxi/patches-6.18/803-riscv-dts-allwinner-d1-Add-thermal-sensor.patch
@@ -13,7 +13,7 @@ Signed-off-by: Maxim Kiselev <bigunclemax@gmail.com>
 
 --- a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
 +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
-@@ -227,6 +227,19 @@
+@@ -248,6 +248,19 @@
                        #io-channel-cells = <1>;
                };
  
@@ -33,7 +33,7 @@ Signed-off-by: Maxim Kiselev <bigunclemax@gmail.com>
                dmic: dmic@2031000 {
                        compatible = "allwinner,sun20i-d1-dmic",
                                     "allwinner,sun50i-h6-dmic";
-@@ -487,6 +500,10 @@
+@@ -508,6 +521,10 @@
                        reg = <0x3006000 0x1000>;
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/target/linux/sunxi/patches-6.18/301-orangepi_pc2_usb_otg_to_host_key_power.patch b/target/linux/sunxi/patches-6.18/900-orangepi_pc2_usb_otg_to_host_key_power.patch
similarity index 100%
rename from target/linux/sunxi/patches-6.18/301-orangepi_pc2_usb_otg_to_host_key_power.patch
rename to target/linux/sunxi/patches-6.18/900-orangepi_pc2_usb_otg_to_host_key_power.patch