Commit d4bcd99c authored by Marek Vasut's avatar Marek Vasut Committed by David S. Miller
Browse files

net: dsa: microchip: Replace ad-hoc bit manipulation with regmap 



Regmap provides bit manipulation functions to set/clear bits, use those
insted of reimplementing them.

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Tristram Ha <Tristram.Ha@microchip.com>
Cc: Woojung Huh <Woojung.Huh@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 255b59ad

drivers/net/dsa/microchip/ksz9477.c

+6 −40
Original line number Diff line number Diff line
@@ -67,60 +67,26 @@ static const struct { 


static void ksz_cfg(struct ksz_device *dev, u32 addr, u8 bits, bool set)

{

	u8 data;



	ksz_read8(dev, addr, &data);

	if (set)

		data |= bits;

	else

		data &= ~bits;

	ksz_write8(dev, addr, data);

	regmap_update_bits(dev->regmap[0], addr, bits, set ? bits : 0);

}



static void ksz_port_cfg(struct ksz_device *dev, int port, int offset, u8 bits,

			 bool set)

{

	u32 addr;

	u8 data;



	addr = PORT_CTRL_ADDR(port, offset);

	ksz_read8(dev, addr, &data);



	if (set)

		data |= bits;

	else

		data &= ~bits;



	ksz_write8(dev, addr, data);

	regmap_update_bits(dev->regmap[0], PORT_CTRL_ADDR(port, offset),

			   bits, set ? bits : 0);

}



static void ksz9477_cfg32(struct ksz_device *dev, u32 addr, u32 bits, bool set)

{

	u32 data;



	ksz_read32(dev, addr, &data);

	if (set)

		data |= bits;

	else

		data &= ~bits;

	ksz_write32(dev, addr, data);

	regmap_update_bits(dev->regmap[2], addr, bits, set ? bits : 0);

}



static void ksz9477_port_cfg32(struct ksz_device *dev, int port, int offset,

			       u32 bits, bool set)

{

	u32 addr;

	u32 data;



	addr = PORT_CTRL_ADDR(port, offset);

	ksz_read32(dev, addr, &data);



	if (set)

		data |= bits;

	else

		data &= ~bits;



	ksz_write32(dev, addr, data);

	regmap_update_bits(dev->regmap[2], PORT_CTRL_ADDR(port, offset),

			   bits, set ? bits : 0);

}



static int ksz9477_wait_vlan_ctrl_ready(struct ksz_device *dev, u32 waiton,

CRA Git | Maintained and supported by SUSTech CRA and CCSE