Commit 04bb2a03 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Grant Likely
Browse files

spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes 



This patch adds a new flags argument to bitbang_txrx_be_cpha0 and
bitbang_txrx_be_cpha1 transfer functions. This enables support for
SPI_MASTER_NO_{TX,RX} transfer modes. The change should have no impact
on speed of the existing drivers. bitbank_txrx_* functions are usually
inlined into the drivers. When the argument is equal to constant zero,
the optimizer would be able to eliminate the dead code (flags checks)
easily. Tested on ARM and GCC 4.4.x and in all cases the checks were
eliminated in the inlined function.

Reviewed-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 5c2818cd

drivers/spi/spi_bitbang_txrx.h

+10 −6
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


static inline u32

bitbang_txrx_be_cpha0(struct spi_device *spi,

		unsigned nsecs, unsigned cpol,

		unsigned nsecs, unsigned cpol, unsigned flags,

		u32 word, u8 bits)

{

	/* if (cpol == 0) this is SPI_MODE_0; else this is SPI_MODE_2 */
@@ -53,6 +53,7 @@ bitbang_txrx_be_cpha0(struct spi_device *spi, 
	for (word <<= (32 - bits); likely(bits); bits--) {



		/* setup MSB (to slave) on trailing edge */

		if ((flags & SPI_MASTER_NO_TX) == 0)

			setmosi(spi, word & (1 << 31));

		spidelay(nsecs);	/* T(setup) */
@@ -61,6 +62,7 @@ bitbang_txrx_be_cpha0(struct spi_device *spi, 


		/* sample MSB (from slave) on leading edge */

		word <<= 1;

		if ((flags & SPI_MASTER_NO_RX) == 0)

			word |= getmiso(spi);

		setsck(spi, cpol);

	}
@@ -69,7 +71,7 @@ bitbang_txrx_be_cpha0(struct spi_device *spi, 


static inline u32

bitbang_txrx_be_cpha1(struct spi_device *spi,

		unsigned nsecs, unsigned cpol,

		unsigned nsecs, unsigned cpol, unsigned flags,

		u32 word, u8 bits)

{

	/* if (cpol == 0) this is SPI_MODE_1; else this is SPI_MODE_3 */
@@ -79,6 +81,7 @@ bitbang_txrx_be_cpha1(struct spi_device *spi, 


		/* setup MSB (to slave) on leading edge */

		setsck(spi, !cpol);

		if ((flags & SPI_MASTER_NO_TX) == 0)

			setmosi(spi, word & (1 << 31));

		spidelay(nsecs); /* T(setup) */
@@ -87,6 +90,7 @@ bitbang_txrx_be_cpha1(struct spi_device *spi, 


		/* sample MSB (from slave) on trailing edge */

		word <<= 1;

		if ((flags & SPI_MASTER_NO_RX) == 0)

			word |= getmiso(spi);

	}

	return word;

drivers/spi/spi_butterfly.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ butterfly_txrx_word_mode0(struct spi_device *spi, 
		unsigned nsecs,

		u32 word, u8 bits)

{

	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);

	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);

}



/*----------------------------------------------------------------------*/

drivers/spi/spi_gpio.c

+4 −4
Original line number Diff line number Diff line
@@ -146,25 +146,25 @@ static inline int getmiso(const struct spi_device *spi) 
static u32 spi_gpio_txrx_word_mode0(struct spi_device *spi,

		unsigned nsecs, u32 word, u8 bits)

{

	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);

	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);

}



static u32 spi_gpio_txrx_word_mode1(struct spi_device *spi,

		unsigned nsecs, u32 word, u8 bits)

{

	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);

	return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);

}



static u32 spi_gpio_txrx_word_mode2(struct spi_device *spi,

		unsigned nsecs, u32 word, u8 bits)

{

	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);

	return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);

}



static u32 spi_gpio_txrx_word_mode3(struct spi_device *spi,

		unsigned nsecs, u32 word, u8 bits)

{

	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);

	return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);

}



/*----------------------------------------------------------------------*/

drivers/spi/spi_lm70llp.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static void lm70_chipselect(struct spi_device *spi, int value) 
 */

static u32 lm70_txrx(struct spi_device *spi, unsigned nsecs, u32 word, u8 bits)

{

	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);

	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);

}



static void spi_lm70llp_attach(struct parport *p)

drivers/spi/spi_s3c24xx_gpio.c

+4 −4
Original line number Diff line number Diff line
@@ -64,25 +64,25 @@ static inline u32 getmiso(struct spi_device *dev) 
static u32 s3c2410_spigpio_txrx_mode0(struct spi_device *spi,

				      unsigned nsecs, u32 word, u8 bits)

{

	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);

	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);

}



static u32 s3c2410_spigpio_txrx_mode1(struct spi_device *spi,

				      unsigned nsecs, u32 word, u8 bits)

{

	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);

	return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);

}



static u32 s3c2410_spigpio_txrx_mode2(struct spi_device *spi,

				      unsigned nsecs, u32 word, u8 bits)

{

	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);

	return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);

}



static u32 s3c2410_spigpio_txrx_mode3(struct spi_device *spi,

				      unsigned nsecs, u32 word, u8 bits)

{

	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);

	return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE