korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Marek Szyprowski 2010-06-30 14:27:32 -06:00 committed by Grant Likely
parent 5c2818cdfa
commit 04bb2a031c
6 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/spi/spi_bitbang_txrx.h
View File

@ -44,7 +44,7 @@
static inline u32 static inline u32
bitbang_txrx_be_cpha0(struct spi_device *spi, bitbang_txrx_be_cpha0(struct spi_device *spi,
unsigned nsecs, unsigned cpol, unsigned nsecs, unsigned cpol, unsigned flags,
u32 word, u8 bits) u32 word, u8 bits)
{ {
/* if (cpol == 0) this is SPI_MODE_0; else this is SPI_MODE_2 */ /* if (cpol == 0) this is SPI_MODE_0; else this is SPI_MODE_2 */
@ -53,7 +53,8 @@ bitbang_txrx_be_cpha0(struct spi_device *spi,
for (word <<= (32 - bits); likely(bits); bits--) { for (word <<= (32 - bits); likely(bits); bits--) {
/* setup MSB (to slave) on trailing edge */ /* setup MSB (to slave) on trailing edge */
setmosi(spi, word & (1 << 31)); if ((flags & SPI_MASTER_NO_TX) == 0)
setmosi(spi, word & (1 << 31));
spidelay(nsecs); /* T(setup) */ spidelay(nsecs); /* T(setup) */
setsck(spi, !cpol); setsck(spi, !cpol);
@ -61,7 +62,8 @@ bitbang_txrx_be_cpha0(struct spi_device *spi,
/* sample MSB (from slave) on leading edge */ /* sample MSB (from slave) on leading edge */
word <<= 1; word <<= 1;
word |= getmiso(spi); if ((flags & SPI_MASTER_NO_RX) == 0)
word |= getmiso(spi);
setsck(spi, cpol); setsck(spi, cpol);
} }
return word; return word;
@ -69,7 +71,7 @@ bitbang_txrx_be_cpha0(struct spi_device *spi,
static inline u32 static inline u32
bitbang_txrx_be_cpha1(struct spi_device *spi, bitbang_txrx_be_cpha1(struct spi_device *spi,
unsigned nsecs, unsigned cpol, unsigned nsecs, unsigned cpol, unsigned flags,
u32 word, u8 bits) u32 word, u8 bits)
{ {
/* if (cpol == 0) this is SPI_MODE_1; else this is SPI_MODE_3 */ /* if (cpol == 0) this is SPI_MODE_1; else this is SPI_MODE_3 */
@ -79,7 +81,8 @@ bitbang_txrx_be_cpha1(struct spi_device *spi,
/* setup MSB (to slave) on leading edge */ /* setup MSB (to slave) on leading edge */
setsck(spi, !cpol); setsck(spi, !cpol);
setmosi(spi, word & (1 << 31)); if ((flags & SPI_MASTER_NO_TX) == 0)
setmosi(spi, word & (1 << 31));
spidelay(nsecs); /* T(setup) */ spidelay(nsecs); /* T(setup) */
setsck(spi, cpol); setsck(spi, cpol);
@ -87,7 +90,8 @@ bitbang_txrx_be_cpha1(struct spi_device *spi,
/* sample MSB (from slave) on trailing edge */ /* sample MSB (from slave) on trailing edge */
word <<= 1; word <<= 1;
word |= getmiso(spi); if ((flags & SPI_MASTER_NO_RX) == 0)
word |= getmiso(spi);
} }
return word; return word;
} }

2
drivers/spi/spi_butterfly.c
View File

@ -156,7 +156,7 @@ butterfly_txrx_word_mode0(struct spi_device *spi,
unsigned nsecs, unsigned nsecs,
u32 word, u8 bits) 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);
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/

8
drivers/spi/spi_gpio.c
View File

@ -146,25 +146,25 @@ static inline int getmiso(const struct spi_device *spi)
static u32 spi_gpio_txrx_word_mode0(struct spi_device *spi, static u32 spi_gpio_txrx_word_mode0(struct spi_device *spi,
unsigned nsecs, u32 word, u8 bits) 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, static u32 spi_gpio_txrx_word_mode1(struct spi_device *spi,
unsigned nsecs, u32 word, u8 bits) 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, static u32 spi_gpio_txrx_word_mode2(struct spi_device *spi,
unsigned nsecs, u32 word, u8 bits) 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, static u32 spi_gpio_txrx_word_mode3(struct spi_device *spi,
unsigned nsecs, u32 word, u8 bits) 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);
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/

2
drivers/spi/spi_lm70llp.c
View File

@ -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) 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) static void spi_lm70llp_attach(struct parport *p)

8
drivers/spi/spi_s3c24xx_gpio.c
View File

@ -64,25 +64,25 @@ static inline u32 getmiso(struct spi_device *dev)
static u32 s3c2410_spigpio_txrx_mode0(struct spi_device *spi, static u32 s3c2410_spigpio_txrx_mode0(struct spi_device *spi,
unsigned nsecs, u32 word, u8 bits) 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, static u32 s3c2410_spigpio_txrx_mode1(struct spi_device *spi,
unsigned nsecs, u32 word, u8 bits) 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, static u32 s3c2410_spigpio_txrx_mode2(struct spi_device *spi,
unsigned nsecs, u32 word, u8 bits) 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, static u32 s3c2410_spigpio_txrx_mode3(struct spi_device *spi,
unsigned nsecs, u32 word, u8 bits) 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);
} }

8
drivers/spi/spi_sh_sci.c
View File

@ -83,25 +83,25 @@ static inline u32 getmiso(struct spi_device *dev)
static u32 sh_sci_spi_txrx_mode0(struct spi_device *spi, static u32 sh_sci_spi_txrx_mode0(struct spi_device *spi,
unsigned nsecs, u32 word, u8 bits) 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 sh_sci_spi_txrx_mode1(struct spi_device *spi, static u32 sh_sci_spi_txrx_mode1(struct spi_device *spi,
unsigned nsecs, u32 word, u8 bits) 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 sh_sci_spi_txrx_mode2(struct spi_device *spi, static u32 sh_sci_spi_txrx_mode2(struct spi_device *spi,
unsigned nsecs, u32 word, u8 bits) 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 sh_sci_spi_txrx_mode3(struct spi_device *spi, static u32 sh_sci_spi_txrx_mode3(struct spi_device *spi,
unsigned nsecs, u32 word, u8 bits) 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);
} }
static void sh_sci_spi_chipselect(struct spi_device *dev, int value) static void sh_sci_spi_chipselect(struct spi_device *dev, int value)