aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-06-14 15:31:10 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-27 22:34:07 +0200
commit4faf889e7e07a743afd58164052ef1531bbb10ec (patch)
tree86dd744ceba6f319adb2f8c9fb78fc1e465b926b /target/linux/lantiq
parent81530d69ef582124f9cc657edacdca9727e805f8 (diff)
downloadupstream-4faf889e7e07a743afd58164052ef1531bbb10ec.tar.gz
upstream-4faf889e7e07a743afd58164052ef1531bbb10ec.tar.bz2
upstream-4faf889e7e07a743afd58164052ef1531bbb10ec.zip
kernel: bump 5.10 to 5.10.122
All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 9edc514e3dafcc36db69046a37daab818cfc1a07)
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-.patch4
1 files changed, 2 insertions, 2 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 7d68c59199..a69f682c03 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
@@ -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,
-@@ -2040,7 +2115,7 @@ static int gswip_probe(struct platform_d
+@@ -2042,7 +2117,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);
-@@ -2124,10 +2199,19 @@ static int gswip_remove(struct platform_
+@@ -2126,10 +2201,19 @@ static int gswip_remove(struct platform_
static const struct gswip_hw_info gswip_xrx200 = {
.max_ports = 7,
.cpu_port = 6,