diff --git a/projects/Allwinner/patches/linux/0009-firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch b/projects/Allwinner/patches/linux/0008-firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0009-firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch
rename to projects/Allwinner/patches/linux/0008-firmware-arm_scpi-Support-unidirectional-mailbox-cha.patch
diff --git a/projects/Allwinner/patches/linux/0010-ARM-dts-sunxi-h3-h5-Add-SCPI-protocol.patch b/projects/Allwinner/patches/linux/0009-ARM-dts-sunxi-h3-h5-Add-SCPI-protocol.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0010-ARM-dts-sunxi-h3-h5-Add-SCPI-protocol.patch
rename to projects/Allwinner/patches/linux/0009-ARM-dts-sunxi-h3-h5-Add-SCPI-protocol.patch
diff --git a/projects/Allwinner/patches/linux/0011-arm64-dts-allwinner-a64-Add-SCPI-protocol.patch b/projects/Allwinner/patches/linux/0010-arm64-dts-allwinner-a64-Add-SCPI-protocol.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0011-arm64-dts-allwinner-a64-Add-SCPI-protocol.patch
rename to projects/Allwinner/patches/linux/0010-arm64-dts-allwinner-a64-Add-SCPI-protocol.patch
diff --git a/projects/Allwinner/patches/linux/0012-arm64-dts-allwinner-h6-Add-SCPI-protocol.patch b/projects/Allwinner/patches/linux/0011-arm64-dts-allwinner-h6-Add-SCPI-protocol.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0012-arm64-dts-allwinner-h6-Add-SCPI-protocol.patch
rename to projects/Allwinner/patches/linux/0011-arm64-dts-allwinner-h6-Add-SCPI-protocol.patch
diff --git a/projects/Allwinner/patches/linux/0013-ASoC-hdmi-codec-fix-channel-allocation.patch b/projects/Allwinner/patches/linux/0012-ASoC-hdmi-codec-fix-channel-allocation.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0013-ASoC-hdmi-codec-fix-channel-allocation.patch
rename to projects/Allwinner/patches/linux/0012-ASoC-hdmi-codec-fix-channel-allocation.patch
diff --git a/projects/Allwinner/patches/linux/0014-drm_call_drm_atomic_helper_shutdown_at_shutdown.patch b/projects/Allwinner/patches/linux/0013-drm_call_drm_atomic_helper_shutdown_at_shutdown.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0014-drm_call_drm_atomic_helper_shutdown_at_shutdown.patch
rename to projects/Allwinner/patches/linux/0013-drm_call_drm_atomic_helper_shutdown_at_shutdown.patch
diff --git a/projects/Allwinner/patches/linux/0024-WIP-dw-hdmi-cec-sleep-100ms-on-error.patch b/projects/Allwinner/patches/linux/0014-WIP-dw-hdmi-cec-sleep-100ms-on-error.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0024-WIP-dw-hdmi-cec-sleep-100ms-on-error.patch
rename to projects/Allwinner/patches/linux/0014-WIP-dw-hdmi-cec-sleep-100ms-on-error.patch
diff --git a/projects/Allwinner/patches/linux/0027-drm-sun4i-mixer-Add-caching-support.patch b/projects/Allwinner/patches/linux/0015-drm-sun4i-mixer-Add-caching-support.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0027-drm-sun4i-mixer-Add-caching-support.patch
rename to projects/Allwinner/patches/linux/0015-drm-sun4i-mixer-Add-caching-support.patch
diff --git a/projects/Allwinner/patches/linux/0028-mfd-Add-support-for-AC200.patch b/projects/Allwinner/patches/linux/0016-mfd-Add-support-for-AC200.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0028-mfd-Add-support-for-AC200.patch
rename to projects/Allwinner/patches/linux/0016-mfd-Add-support-for-AC200.patch
diff --git a/projects/Allwinner/patches/linux/0029-net-phy-Add-support-for-AC200-EPHY.patch b/projects/Allwinner/patches/linux/0017-net-phy-Add-support-for-AC200-EPHY.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0029-net-phy-Add-support-for-AC200-EPHY.patch
rename to projects/Allwinner/patches/linux/0017-net-phy-Add-support-for-AC200-EPHY.patch
diff --git a/projects/Allwinner/patches/linux/0030-wip-H6-deinterlace.patch b/projects/Allwinner/patches/linux/0018-wip-H6-deinterlace.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0030-wip-H6-deinterlace.patch
rename to projects/Allwinner/patches/linux/0018-wip-H6-deinterlace.patch
diff --git a/projects/Allwinner/patches/linux/0031-arm64-dts-h6-deinterlace.patch b/projects/Allwinner/patches/linux/0019-arm64-dts-h6-deinterlace.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0031-arm64-dts-h6-deinterlace.patch
rename to projects/Allwinner/patches/linux/0019-arm64-dts-h6-deinterlace.patch
diff --git a/projects/Allwinner/patches/linux/0033-WIP-I2S-multi-channel.patch b/projects/Allwinner/patches/linux/0020-WIP-I2S-multi-channel.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0033-WIP-I2S-multi-channel.patch
rename to projects/Allwinner/patches/linux/0020-WIP-I2S-multi-channel.patch
diff --git a/projects/Allwinner/patches/linux/0034-HACK-h3-h5-Add-HDMI-sound-card.patch b/projects/Allwinner/patches/linux/0021-HACK-h3-h5-Add-HDMI-sound-card.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0034-HACK-h3-h5-Add-HDMI-sound-card.patch
rename to projects/Allwinner/patches/linux/0021-HACK-h3-h5-Add-HDMI-sound-card.patch
diff --git a/projects/Allwinner/patches/linux/0039-HACK-a64-Add-HDMI-sound-card.patch b/projects/Allwinner/patches/linux/0022-HACK-a64-Add-HDMI-sound-card.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0039-HACK-a64-Add-HDMI-sound-card.patch
rename to projects/Allwinner/patches/linux/0022-HACK-a64-Add-HDMI-sound-card.patch
diff --git a/projects/Allwinner/patches/linux/0041-bpi-m2u-analog-codec.patch b/projects/Allwinner/patches/linux/0023-bpi-m2u-analog-codec.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0041-bpi-m2u-analog-codec.patch
rename to projects/Allwinner/patches/linux/0023-bpi-m2u-analog-codec.patch
diff --git a/projects/Allwinner/patches/linux/0042-r40-hdmi-audio-wip.patch b/projects/Allwinner/patches/linux/0024-r40-hdmi-audio-wip.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0042-r40-hdmi-audio-wip.patch
rename to projects/Allwinner/patches/linux/0024-r40-hdmi-audio-wip.patch
diff --git a/projects/Allwinner/patches/linux/0043-HACK-h6-Add-HDMI-sound-card.patch b/projects/Allwinner/patches/linux/0025-HACK-h6-Add-HDMI-sound-card.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0043-HACK-h6-Add-HDMI-sound-card.patch
rename to projects/Allwinner/patches/linux/0025-HACK-h6-Add-HDMI-sound-card.patch
diff --git a/projects/Allwinner/patches/linux/0044-phy-handle-optional-regulator-for-PHY.patch b/projects/Allwinner/patches/linux/0026-phy-handle-optional-regulator-for-PHY.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0044-phy-handle-optional-regulator-for-PHY.patch
rename to projects/Allwinner/patches/linux/0026-phy-handle-optional-regulator-for-PHY.patch
diff --git a/projects/Allwinner/patches/linux/0045-arm64-dts-allwinner-orange-pi-3-Enable-ethernet.patch b/projects/Allwinner/patches/linux/0027-arm64-dts-allwinner-orange-pi-3-Enable-ethernet.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0045-arm64-dts-allwinner-orange-pi-3-Enable-ethernet.patch
rename to projects/Allwinner/patches/linux/0027-arm64-dts-allwinner-orange-pi-3-Enable-ethernet.patch
diff --git a/projects/Allwinner/patches/linux/0048-arm64-allwinner-dts-h6-enable-USB3-port-on-Pine-H64.patch b/projects/Allwinner/patches/linux/0028-arm64-allwinner-dts-h6-enable-USB3-port-on-Pine-H64.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0048-arm64-allwinner-dts-h6-enable-USB3-port-on-Pine-H64.patch
rename to projects/Allwinner/patches/linux/0028-arm64-allwinner-dts-h6-enable-USB3-port-on-Pine-H64.patch
diff --git a/projects/Allwinner/patches/linux/0049-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch b/projects/Allwinner/patches/linux/0029-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0049-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
rename to projects/Allwinner/patches/linux/0029-arm64-dts-allwinner-h6-Add-AC200-EPHY-related-nodes.patch
diff --git a/projects/Allwinner/patches/linux/0051-arm64-dts-allwinner-h6-tanix-tx6-enable-ethernet.patch b/projects/Allwinner/patches/linux/0030-arm64-dts-allwinner-h6-tanix-tx6-enable-ethernet.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0051-arm64-dts-allwinner-h6-tanix-tx6-enable-ethernet.patch
rename to projects/Allwinner/patches/linux/0030-arm64-dts-allwinner-h6-tanix-tx6-enable-ethernet.patch
diff --git a/projects/Allwinner/patches/linux/0052-arm64-allwinner-h6-Enable-USB3-for-OrangePi-Lite2.patch b/projects/Allwinner/patches/linux/0031-arm64-allwinner-h6-Enable-USB3-for-OrangePi-Lite2.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0052-arm64-allwinner-h6-Enable-USB3-for-OrangePi-Lite2.patch
rename to projects/Allwinner/patches/linux/0031-arm64-allwinner-h6-Enable-USB3-for-OrangePi-Lite2.patch
diff --git a/projects/Allwinner/patches/linux/0053-mmc-sunxi-fix-unusuable-eMMC-on-some-H6-boards-by-di.patch b/projects/Allwinner/patches/linux/0032-mmc-sunxi-fix-unusuable-eMMC-on-some-H6-boards-by-di.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0053-mmc-sunxi-fix-unusuable-eMMC-on-some-H6-boards-by-di.patch
rename to projects/Allwinner/patches/linux/0032-mmc-sunxi-fix-unusuable-eMMC-on-some-H6-boards-by-di.patch
diff --git a/projects/Allwinner/patches/linux/0056-bluetooth-btrtl-add-hci-ver-rtl8822cs.patch b/projects/Allwinner/patches/linux/0033-bluetooth-btrtl-add-hci-ver-rtl8822cs.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0056-bluetooth-btrtl-add-hci-ver-rtl8822cs.patch
rename to projects/Allwinner/patches/linux/0033-bluetooth-btrtl-add-hci-ver-rtl8822cs.patch
diff --git a/projects/Allwinner/patches/linux/0057-HACK-Disable-MBUS-due-to-fw_devlink-on.patch b/projects/Allwinner/patches/linux/0034-HACK-Disable-MBUS-due-to-fw_devlink-on.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0057-HACK-Disable-MBUS-due-to-fw_devlink-on.patch
rename to projects/Allwinner/patches/linux/0034-HACK-Disable-MBUS-due-to-fw_devlink-on.patch
diff --git a/projects/Allwinner/patches/linux/0058-WIP-OPi3-DT-fixes.patch b/projects/Allwinner/patches/linux/0035-WIP-OPi3-DT-fixes.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0058-WIP-OPi3-DT-fixes.patch
rename to projects/Allwinner/patches/linux/0035-WIP-OPi3-DT-fixes.patch
diff --git a/projects/Allwinner/patches/linux/0060-WIP-drm-bridge-synopsys-Fix-CEC-not-working-after-power.patch b/projects/Allwinner/patches/linux/0036-WIP-drm-bridge-synopsys-Fix-CEC-not-working-after-power.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0060-WIP-drm-bridge-synopsys-Fix-CEC-not-working-after-power.patch
rename to projects/Allwinner/patches/linux/0036-WIP-drm-bridge-synopsys-Fix-CEC-not-working-after-power.patch
diff --git a/projects/Allwinner/patches/linux/0061-media--cedrus--Don-t-CPU-map-source-buffers.patch b/projects/Allwinner/patches/linux/0037-media--cedrus--Don-t-CPU-map-source-buffers.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0061-media--cedrus--Don-t-CPU-map-source-buffers.patch
rename to projects/Allwinner/patches/linux/0037-media--cedrus--Don-t-CPU-map-source-buffers.patch
diff --git a/projects/Allwinner/patches/linux/0065-wip-fix-H6-4k-60.patch b/projects/Allwinner/patches/linux/0038-wip-fix-H6-4k-60.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0065-wip-fix-H6-4k-60.patch
rename to projects/Allwinner/patches/linux/0038-wip-fix-H6-4k-60.patch
diff --git a/projects/Allwinner/patches/linux/0066-arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch b/projects/Allwinner/patches/linux/0039-arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0066-arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch
rename to projects/Allwinner/patches/linux/0039-arm64-dts-allwinner-h6-Fix-Cedrus-IOMMU-again.patch
diff --git a/projects/Allwinner/patches/linux/0073-iommu-sun50i-Allow-page-sizes-multiple-of-4096.patch b/projects/Allwinner/patches/linux/0040-iommu-sun50i-Allow-page-sizes-multiple-of-4096.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0073-iommu-sun50i-Allow-page-sizes-multiple-of-4096.patch
rename to projects/Allwinner/patches/linux/0040-iommu-sun50i-Allow-page-sizes-multiple-of-4096.patch
diff --git a/projects/Allwinner/patches/linux/0077-OrangePi-3-LTS-support.patch b/projects/Allwinner/patches/linux/0041-OrangePi-3-LTS-support.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0077-OrangePi-3-LTS-support.patch
rename to projects/Allwinner/patches/linux/0041-OrangePi-3-LTS-support.patch
diff --git a/projects/Allwinner/patches/linux/0100-tanix-mmc-rtw88-keep-power-in-suspend.patch b/projects/Allwinner/patches/linux/0042-tanix-mmc-rtw88-keep-power-in-suspend.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0100-tanix-mmc-rtw88-keep-power-in-suspend.patch
rename to projects/Allwinner/patches/linux/0042-tanix-mmc-rtw88-keep-power-in-suspend.patch
diff --git a/projects/Allwinner/patches/linux/0101-Bluetooth-btrtl-Add-support-for-RTL8822BS.patch b/projects/Allwinner/patches/linux/0043-Bluetooth-btrtl-Add-support-for-RTL8822BS.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0101-Bluetooth-btrtl-Add-support-for-RTL8822BS.patch
rename to projects/Allwinner/patches/linux/0043-Bluetooth-btrtl-Add-support-for-RTL8822BS.patch
diff --git a/projects/Allwinner/patches/linux/0105-ARM-dts-sun8i-r40-Add-interconnect-to-video-codec.patch b/projects/Allwinner/patches/linux/0044-ARM-dts-sun8i-r40-Add-interconnect-to-video-codec.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0105-ARM-dts-sun8i-r40-Add-interconnect-to-video-codec.patch
rename to projects/Allwinner/patches/linux/0044-ARM-dts-sun8i-r40-Add-interconnect-to-video-codec.patch
diff --git a/projects/Allwinner/patches/linux/0036-wip-h3-h5-cvbs.patch b/projects/Allwinner/patches/linux/0045-wip-h3-h5-cvbs.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0036-wip-h3-h5-cvbs.patch
rename to projects/Allwinner/patches/linux/0045-wip-h3-h5-cvbs.patch
diff --git a/projects/Allwinner/patches/linux/0063-HACK-SW-CEC-implementation-for-H3.patch b/projects/Allwinner/patches/linux/0046-HACK-SW-CEC-implementation-for-H3.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0063-HACK-SW-CEC-implementation-for-H3.patch
rename to projects/Allwinner/patches/linux/0046-HACK-SW-CEC-implementation-for-H3.patch
diff --git a/projects/Allwinner/patches/linux/0075-Revert-drm-sun4i-dw-hdmi-Fix-ddc-en-GPIO-consumer-co.patch b/projects/Allwinner/patches/linux/0047-Revert-drm-sun4i-dw-hdmi-Fix-ddc-en-GPIO-consumer-co.patch
similarity index 100%
rename from projects/Allwinner/patches/linux/0075-Revert-drm-sun4i-dw-hdmi-Fix-ddc-en-GPIO-consumer-co.patch
rename to projects/Allwinner/patches/linux/0047-Revert-drm-sun4i-dw-hdmi-Fix-ddc-en-GPIO-consumer-co.patch