[][openwrt][common][Upgrade kernel version from 5.4.260 to 5.4.271]
[Description]
Change kernel version and hash in
201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.260_to_5.4.271.patch
Fix the conflict in 999-1402-v6.4-mtd-spinand-backport-series-flash.patch
and 999-2601-pcie-add-multi-MSI-support.patch.
[Release-log]
Change-Id: I272fcff38189a3d0aed62acc83e7f7a014bce4d3
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/8768701
diff --git a/21.02/files/target/linux/mediatek/patches-5.4/999-1402-v6.4-mtd-spinand-backport-series-flash.patch b/21.02/files/target/linux/mediatek/patches-5.4/999-1402-v6.4-mtd-spinand-backport-series-flash.patch
index df4f9f9..d3434eb 100644
--- a/21.02/files/target/linux/mediatek/patches-5.4/999-1402-v6.4-mtd-spinand-backport-series-flash.patch
+++ b/21.02/files/target/linux/mediatek/patches-5.4/999-1402-v6.4-mtd-spinand-backport-series-flash.patch
@@ -477,7 +477,7 @@
+ SPINAND_HAS_QE_BIT,
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)),
- SPINAND_INFO("MX35LF4GE4AD", 0x37,
-- NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),
+- NAND_MEMORG(1, 4096, 128, 64, 2048, 40, 1, 1, 1),
+ SPINAND_INFO("MX35LF2G24AD",
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x24),
+ NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 2, 1, 1),
diff --git a/21.02/files/target/linux/mediatek/patches-5.4/999-2601-pcie-add-multi-MSI-support.patch b/21.02/files/target/linux/mediatek/patches-5.4/999-2601-pcie-add-multi-MSI-support.patch
index 80ce145..1707d20 100644
--- a/21.02/files/target/linux/mediatek/patches-5.4/999-2601-pcie-add-multi-MSI-support.patch
+++ b/21.02/files/target/linux/mediatek/patches-5.4/999-2601-pcie-add-multi-MSI-support.patch
@@ -54,23 +54,3 @@
.chip = &mtk_msi_irq_chip,
};
-@@ -627,14 +627,14 @@ static void mtk_pcie_intr_handler(struct irq_desc *desc)
- if (status & MSI_STATUS){
- unsigned long imsi_status;
-
-+ /* Clear MSI interrupt status */
-+ writel(MSI_STATUS, port->base + PCIE_INT_STATUS);
- while ((imsi_status = readl(port->base + PCIE_IMSI_STATUS))) {
- for_each_set_bit(bit, &imsi_status, MTK_MSI_IRQS_NUM) {
- virq = irq_find_mapping(port->inner_domain, bit);
- generic_handle_irq(virq);
- }
- }
-- /* Clear MSI interrupt status */
-- writel(MSI_STATUS, port->base + PCIE_INT_STATUS);
- }
- }
-
---
-2.34.1
-
diff --git a/21.02/patches-base/201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.246_to_5.4.260.patch b/21.02/patches-base/201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.246_to_5.4.260.patch
deleted file mode 100644
index 79c3da6..0000000
--- a/21.02/patches-base/201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.246_to_5.4.260.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/include/kernel-5.4
-+++ b/include/kernel-5.4
-@@ -1,2 +1,2 @@
--LINUX_VERSION-5.4 = .238
--LINUX_KERNEL_HASH-5.4.238 = 70a2b2da85598eba6a73cdc0749e441cbdf3011d9babcb7028a46aa8d98aa91f
-+LINUX_VERSION-5.4 = .260
-+LINUX_KERNEL_HASH-5.4.260 = 9830820714c8f5985c50071cc9e1b40533ee81a4f6c704916c7148d16e54ebfe
diff --git a/21.02/patches-base/201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.260_to_5.4.271.patch b/21.02/patches-base/201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.260_to_5.4.271.patch
new file mode 100644
index 0000000..4e56921
--- /dev/null
+++ b/21.02/patches-base/201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.260_to_5.4.271.patch
@@ -0,0 +1,47 @@
+--- a/include/kernel-5.4
++++ b/include/kernel-5.4
+@@ -1,2 +1,2 @@
+-LINUX_VERSION-5.4 = .238
+-LINUX_KERNEL_HASH-5.4.238 = 70a2b2da85598eba6a73cdc0749e441cbdf3011d9babcb7028a46aa8d98aa91f
++LINUX_VERSION-5.4 = .271
++LINUX_KERNEL_HASH-5.4.271 = cdbc61334cdadbd3945b08f03ed197c65bdf358c3383a4334b3e5b483bd95850
+
+--- a/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch
++++ b/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch
+@@ -81,7 +81,7 @@
+ };
+
+ cpus {
+-@@ -40,23 +39,36 @@
++@@ -39,23 +39,36 @@
+
+ gpio-keys {
+ compatible = "gpio-keys";
+@@ -99,9 +99,9 @@
+ linux,code = <KEY_WPS_BUTTON>;
+ - gpios = <&pio 102 0>;
+ + gpios = <&pio 102 GPIO_ACTIVE_LOW>;
+-+ };
+-+ };
+-+
++ };
++ };
++
+ + leds {
+ + compatible = "gpio-leds";
+ +
+@@ -113,10 +113,10 @@
+ + red {
+ + label = "bpi-r64:pio:red";
+ + gpios = <&pio 88 GPIO_ACTIVE_HIGH>;
+- };
+- };
+-
+- memory {
+++ };
+++ };
+++
++ memory@40000000 {
+ - reg = <0 0x40000000 0 0x20000000>;
+ + reg = <0 0x40000000 0 0x40000000>;
+ };