Commit ff509dab authored by Marek Vasut's avatar Marek Vasut Committed by David S. Miller

net: dsa: microchip: Factor out register access opcode generation

Factor out the code which sends out the register read/write opcodes
to the switch, since the code differs in single bit between read and
write.
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>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5ce9676e
...@@ -25,19 +25,24 @@ ...@@ -25,19 +25,24 @@
/* Enough to read all switch port registers. */ /* Enough to read all switch port registers. */
#define SPI_TX_BUF_LEN 0x100 #define SPI_TX_BUF_LEN 0x100
static int ksz9477_spi_read_reg(struct spi_device *spi, u32 reg, u8 *val, static u32 ksz9477_spi_cmd(u32 reg, bool read)
unsigned int len)
{ {
u32 txbuf; u32 txbuf;
int ret;
txbuf = reg & SPI_ADDR_MASK; txbuf = reg & SPI_ADDR_MASK;
txbuf |= KS_SPIOP_RD << SPI_ADDR_SHIFT; txbuf |= (read ? KS_SPIOP_RD : KS_SPIOP_WR) << SPI_ADDR_SHIFT;
txbuf <<= SPI_TURNAROUND_SHIFT; txbuf <<= SPI_TURNAROUND_SHIFT;
txbuf = cpu_to_be32(txbuf); txbuf = cpu_to_be32(txbuf);
ret = spi_write_then_read(spi, &txbuf, 4, val, len); return txbuf;
return ret; }
static int ksz9477_spi_read_reg(struct spi_device *spi, u32 reg, u8 *val,
unsigned int len)
{
u32 txbuf = ksz9477_spi_cmd(reg, true);
return spi_write_then_read(spi, &txbuf, 4, val, len);
} }
static int ksz9477_spi_write_reg(struct spi_device *spi, u32 reg, u8 *val, static int ksz9477_spi_write_reg(struct spi_device *spi, u32 reg, u8 *val,
...@@ -45,10 +50,7 @@ static int ksz9477_spi_write_reg(struct spi_device *spi, u32 reg, u8 *val, ...@@ -45,10 +50,7 @@ static int ksz9477_spi_write_reg(struct spi_device *spi, u32 reg, u8 *val,
{ {
u32 *txbuf = (u32 *)val; u32 *txbuf = (u32 *)val;
*txbuf = reg & SPI_ADDR_MASK; *txbuf = ksz9477_spi_cmd(reg, false);
*txbuf |= (KS_SPIOP_WR << SPI_ADDR_SHIFT);
*txbuf <<= SPI_TURNAROUND_SHIFT;
*txbuf = cpu_to_be32(*txbuf);
return spi_write(spi, txbuf, 4 + len); return spi_write(spi, txbuf, 4 + len);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment