aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.15/790-v6.4-0004-net-dsa-mt7530-use-regmap-to-access-switch-register-.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-06-28 06:53:45 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-07-02 10:59:25 +0200
commitc719dfd29f8e76ae31264425b2397eae59814a03 (patch)
treefa85f64a459dea29096ad828a2c00948a123d462 /target/linux/generic/backport-5.15/790-v6.4-0004-net-dsa-mt7530-use-regmap-to-access-switch-register-.patch
parent7be76a973540fd21704204c8d58b66d2e9a49ad2 (diff)
downloadupstream-c719dfd29f8e76ae31264425b2397eae59814a03.tar.gz
upstream-c719dfd29f8e76ae31264425b2397eae59814a03.tar.bz2
upstream-c719dfd29f8e76ae31264425b2397eae59814a03.zip
kernel: bump 5.15 to 5.15.119
Build system: x86_64 Build-tested: x86_64/ACEMAGICIAN T8PLUS, ramips/tplink_archer-a6-v3 Run-tested: x86_64/ACEMAGICIAN T8PLUS, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 42cb0f0f260484ac07e3d698ebc5c546e1800051)
Diffstat (limited to 'target/linux/generic/backport-5.15/790-v6.4-0004-net-dsa-mt7530-use-regmap-to-access-switch-register-.patch')
-rw-r--r--target/linux/generic/backport-5.15/790-v6.4-0004-net-dsa-mt7530-use-regmap-to-access-switch-register-.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/backport-5.15/790-v6.4-0004-net-dsa-mt7530-use-regmap-to-access-switch-register-.patch b/target/linux/generic/backport-5.15/790-v6.4-0004-net-dsa-mt7530-use-regmap-to-access-switch-register-.patch
index 9499ca598f..bd1d5c98a7 100644
--- a/target/linux/generic/backport-5.15/790-v6.4-0004-net-dsa-mt7530-use-regmap-to-access-switch-register-.patch
+++ b/target/linux/generic/backport-5.15/790-v6.4-0004-net-dsa-mt7530-use-regmap-to-access-switch-register-.patch
@@ -133,7 +133,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
static void
-@@ -2910,22 +2931,6 @@ static const struct phylink_pcs_ops mt75
+@@ -2920,22 +2941,6 @@ static const struct phylink_pcs_ops mt75
.pcs_an_restart = mt7530_pcs_an_restart,
};
@@ -156,7 +156,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void
mt7530_mdio_regmap_lock(void *mdio_lock)
{
-@@ -2938,7 +2943,7 @@ mt7530_mdio_regmap_unlock(void *mdio_loc
+@@ -2948,7 +2953,7 @@ mt7530_mdio_regmap_unlock(void *mdio_loc
mutex_unlock(mdio_lock);
}
@@ -165,7 +165,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
.reg_write = mt7530_regmap_write,
.reg_read = mt7530_regmap_read,
};
-@@ -2971,7 +2976,7 @@ mt7531_create_sgmii(struct mt7530_priv *
+@@ -2981,7 +2986,7 @@ mt7531_create_sgmii(struct mt7530_priv *
mt7531_pcs_config[i]->lock_arg = &priv->bus->mdio_lock;
regmap = devm_regmap_init(priv->dev,
@@ -174,7 +174,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mt7531_pcs_config[i]);
if (IS_ERR(regmap)) {
ret = PTR_ERR(regmap);
-@@ -3136,6 +3141,7 @@ MODULE_DEVICE_TABLE(of, mt7530_of_match)
+@@ -3146,6 +3151,7 @@ MODULE_DEVICE_TABLE(of, mt7530_of_match)
static int
mt7530_probe(struct mdio_device *mdiodev)
{
@@ -182,7 +182,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
struct mt7530_priv *priv;
struct device_node *dn;
-@@ -3215,6 +3221,21 @@ mt7530_probe(struct mdio_device *mdiodev
+@@ -3225,6 +3231,21 @@ mt7530_probe(struct mdio_device *mdiodev
mutex_init(&priv->reg_mutex);
dev_set_drvdata(&mdiodev->dev, priv);