aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-05-09 04:07:21 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-05-16 20:26:38 +0200
commit8592df67f40b3afdee68e36dc3820187ec0f98fc (patch)
treed4076ddf755bd9e92738a0a878522c12a09f8f84 /target/linux/lantiq
parent9ee6ac00c43cc253ac554495edb6214563ab1f31 (diff)
downloadupstream-8592df67f40b3afdee68e36dc3820187ec0f98fc.tar.gz
upstream-8592df67f40b3afdee68e36dc3820187ec0f98fc.tar.bz2
upstream-8592df67f40b3afdee68e36dc3820187ec0f98fc.zip
kernel: bump 5.10 to 5.10.114
All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/patches-5.10/0705-v5.13-net-dsa-lantiq-allow-to-use-all-GPHYs-on-xRX300-and-.patch10
-rw-r--r--target/linux/lantiq/patches-5.10/0706-v5.18-net-lantiq-enable-jumbo-frames-on-GSWIP.patch4
2 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/lantiq/patches-5.10/0705-v5.13-net-dsa-lantiq-allow-to-use-all-GPHYs-on-xRX300-and-.patch b/target/linux/lantiq/patches-5.10/0705-v5.13-net-dsa-lantiq-allow-to-use-all-GPHYs-on-xRX300-and-.patch
index c0911ef874..7d68c59199 100644
--- a/target/linux/lantiq/patches-5.10/0705-v5.13-net-dsa-lantiq-allow-to-use-all-GPHYs-on-xRX300-and-.patch
+++ b/target/linux/lantiq/patches-5.10/0705-v5.13-net-dsa-lantiq-allow-to-use-all-GPHYs-on-xRX300-and-.patch
@@ -192,7 +192,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
static void gswip_port_set_link(struct gswip_priv *priv, int port, bool link)
-@@ -1639,6 +1687,9 @@ static void gswip_phylink_mac_config(str
+@@ -1636,6 +1684,9 @@ static void gswip_phylink_mac_config(str
case PHY_INTERFACE_MODE_RGMII_TXID:
miicfg |= GSWIP_MII_CFG_MODE_RGMII;
break;
@@ -202,7 +202,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
default:
dev_err(ds->dev,
"Unsupported interface: %d\n", state->interface);
-@@ -1765,7 +1816,7 @@ static int gswip_get_sset_count(struct d
+@@ -1762,7 +1813,7 @@ static int gswip_get_sset_count(struct d
return ARRAY_SIZE(gswip_rmon_cnt);
}
@@ -211,7 +211,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
.get_tag_protocol = gswip_get_tag_protocol,
.setup = gswip_setup,
.port_enable = gswip_port_enable,
-@@ -1781,7 +1832,31 @@ static const struct dsa_switch_ops gswip
+@@ -1778,7 +1829,31 @@ static const struct dsa_switch_ops gswip
.port_fdb_add = gswip_port_fdb_add,
.port_fdb_del = gswip_port_fdb_del,
.port_fdb_dump = gswip_port_fdb_dump,
@@ -244,7 +244,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
.phylink_mac_config = gswip_phylink_mac_config,
.phylink_mac_link_down = gswip_phylink_mac_link_down,
.phylink_mac_link_up = gswip_phylink_mac_link_up,
-@@ -2043,7 +2118,7 @@ static int gswip_probe(struct platform_d
+@@ -2040,7 +2115,7 @@ static int gswip_probe(struct platform_d
priv->ds->dev = dev;
priv->ds->num_ports = priv->hw_info->max_ports;
priv->ds->priv = priv;
@@ -253,7 +253,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
priv->dev = dev;
version = gswip_switch_r(priv, GSWIP_VERSION);
-@@ -2127,10 +2202,19 @@ static int gswip_remove(struct platform_
+@@ -2124,10 +2199,19 @@ static int gswip_remove(struct platform_
static const struct gswip_hw_info gswip_xrx200 = {
.max_ports = 7,
.cpu_port = 6,
diff --git a/target/linux/lantiq/patches-5.10/0706-v5.18-net-lantiq-enable-jumbo-frames-on-GSWIP.patch b/target/linux/lantiq/patches-5.10/0706-v5.18-net-lantiq-enable-jumbo-frames-on-GSWIP.patch
index 9d96883910..49a19bebee 100644
--- a/target/linux/lantiq/patches-5.10/0706-v5.18-net-lantiq-enable-jumbo-frames-on-GSWIP.patch
+++ b/target/linux/lantiq/patches-5.10/0706-v5.18-net-lantiq-enable-jumbo-frames-on-GSWIP.patch
@@ -107,7 +107,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
static void gswip_xrx200_phylink_validate(struct dsa_switch *ds, int port,
unsigned long *supported,
struct phylink_link_state *state)
-@@ -1832,6 +1873,8 @@ static const struct dsa_switch_ops gswip
+@@ -1829,6 +1870,8 @@ static const struct dsa_switch_ops gswip
.port_fdb_add = gswip_port_fdb_add,
.port_fdb_del = gswip_port_fdb_del,
.port_fdb_dump = gswip_port_fdb_dump,
@@ -116,7 +116,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
.phylink_validate = gswip_xrx200_phylink_validate,
.phylink_mac_config = gswip_phylink_mac_config,
.phylink_mac_link_down = gswip_phylink_mac_link_down,
-@@ -1856,6 +1899,8 @@ static const struct dsa_switch_ops gswip
+@@ -1853,6 +1896,8 @@ static const struct dsa_switch_ops gswip
.port_fdb_add = gswip_port_fdb_add,
.port_fdb_del = gswip_port_fdb_del,
.port_fdb_dump = gswip_port_fdb_dump,