Refresh the patches for qualcommax.
Signed-off-by: Robert Marko <robimarko@gmail.com>
return -EINVAL;
}
-@@ -1950,7 +1952,7 @@ qca8k_setup(struct dsa_switch *ds)
+@@ -1955,7 +1957,7 @@ qca8k_setup(struct dsa_switch *ds)
cpu_port = qca8k_find_cpu_port(ds);
if (cpu_port < 0) {
static int
qca8k_setup_of_pws_reg(struct qca8k_priv *priv)
{
-@@ -1947,15 +1929,9 @@ qca8k_setup(struct dsa_switch *ds)
+@@ -1952,15 +1934,9 @@ qca8k_setup(struct dsa_switch *ds)
{
struct qca8k_priv *priv = ds->priv;
struct dsa_port *dp;
/* Parse CPU port config to be later used in phy_link mac_config */
ret = qca8k_parse_port_config(priv);
if (ret)
-@@ -2040,17 +2016,12 @@ qca8k_setup(struct dsa_switch *ds)
+@@ -2045,17 +2021,12 @@ qca8k_setup(struct dsa_switch *ds)
if (ret)
return ret;
ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
QCA8K_PORT_LOOKUP_MEMBER,
-@@ -2058,6 +2029,11 @@ qca8k_setup(struct dsa_switch *ds)
+@@ -2063,6 +2034,11 @@ qca8k_setup(struct dsa_switch *ds)
if (ret)
return ret;
--- a/drivers/net/dsa/qca/qca8k-8xxx.c
+++ b/drivers/net/dsa/qca/qca8k-8xxx.c
-@@ -1733,6 +1733,18 @@ qca8k_get_tag_protocol(struct dsa_switch
+@@ -1738,6 +1738,18 @@ qca8k_get_tag_protocol(struct dsa_switch
return DSA_TAG_PROTO_QCA;
}
static int qca8k_port_change_master(struct dsa_switch *ds, int port,
struct net_device *master,
struct netlink_ext_ack *extack)
-@@ -2133,6 +2145,7 @@ static const struct dsa_switch_ops qca8k
+@@ -2138,6 +2150,7 @@ static const struct dsa_switch_ops qca8k
.get_phy_flags = qca8k_get_phy_flags,
.port_lag_join = qca8xxx_port_lag_join,
.port_lag_leave = qca8xxx_port_lag_leave,