75 lines
2.2 KiB
Diff
75 lines
2.2 KiB
Diff
From efb41b8e9b7bbb08ace1930373bff63d4f5cc6e2 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 3 Apr 2023 02:17:40 +0100
|
|
Subject: [PATCH 05/48] net: dsa: mt7530: use unlocked regmap accessors
|
|
|
|
Instead of wrapping the locked register accessor functions, use the
|
|
unlocked variants and add locking wrapper functions to let regmap
|
|
handle the locking.
|
|
|
|
This is a preparation towards being able to always use regmap to
|
|
access switch registers instead of open-coded accessor functions.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 23 ++++++++++++++---------
|
|
1 file changed, 14 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -2974,7 +2974,7 @@ static int mt7530_regmap_read(void *cont
|
|
{
|
|
struct mt7530_priv *priv = context;
|
|
|
|
- *val = mt7530_read(priv, reg);
|
|
+ *val = mt7530_mii_read(priv, reg);
|
|
return 0;
|
|
};
|
|
|
|
@@ -2982,23 +2982,25 @@ static int mt7530_regmap_write(void *con
|
|
{
|
|
struct mt7530_priv *priv = context;
|
|
|
|
- mt7530_write(priv, reg, val);
|
|
+ mt7530_mii_write(priv, reg, val);
|
|
return 0;
|
|
};
|
|
|
|
-static int mt7530_regmap_update_bits(void *context, unsigned int reg,
|
|
- unsigned int mask, unsigned int val)
|
|
+static void
|
|
+mt7530_mdio_regmap_lock(void *mdio_lock)
|
|
{
|
|
- struct mt7530_priv *priv = context;
|
|
+ mutex_lock_nested(mdio_lock, MDIO_MUTEX_NESTED);
|
|
+}
|
|
|
|
- mt7530_rmw(priv, reg, mask, val);
|
|
- return 0;
|
|
-};
|
|
+static void
|
|
+mt7530_mdio_regmap_unlock(void *mdio_lock)
|
|
+{
|
|
+ mutex_unlock(mdio_lock);
|
|
+}
|
|
|
|
static const struct regmap_bus mt7531_regmap_bus = {
|
|
.reg_write = mt7530_regmap_write,
|
|
.reg_read = mt7530_regmap_read,
|
|
- .reg_update_bits = mt7530_regmap_update_bits,
|
|
};
|
|
|
|
static int
|
|
@@ -3024,6 +3026,9 @@ mt7531_create_sgmii(struct mt7530_priv *
|
|
mt7531_pcs_config[i]->reg_stride = 4;
|
|
mt7531_pcs_config[i]->reg_base = MT7531_SGMII_REG_BASE(5 + i);
|
|
mt7531_pcs_config[i]->max_register = 0x17c;
|
|
+ mt7531_pcs_config[i]->lock = mt7530_mdio_regmap_lock;
|
|
+ mt7531_pcs_config[i]->unlock = mt7530_mdio_regmap_unlock;
|
|
+ mt7531_pcs_config[i]->lock_arg = &priv->bus->mdio_lock;
|
|
|
|
regmap = devm_regmap_init(priv->dev,
|
|
&mt7531_regmap_bus, priv,
|