iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: dsa: mt7530: use unlocked regmap accessors

Browse Source 
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>
This commit is contained in:
Daniel Golle 2023-04-03 02:17:40 +01:00 committed by David S. Miller
parent 9ecc00164d
commit 1bd099c49f
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/dsa/mt7530.c
View File

@ -2900,7 +2900,7 @@ static int mt7530_regmap_read(void *context, unsigned int reg, unsigned int *val
{
struct mt7530_priv *priv = context;
*val = mt7530_read(priv, reg);
*val = mt7530_mii_read(priv, reg);
return 0;
};
@ -2908,23 +2908,25 @@ static int mt7530_regmap_write(void *context, unsigned int reg, unsigned int val
{
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
@ -2950,6 +2952,9 @@ mt7531_create_sgmii(struct mt7530_priv *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,