Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50a77998 authored by Takashi Yoshii's avatar Takashi Yoshii Committed by Mark Brown
Browse files

spi: spi-sh-msiof: set hi/low Active for HW CS 



Set hardware CS(CS control function on MSIOF <-> GPIO CS) polarity
according to SPI_CS_HIGH flag on spi->mode.

Signed-off-by: default avatarTakashi Yoshii <takasi-y@ops.dti.ne.jp>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 5c32d29f

drivers/spi/spi-sh-msiof.c

+9 −4
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static void sh_msiof_spi_set_clk_regs(struct sh_msiof_spi_priv *p, 


static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p,

				      u32 cpol, u32 cpha,

				      u32 tx_hi_z, u32 lsb_first)

				      u32 tx_hi_z, u32 lsb_first, u32 cs_high)

{

	u32 tmp;

	int edge;
@@ -182,8 +182,12 @@ static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p, 
	 *    1    1         11     11    1    1

	 */

	sh_msiof_write(p, FCTR, 0);

	sh_msiof_write(p, TMDR1, 0xe2000005 | (lsb_first << 24));

	sh_msiof_write(p, RMDR1, 0x22000005 | (lsb_first << 24));



	tmp = 0;

	tmp |= !cs_high << 25;

	tmp |= lsb_first << 24;

	sh_msiof_write(p, TMDR1, 0xe0000005 | tmp);

	sh_msiof_write(p, RMDR1, 0x20000005 | tmp);



	tmp = 0xa0000000;

	tmp |= cpol << 30; /* TSCKIZ */
@@ -417,7 +421,8 @@ static void sh_msiof_spi_chipselect(struct spi_device *spi, int is_on) 
		sh_msiof_spi_set_pin_regs(p, !!(spi->mode & SPI_CPOL),

					  !!(spi->mode & SPI_CPHA),

					  !!(spi->mode & SPI_3WIRE),

					  !!(spi->mode & SPI_LSB_FIRST));

					  !!(spi->mode & SPI_LSB_FIRST),

					  !!(spi->mode & SPI_CS_HIGH));

	}



	/* use spi->controller data for CS (same strategy as spi_gpio) */