diff --git a/target/linux/ath79/patches-5.15/402-v5.17-spi-ar934x-fix-transfer-and-word-delays.patch b/target/linux/ath79/patches-5.15/010-v5.17-spi-ar934x-fix-transfer-and-word-delays.patch similarity index 100% rename from target/linux/ath79/patches-5.15/402-v5.17-spi-ar934x-fix-transfer-and-word-delays.patch rename to target/linux/ath79/patches-5.15/010-v5.17-spi-ar934x-fix-transfer-and-word-delays.patch diff --git a/target/linux/ath79/patches-5.15/403-v5.17-spi-ar934x-fix-transfer-size.patch b/target/linux/ath79/patches-5.15/011-v5.17-spi-ar934x-fix-transfer-size.patch similarity index 100% rename from target/linux/ath79/patches-5.15/403-v5.17-spi-ar934x-fix-transfer-size.patch rename to target/linux/ath79/patches-5.15/011-v5.17-spi-ar934x-fix-transfer-size.patch diff --git a/target/linux/ath79/patches-5.15/410-spi-ath79-Implement-the-spi_mem-interface.patch b/target/linux/ath79/patches-5.15/020-v5.18-spi-ath79-Implement-the-spi_mem-interface.patch similarity index 100% rename from target/linux/ath79/patches-5.15/410-spi-ath79-Implement-the-spi_mem-interface.patch rename to target/linux/ath79/patches-5.15/020-v5.18-spi-ath79-Implement-the-spi_mem-interface.patch diff --git a/target/linux/ath79/patches-5.15/940-ath79-add-support-for-booting-QCN550x.patch b/target/linux/ath79/patches-5.15/030-v5.18-ath79-add-support-for-booting-QCN550x.patch similarity index 98% rename from target/linux/ath79/patches-5.15/940-ath79-add-support-for-booting-QCN550x.patch rename to target/linux/ath79/patches-5.15/030-v5.18-ath79-add-support-for-booting-QCN550x.patch index cf7743363434f4..41ea5d2ef0ac72 100644 --- a/target/linux/ath79/patches-5.15/940-ath79-add-support-for-booting-QCN550x.patch +++ b/target/linux/ath79/patches-5.15/030-v5.18-ath79-add-support-for-booting-QCN550x.patch @@ -38,7 +38,7 @@ Signed-off-by: Wenli Looi chip = "9343"; --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -@@ -867,6 +867,7 @@ +@@ -862,6 +862,7 @@ #define REV_ID_MAJOR_QCA9558 0x1130 #define REV_ID_MAJOR_TP9343 0x0150 #define REV_ID_MAJOR_QCA956X 0x1150 diff --git a/target/linux/ath79/patches-5.15/0007-irqchip-irq-ath79-intc-add-irq-cascade-driver-for-QC.patch b/target/linux/ath79/patches-5.15/300-irqchip-irq-ath79-intc-add-irq-cascade-driver-for-QC.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0007-irqchip-irq-ath79-intc-add-irq-cascade-driver-for-QC.patch rename to target/linux/ath79/patches-5.15/300-irqchip-irq-ath79-intc-add-irq-cascade-driver-for-QC.patch diff --git a/target/linux/ath79/patches-5.15/0008-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch b/target/linux/ath79/patches-5.15/301-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0008-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch rename to target/linux/ath79/patches-5.15/301-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch diff --git a/target/linux/ath79/patches-5.15/0017-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch b/target/linux/ath79/patches-5.15/310-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0017-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch rename to target/linux/ath79/patches-5.15/310-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch diff --git a/target/linux/ath79/patches-5.15/0018-MIPS-pci-ar71xx-convert-to-OF.patch b/target/linux/ath79/patches-5.15/311-MIPS-pci-ar71xx-convert-to-OF.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0018-MIPS-pci-ar71xx-convert-to-OF.patch rename to target/linux/ath79/patches-5.15/311-MIPS-pci-ar71xx-convert-to-OF.patch diff --git a/target/linux/ath79/patches-5.15/0019-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch b/target/linux/ath79/patches-5.15/312-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0019-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch rename to target/linux/ath79/patches-5.15/312-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch diff --git a/target/linux/ath79/patches-5.15/0020-MIPS-pci-ar724x-convert-to-OF.patch b/target/linux/ath79/patches-5.15/313-MIPS-pci-ar724x-convert-to-OF.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0020-MIPS-pci-ar724x-convert-to-OF.patch rename to target/linux/ath79/patches-5.15/313-MIPS-pci-ar724x-convert-to-OF.patch diff --git a/target/linux/ath79/patches-5.15/0036-MIPS-ath79-remove-irq-code-from-pci.patch b/target/linux/ath79/patches-5.15/314-MIPS-ath79-remove-irq-code-from-pci.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0036-MIPS-ath79-remove-irq-code-from-pci.patch rename to target/linux/ath79/patches-5.15/314-MIPS-ath79-remove-irq-code-from-pci.patch diff --git a/target/linux/ath79/patches-5.15/0062-MIPS-pci-ar724x-add-QCA9550-reset-sequence.patch b/target/linux/ath79/patches-5.15/315-MIPS-pci-ar724x-add-QCA9550-reset-sequence.patch similarity index 99% rename from target/linux/ath79/patches-5.15/0062-MIPS-pci-ar724x-add-QCA9550-reset-sequence.patch rename to target/linux/ath79/patches-5.15/315-MIPS-pci-ar724x-add-QCA9550-reset-sequence.patch index 1949a9f886ed9a..375dec8ba2b675 100644 --- a/target/linux/ath79/patches-5.15/0062-MIPS-pci-ar724x-add-QCA9550-reset-sequence.patch +++ b/target/linux/ath79/patches-5.15/315-MIPS-pci-ar724x-add-QCA9550-reset-sequence.patch @@ -16,7 +16,7 @@ Signed-off-by: David Bauer --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -@@ -391,6 +391,7 @@ +@@ -390,6 +390,7 @@ #define QCA955X_PLL_CPU_CONFIG_REG 0x00 #define QCA955X_PLL_DDR_CONFIG_REG 0x04 #define QCA955X_PLL_CLK_CTRL_REG 0x08 @@ -24,7 +24,7 @@ Signed-off-by: David Bauer #define QCA955X_PLL_ETH_XMII_CONTROL_REG 0x28 #define QCA955X_PLL_ETH_SGMII_CONTROL_REG 0x48 #define QCA955X_PLL_ETH_SGMII_SERDES_REG 0x4c -@@ -476,6 +477,9 @@ +@@ -475,6 +476,9 @@ #define QCA956X_PLL_CLK_CTRL_CPU_DDRCLK_FROM_CPUPLL BIT(21) #define QCA956X_PLL_CLK_CTRL_AHBCLK_FROM_DDRPLL BIT(24) diff --git a/target/linux/ath79/patches-5.15/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch b/target/linux/ath79/patches-5.15/316-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch similarity index 100% rename from target/linux/ath79/patches-5.15/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch rename to target/linux/ath79/patches-5.15/316-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch diff --git a/target/linux/ath79/patches-5.15/0037-missing-registers.patch b/target/linux/ath79/patches-5.15/330-missing-registers.patch similarity index 96% rename from target/linux/ath79/patches-5.15/0037-missing-registers.patch rename to target/linux/ath79/patches-5.15/330-missing-registers.patch index 0e6ac52ade6ee1..74789437ec945f 100644 --- a/target/linux/ath79/patches-5.15/0037-missing-registers.patch +++ b/target/linux/ath79/patches-5.15/330-missing-registers.patch @@ -7,7 +7,7 @@ Subject: [PATCH] ath79: gmac: add parsers for rxd(v)- and tx(d|en)-delay for --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -@@ -1226,6 +1226,10 @@ +@@ -1231,6 +1231,10 @@ #define AR934X_ETH_CFG_RDV_DELAY BIT(16) #define AR934X_ETH_CFG_RDV_DELAY_MASK 0x3 #define AR934X_ETH_CFG_RDV_DELAY_SHIFT 16 diff --git a/target/linux/ath79/patches-5.15/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch b/target/linux/ath79/patches-5.15/331-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch similarity index 98% rename from target/linux/ath79/patches-5.15/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch rename to target/linux/ath79/patches-5.15/331-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch index bc09062dc59f48..c2f228dfe1e07b 100644 --- a/target/linux/ath79/patches-5.15/0038-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch +++ b/target/linux/ath79/patches-5.15/331-MIPS-ath79-add-missing-QCA955x-GMAC-registers.patch @@ -16,7 +16,7 @@ Signed-off-by: David Bauer --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -@@ -1246,7 +1246,12 @@ +@@ -1251,7 +1251,12 @@ */ #define QCA955X_GMAC_REG_ETH_CFG 0x00 @@ -29,7 +29,7 @@ Signed-off-by: David Bauer #define QCA955X_ETH_CFG_RGMII_EN BIT(0) #define QCA955X_ETH_CFG_MII_GE0 BIT(1) -@@ -1268,9 +1273,58 @@ +@@ -1273,9 +1278,58 @@ #define QCA955X_ETH_CFG_TXE_DELAY_MASK 0x3 #define QCA955X_ETH_CFG_TXE_DELAY_SHIFT 20 diff --git a/target/linux/ath79/patches-5.15/0040-ath79-sgmii-config.patch b/target/linux/ath79/patches-5.15/332-ath79-sgmii-config.patch similarity index 98% rename from target/linux/ath79/patches-5.15/0040-ath79-sgmii-config.patch rename to target/linux/ath79/patches-5.15/332-ath79-sgmii-config.patch index 4c2b94899aed2f..a6a50e4a8ab492 100644 --- a/target/linux/ath79/patches-5.15/0040-ath79-sgmii-config.patch +++ b/target/linux/ath79/patches-5.15/332-ath79-sgmii-config.patch @@ -21,7 +21,7 @@ Submitted-by: David Bauer --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -@@ -1376,5 +1376,6 @@ +@@ -1380,5 +1380,6 @@ #define QCA956X_SGMII_CONFIG_MODE_CTRL_SHIFT 0 #define QCA956X_SGMII_CONFIG_MODE_CTRL_MASK 0x7 diff --git a/target/linux/ath79/patches-5.15/004-register_gpio_driver_earlier.patch b/target/linux/ath79/patches-5.15/340-register_gpio_driver_earlier.patch similarity index 100% rename from target/linux/ath79/patches-5.15/004-register_gpio_driver_earlier.patch rename to target/linux/ath79/patches-5.15/340-register_gpio_driver_earlier.patch diff --git a/target/linux/ath79/patches-5.15/0034-MIPS-ath79-ath9k-exports.patch b/target/linux/ath79/patches-5.15/350-MIPS-ath79-ath9k-exports.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0034-MIPS-ath79-ath9k-exports.patch rename to target/linux/ath79/patches-5.15/350-MIPS-ath79-ath9k-exports.patch diff --git a/target/linux/ath79/patches-5.15/0041-MIPS-ath79-common-exports.patch b/target/linux/ath79/patches-5.15/351-MIPS-ath79-common-exports.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0041-MIPS-ath79-common-exports.patch rename to target/linux/ath79/patches-5.15/351-MIPS-ath79-common-exports.patch diff --git a/target/linux/ath79/patches-5.15/0039-MIPS-ath79-export-UART1-reference-clock.patch b/target/linux/ath79/patches-5.15/360-MIPS-ath79-export-UART1-reference-clock.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0039-MIPS-ath79-export-UART1-reference-clock.patch rename to target/linux/ath79/patches-5.15/360-MIPS-ath79-export-UART1-reference-clock.patch diff --git a/target/linux/ath79/patches-5.15/0032-MIPS-ath79-sanitize-symbols.patch b/target/linux/ath79/patches-5.15/370-MIPS-ath79-sanitize-symbols.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0032-MIPS-ath79-sanitize-symbols.patch rename to target/linux/ath79/patches-5.15/370-MIPS-ath79-sanitize-symbols.patch diff --git a/target/linux/ath79/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.15/400-mtd-nor-support-mtd-name-from-device-tree.patch similarity index 100% rename from target/linux/ath79/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch rename to target/linux/ath79/patches-5.15/400-mtd-nor-support-mtd-name-from-device-tree.patch diff --git a/target/linux/ath79/patches-5.15/404-mtd-cybertan-trx-parser.patch b/target/linux/ath79/patches-5.15/410-mtd-cybertan-trx-parser.patch similarity index 100% rename from target/linux/ath79/patches-5.15/404-mtd-cybertan-trx-parser.patch rename to target/linux/ath79/patches-5.15/410-mtd-cybertan-trx-parser.patch diff --git a/target/linux/ath79/patches-5.15/430-drivers-link-spi-before-mtd.patch b/target/linux/ath79/patches-5.15/420-drivers-link-spi-before-mtd.patch similarity index 100% rename from target/linux/ath79/patches-5.15/430-drivers-link-spi-before-mtd.patch rename to target/linux/ath79/patches-5.15/420-drivers-link-spi-before-mtd.patch diff --git a/target/linux/ath79/patches-5.15/440-mtd-ar934x-nand-driver.patch b/target/linux/ath79/patches-5.15/430-mtd-ar934x-nand-driver.patch similarity index 100% rename from target/linux/ath79/patches-5.15/440-mtd-ar934x-nand-driver.patch rename to target/linux/ath79/patches-5.15/430-mtd-ar934x-nand-driver.patch diff --git a/target/linux/ath79/patches-5.15/0004-phy-add-ath79-usb-phys.patch b/target/linux/ath79/patches-5.15/700-phy-add-ath79-usb-phys.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0004-phy-add-ath79-usb-phys.patch rename to target/linux/ath79/patches-5.15/700-phy-add-ath79-usb-phys.patch diff --git a/target/linux/ath79/patches-5.15/0005-usb-add-more-OF-quirk-properties.patch b/target/linux/ath79/patches-5.15/701-usb-add-more-OF-quirk-properties.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0005-usb-add-more-OF-quirk-properties.patch rename to target/linux/ath79/patches-5.15/701-usb-add-more-OF-quirk-properties.patch diff --git a/target/linux/ath79/patches-5.15/420-net-use-downstream-ag71xx.patch b/target/linux/ath79/patches-5.15/710-net-use-downstream-ag71xx.patch similarity index 100% rename from target/linux/ath79/patches-5.15/420-net-use-downstream-ag71xx.patch rename to target/linux/ath79/patches-5.15/710-net-use-downstream-ag71xx.patch diff --git a/target/linux/ath79/patches-5.15/900-mdio_bitbang_ignore_ta_value.patch b/target/linux/ath79/patches-5.15/720-mdio_bitbang_ignore_ta_value.patch similarity index 100% rename from target/linux/ath79/patches-5.15/900-mdio_bitbang_ignore_ta_value.patch rename to target/linux/ath79/patches-5.15/720-mdio_bitbang_ignore_ta_value.patch diff --git a/target/linux/ath79/patches-5.15/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch b/target/linux/ath79/patches-5.15/721-phy-mdio-bitbang-prevent-rescheduling-during-command.patch similarity index 100% rename from target/linux/ath79/patches-5.15/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch rename to target/linux/ath79/patches-5.15/721-phy-mdio-bitbang-prevent-rescheduling-during-command.patch diff --git a/target/linux/ath79/patches-5.15/930-ar8216-make-reg-access-atomic.patch b/target/linux/ath79/patches-5.15/730-ar8216-make-reg-access-atomic.patch similarity index 100% rename from target/linux/ath79/patches-5.15/930-ar8216-make-reg-access-atomic.patch rename to target/linux/ath79/patches-5.15/730-ar8216-make-reg-access-atomic.patch diff --git a/target/linux/ath79/patches-5.15/0003-leds-add-reset-controller-based-driver.patch b/target/linux/ath79/patches-5.15/800-leds-add-reset-controller-based-driver.patch similarity index 100% rename from target/linux/ath79/patches-5.15/0003-leds-add-reset-controller-based-driver.patch rename to target/linux/ath79/patches-5.15/800-leds-add-reset-controller-based-driver.patch diff --git a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.15/900-unaligned_access_hacks.patch similarity index 100% rename from target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch rename to target/linux/ath79/patches-5.15/900-unaligned_access_hacks.patch diff --git a/target/linux/ath79/patches-5.15/920-mikrotik-rb4xx.patch b/target/linux/ath79/patches-5.15/910-mikrotik-rb4xx.patch similarity index 100% rename from target/linux/ath79/patches-5.15/920-mikrotik-rb4xx.patch rename to target/linux/ath79/patches-5.15/910-mikrotik-rb4xx.patch diff --git a/target/linux/ath79/patches-5.15/939-mikrotik-rb91x.patch b/target/linux/ath79/patches-5.15/911-mikrotik-rb91x.patch similarity index 100% rename from target/linux/ath79/patches-5.15/939-mikrotik-rb91x.patch rename to target/linux/ath79/patches-5.15/911-mikrotik-rb91x.patch