ipq40xx: refresh qca8k patches

Refresh qca8k patches to sync with the generic backports changes.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/ipq40xx/patches-6.1/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch b/target/linux/ipq40xx/patches-6.1/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
index 8bacb2c71099f7786fd1d32ab0231612badf4766..992884cf31dccccf0da3b2eae0066c881eee6a46 100644 (file)
--- a/target/linux/ipq40xx/patches-6.1/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
+++ b/target/linux/ipq40xx/patches-6.1/706-net-dsa-qca8k-add-IPQ4019-built-in-switch-support.patch
@@ -58,7 +58,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 +obj-$(CONFIG_NET_DSA_QCA8K_IPQ4019)   += qca8k-ipq4019.o qca8k-common.o
 --- a/drivers/net/dsa/qca/qca8k-common.c
 +++ b/drivers/net/dsa/qca/qca8k-common.c
-@@ -449,7 +449,7 @@ static int qca8k_vlan_del(struct qca8k_p
+@@ -412,7 +412,7 @@ static int qca8k_vlan_del(struct qca8k_p
  
        /* Check if we're the last member to be removed */
        del = true;
@@ -67,7 +67,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
                mask = QCA8K_VTU_FUNC0_EG_MODE_PORT_NOT(i);
  
                if ((reg & mask) != mask) {
-@@ -642,7 +642,7 @@ int qca8k_port_bridge_join(struct dsa_sw
+@@ -653,7 +653,7 @@ int qca8k_port_bridge_join(struct dsa_sw
        cpu_port = dsa_to_port(ds, port)->cpu_dp->index;
        port_mask = BIT(cpu_port);
  
@@ -76,7 +76,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
                if (dsa_is_cpu_port(ds, i))
                        continue;
                if (!dsa_port_offloads_bridge(dsa_to_port(ds, i), &bridge))
-@@ -674,7 +674,7 @@ void qca8k_port_bridge_leave(struct dsa_
+@@ -685,7 +685,7 @@ void qca8k_port_bridge_leave(struct dsa_
  
        cpu_port = dsa_to_port(ds, port)->cpu_dp->index;
  
@@ -1057,7 +1057,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
  
  #define QCA8K_QCA832X_MIB_COUNT                               39
  #define QCA8K_QCA833X_MIB_COUNT                               41
-@@ -263,6 +267,7 @@
+@@ -265,6 +269,7 @@
  #define   QCA8K_PORT_LOOKUP_STATE_LEARNING            QCA8K_PORT_LOOKUP_STATE(0x3)
  #define   QCA8K_PORT_LOOKUP_STATE_FORWARD             QCA8K_PORT_LOOKUP_STATE(0x4)
  #define   QCA8K_PORT_LOOKUP_LEARN                     BIT(20)
@@ -1065,7 +1065,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
  #define   QCA8K_PORT_LOOKUP_ING_MIRROR_EN             BIT(25)
  
  #define QCA8K_REG_GOL_TRUNK_CTRL0                     0x700
-@@ -339,6 +344,53 @@
+@@ -341,6 +346,53 @@
  #define MII_ATH_MMD_ADDR                              0x0d
  #define MII_ATH_MMD_DATA                              0x0e
  
@@ -1119,7 +1119,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
  enum {
        QCA8K_PORT_SPEED_10M = 0,
        QCA8K_PORT_SPEED_100M = 1,
-@@ -467,6 +519,10 @@ struct qca8k_priv {
+@@ -466,6 +518,10 @@ struct qca8k_priv {
        struct qca8k_pcs pcs_port_6;
        const struct qca8k_match_data *info;
        struct qca8k_led ports_led[QCA8K_LED_COUNT];