Unverified Commit 47416a5f authored by Tomer Maimon's avatar Tomer Maimon Committed by Mark Brown
Browse files

spi: npcm-pspi: fix 16 bit send and receive support 



Fixing NPCM BMC Peripheral SPI controller 16 bit
send and receive support by writing and reading
the SPI data in the right order.

Signed-off-by: default avatarTomer Maimon <tmaimon77@gmail.com>
Link: https://lore.kernel.org/r/20200115162301.235926-2-tmaimon77@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6157d4c2

drivers/spi/spi-npcm-pspi.c

+9 −8
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ static void npcm_pspi_setup_transfer(struct spi_device *spi, 
static void npcm_pspi_send(struct npcm_pspi *priv)

{

	int wsize;

	u16 val;



	wsize = min(bytes_per_word(priv->bits_per_word), priv->tx_bytes);

	priv->tx_bytes -= wsize;
@@ -204,17 +205,18 @@ static void npcm_pspi_send(struct npcm_pspi *priv) 


	switch (wsize) {

	case 1:

		iowrite8(*priv->tx_buf, NPCM_PSPI_DATA + priv->base);

		val = *priv->tx_buf++;

		iowrite8(val, NPCM_PSPI_DATA + priv->base);

		break;

	case 2:

		iowrite16(*priv->tx_buf, NPCM_PSPI_DATA + priv->base);

		val = *priv->tx_buf++;

		val = *priv->tx_buf++ | (val << 8);

		iowrite16(val, NPCM_PSPI_DATA + priv->base);

		break;

	default:

		WARN_ON_ONCE(1);

		return;

	}



	priv->tx_buf += wsize;

}



static void npcm_pspi_recv(struct npcm_pspi *priv)
@@ -230,18 +232,17 @@ static void npcm_pspi_recv(struct npcm_pspi *priv) 


	switch (rsize) {

	case 1:

		val = ioread8(priv->base + NPCM_PSPI_DATA);

		*priv->rx_buf++ = ioread8(priv->base + NPCM_PSPI_DATA);

		break;

	case 2:

		val = ioread16(priv->base + NPCM_PSPI_DATA);

		*priv->rx_buf++ = (val >> 8);

		*priv->rx_buf++ = val & 0xff;

		break;

	default:

		WARN_ON_ONCE(1);

		return;

	}



	*priv->rx_buf = val;

	priv->rx_buf += rsize;

}



static int npcm_pspi_transfer_one(struct spi_master *master,

CRA Git | Maintained and supported by SUSTech CRA and CCSE