net: dsa: lantiq_gswip: convert to use regmap
Subsystems (3)
RFC PATCH 18/23 net: dsa: lantiq_gswip: convert to use regmap
Use regmap for register access in preparation for supporting the MaxLinear GSW1xx family of switches connected via MDIO or SPI.
--- drivers/net/dsa/Kconfig | 1 + drivers/net/dsa/lantiq_gswip.c | 157 +++++++++++++++++++++++---------- drivers/net/dsa/lantiq_gswip.h | 6 +- 3 files changed, 114 insertions(+), 50 deletions(-)
drivers/net/dsa/Kconfig +1 -0
@@ -30,6 +30,7 @@ config NET_DSA_LANTIQ_GSWIP tristate "Lantiq / Intel GSWIP" depends on HAS_IOMEM select NET_DSA_TAG_GSWIP + select REGMAP help This enables support for the Lantiq / Intel GSWIP 2.1 found in the xrx200 / VR9 SoC.
drivers/net/dsa/lantiq_gswip.c +110 -47
225 lines not on this page · raw message
drivers/net/dsa/lantiq_gswip.h +3 -3
@@ -270,9 +270,9 @@ struct gswip_vlan { };struct gswip_priv { -__iomem void *gswip; -__iomem void *mdio; -__iomem void *mii; +struct regmap *gswip; +struct regmap *mdio; +struct regmap *mii;const struct gswip_hw_info *hw_info;const struct xway_gphy_match_data *gphy_fw_name_cfg;struct dsa_switch *ds;
Signature · 1 line
2.50.1
Hi Daniel,
Quoted 4 lines · Daniel Golle
Use regmap for register access in preparation for supporting the MaxLinear GSW1xx family of switches connected via MDIO or SPI.
Signed-off-by Daniel Golle <[email protected]>
...
Quoted 2 lines
drivers/net/dsa/lantiq_gswip.c +0
-0
...
drivers/net/dsa/lantiq_gswip.c static const struct gswip_rmon_cnt_desc gswip_rmon_cnt[] = { · line 148
Quoted 11 lines
static void gswip_switch_mask(struct
gswip_priv*priv, u32 clear, u32 set,drivers/net/dsa/lantiq_gswip.c +3
-4u32 offset) { -u32 val =gswip_switch_r (priv, offset); +int ret; - val &= ~(clear); - val |= set; -gswip_switch_w (priv, val, offset); + ret =regmap_update_bits_base (priv->gswip, offset, clear | set, set, +NULL , false, true);
The above looks like regmap_write_bits()?
...
Quoted 11 lines
static void gswip_mdio_mask(struct
gswip_priv*priv, u32 clear, u32 set,drivers/net/dsa/lantiq_gswip.c +0
-8u32 offset) { -u32 val =gswip_mdio_r (priv, offset); - - val &= ~(clear); - val |= set; -gswip_mdio_w (priv, val, offset); -} - -static u32 gswip_mii_r (struct gswip_priv *priv,u32 offset)
drivers/net/dsa/lantiq_gswip.c static u32 gswip_switch_r_timeout(struct gswip_priv *priv, u32 offset, · line 196
Quoted 10 lines
drivers/net/dsa/lantiq_gswip.c +3
-6-{ -return __raw_readl (priv->mii + (offset *4 )); -} +int ret; -static void gswip_mii_w (struct gswip_priv *priv,u32 val,u32 offset) -{ -__raw_writel (val, priv->mii + (offset *4 )); + ret =regmap_update_bits_base (priv->mdio, offset, clear | set, set, +NULL , false, true);
regmap_write_bits()?
Quoted 7 lines
drivers/net/dsa/lantiq_gswip.c +4
-0+if (ret) { +WARN_ON_ONCE (1 ); +dev_err (priv->dev,"failed to update mdio register\n" ); + } } static void gswip_mii_mask(struct gswip_priv *priv, u32 clear, u32 set,
drivers/net/dsa/lantiq_gswip.c static u32 gswip_switch_r_timeout(struct gswip_priv *priv, u32 offset, · line 209
Quoted 10 lines
drivers/net/dsa/lantiq_gswip.c +3
-4u32 offset) { -u32 val =gswip_mii_r (priv, offset); +int ret; - val &= ~(clear); - val |= set; -gswip_mii_w (priv, val, offset); + ret =regmap_update_bits_base (priv->mii, offset, clear | set, set,NULL , + false, true);
ditto
Signature · 3 lines
Alexander Sverdlin Siemens AG www.siemens.com