kernel: bump 5.10 to 5.10.145
authorJohn Audia <therealgraysky@proton.me>
Fri, 23 Sep 2022 20:58:05 +0000 (16:58 -0400)
committerHauke Mehrtens <hauke@hauke-m.de>
Mon, 3 Oct 2022 22:03:27 +0000 (00:03 +0200)
Manually rebased:
  hack-5.10/780-usb-net-MeigLink_modem_support.patch

Removed upstreamed:
  patches-5.10/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch[1]

All other patches automatically rebased.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.145&id=24196210b198e8e39296e277bb93b362aa207775

Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 8fe67fae1d619467b2b3300178d4309f17cfdb54)

include/kernel-5.10
target/linux/generic/hack-5.10/710-net-dsa-mv88e6xxx-default-VID-1.patch
target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
target/linux/generic/pending-5.10/842-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch
target/linux/mpc85xx/patches-5.10/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch [deleted file]

index 3dee01cdcf15704468cce2fccb1dbf78472e60f5..fdc44a78fc466643508a8fb65ce0bafa66209de7 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .144
-LINUX_KERNEL_HASH-5.10.144 = 20c6d26f4d9d0d15d628982bc5e35862b3016d1832f5a545b3bdb131203cd3ca
+LINUX_VERSION-5.10 = .145
+LINUX_KERNEL_HASH-5.10.145 = fc5990f3e57479369eaf193bd7760b84f26d2b670c2d88e473101cb679c5ac61
index 03725653f950587c1ab144e6ed1c557062716255..a09291f0e379667021889006d5a6ba20091f0b67 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2097,6 +2097,7 @@ static int mv88e6xxx_port_fdb_add(struct
+@@ -2101,6 +2101,7 @@ static int mv88e6xxx_port_fdb_add(struct
        struct mv88e6xxx_chip *chip = ds->priv;
        int err;
  
@@ -8,7 +8,7 @@
        mv88e6xxx_reg_lock(chip);
        err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid,
                                           MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC);
-@@ -2111,6 +2112,7 @@ static int mv88e6xxx_port_fdb_del(struct
+@@ -2115,6 +2116,7 @@ static int mv88e6xxx_port_fdb_del(struct
        struct mv88e6xxx_chip *chip = ds->priv;
        int err;
  
index 68cac73935ca6a68bbefb37668d610bac6255414..7ec2afb2d2ac2ff65044aba456f7b02c29e6cdd3 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2659,6 +2659,9 @@ static int mv88e6xxx_setup_port(struct m
+@@ -2663,6 +2663,9 @@ static int mv88e6xxx_setup_port(struct m
        if (dsa_is_cpu_port(ds, port))
                reg = 0;
  
index 0c0739e7eb3bfb121c6a7da91c48dbe1f8076317..a7782eb8df1aa8e58dffa5441e1d53e21dcbc678 100644 (file)
@@ -1,9 +1,9 @@
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1024,6 +1024,7 @@ static const struct usb_device_id produc
-       {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0512)},   /* Quectel EG12/EM12 */
+@@ -1025,6 +1025,7 @@ static const struct usb_device_id produc
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)},   /* Quectel EM160R-GL */
        {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)},   /* Quectel RM500Q-GL */
+       {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)},   /* Quectel RM520N */
 +      {QMI_MATCH_FF_FF_FF(0x05c6, 0xf601)},   /* MeigLink SLM750 */
  
        /* 3. Combined interface devices matching on interface number */
index 16be95ea387e676015af1b07d08ccc4d03a686da..6b94f2ed913ffc52be7d47e314a191a87c1d8c85 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2869,6 +2869,7 @@ static int mv88e6xxx_setup(struct dsa_sw
+@@ -2873,6 +2873,7 @@ static int mv88e6xxx_setup(struct dsa_sw
  
        chip->ds = ds;
        ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);
index a24d6df7cd2c91ba7a666f6673e41aa495cfd95f..35ddad241641ee928785ba342ca528fc052a784a 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -5438,6 +5438,7 @@ static int mv88e6xxx_register_switch(str
+@@ -5442,6 +5442,7 @@ static int mv88e6xxx_register_switch(str
        ds->ops = &mv88e6xxx_switch_ops;
        ds->ageing_time_min = chip->info->age_time_coeff;
        ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
index f2f0e61089b30622cab624619db3a004427ba02a..c6f127add160d8b5dfa938898ca01e4236a10f9f 100644 (file)
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1252,6 +1252,7 @@ static const struct usb_device_id produc
+@@ -1253,6 +1253,7 @@ static const struct usb_device_id produc
        {QMI_FIXED_INTF(0x19d2, 0x1426, 2)},    /* ZTE MF91 */
        {QMI_FIXED_INTF(0x19d2, 0x1428, 2)},    /* Telewell TW-LTE 4G v2 */
        {QMI_FIXED_INTF(0x19d2, 0x1432, 3)},    /* ZTE ME3620 */
diff --git a/target/linux/mpc85xx/patches-5.10/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch b/target/linux/mpc85xx/patches-5.10/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch
deleted file mode 100644 (file)
index c4d7a5d..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From 29af30435022442ec4eccf3166956b8e0b8a2134 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
-Date: Mon, 5 Sep 2022 23:13:47 +0200
-Subject: [PATCH] gpio: mpc8xxx: Fix support for IRQ_TYPE_LEVEL_LOW flow_type
- in mpc85xx
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit e39d5ef67804 ("powerpc/5xxx: extend mpc8xxx_gpio driver to support
-mpc512x gpios") implemented support for IRQ_TYPE_LEVEL_LOW flow type in
-mpc512x via falling edge type. Do same for mpc85xx which support was added
-in commit 345e5c8a1cc3 ("powerpc: Add interrupt support to mpc8xxx_gpio").
-
-Fixes probing of lm90 hwmon driver on mpc85xx based board which use level
-interrupt. Without it kernel prints error and refuse lm90 to work:
-
-    [   15.258370] genirq: Setting trigger mode 8 for irq 49 failed (mpc8xxx_irq_set_type+0x0/0xf8)
-    [   15.267168] lm90 0-004c: cannot request IRQ 49
-    [   15.272708] lm90: probe of 0-004c failed with error -22
-
-Fixes: 345e5c8a1cc3 ("powerpc: Add interrupt support to mpc8xxx_gpio")
-Signed-off-by: Pali Rohár <pali@kernel.org>
----
- drivers/gpio/gpio-mpc8xxx.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
-index d60d5520707d..60c2533a39a5 100644
---- a/drivers/gpio/gpio-mpc8xxx.c
-+++ b/drivers/gpio/gpio-mpc8xxx.c
-@@ -169,6 +169,7 @@ static int mpc8xxx_irq_set_type(struct irq_data *d, unsigned int flow_type)
-       switch (flow_type) {
-       case IRQ_TYPE_EDGE_FALLING:
-+      case IRQ_TYPE_LEVEL_LOW:
-               raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
-               gc->write_reg(mpc8xxx_gc->regs + GPIO_ICR,
-                       gc->read_reg(mpc8xxx_gc->regs + GPIO_ICR)
--- 
-2.34.1
-