The patch titled
spi: allow using spi_bitbang_setup() with custom txrx_bufs()
has been removed from the -mm tree. Its filename was
spi-allow-using-spi_bitbang_setup-with-custom-txrx_bufs.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: spi: allow using spi_bitbang_setup() with custom txrx_bufs()
From: Magnus Damm <damm@xxxxxxxxxxxxx>
This patch modifies the shared spi bitbanging code to allow using
spi_bitbang_setup() even though the txrx_word[] callbacks are unset.
Useful for drivers that want to make use of spi_bitbang_setup() but have
their own txrx_bufs() callback.
While at it, drop the MSIOF driver workaround which was there to address
this shortcoming.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
Cc: Grant Likely <grant.likely@xxxxxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/spi/spi_bitbang.c | 25 ++++++++++++++-----------
drivers/spi/spi_sh_msiof.c | 11 -----------
2 files changed, 14 insertions(+), 22 deletions(-)
diff -puN drivers/spi/spi_bitbang.c~spi-allow-using-spi_bitbang_setup-with-custom-txrx_bufs drivers/spi/spi_bitbang.c
--- a/drivers/spi/spi_bitbang.c~spi-allow-using-spi_bitbang_setup-with-custom-txrx_bufs
+++ a/drivers/spi/spi_bitbang.c
@@ -176,6 +176,14 @@ int spi_bitbang_setup_transfer(struct sp
}
EXPORT_SYMBOL_GPL(spi_bitbang_setup_transfer);
+static int spi_bitbang_bufs(struct spi_device *spi, struct spi_transfer *t)
+{
+ struct spi_bitbang_cs *cs = spi->controller_state;
+ unsigned nsecs = cs->nsecs;
+
+ return cs->txrx_bufs(spi, cs->txrx_word, nsecs, t);
+}
+
/**
* spi_bitbang_setup - default setup for per-word I/O loops
*/
@@ -183,6 +191,7 @@ int spi_bitbang_setup(struct spi_device
{
struct spi_bitbang_cs *cs = spi->controller_state;
struct spi_bitbang *bitbang;
+ int mode_mask = SPI_CPOL | SPI_CPHA;
int retval;
unsigned long flags;
@@ -196,9 +205,11 @@ int spi_bitbang_setup(struct spi_device
}
/* per-word shift register access, in hardware or bitbanging */
- cs->txrx_word = bitbang->txrx_word[spi->mode & (SPI_CPOL|SPI_CPHA)];
- if (!cs->txrx_word)
- return -EINVAL;
+ if (bitbang->txrx_bufs == spi_bitbang_bufs) {
+ cs->txrx_word = bitbang->txrx_word[spi->mode & mode_mask];
+ if (!cs->txrx_word)
+ return -EINVAL;
+ }
retval = bitbang->setup_transfer(spi, NULL);
if (retval < 0)
@@ -232,14 +243,6 @@ void spi_bitbang_cleanup(struct spi_devi
}
EXPORT_SYMBOL_GPL(spi_bitbang_cleanup);
-static int spi_bitbang_bufs(struct spi_device *spi, struct spi_transfer *t)
-{
- struct spi_bitbang_cs *cs = spi->controller_state;
- unsigned nsecs = cs->nsecs;
-
- return cs->txrx_bufs(spi, cs->txrx_word, nsecs, t);
-}
-
/*----------------------------------------------------------------------*/
/*
diff -puN drivers/spi/spi_sh_msiof.c~spi-allow-using-spi_bitbang_setup-with-custom-txrx_bufs drivers/spi/spi_sh_msiof.c
--- a/drivers/spi/spi_sh_msiof.c~spi-allow-using-spi_bitbang_setup-with-custom-txrx_bufs
+++ a/drivers/spi/spi_sh_msiof.c
@@ -510,13 +510,6 @@ static int sh_msiof_spi_txrx(struct spi_
return bytes_done;
}
-static u32 sh_msiof_spi_txrx_word(struct spi_device *spi, unsigned nsecs,
- u32 word, u8 bits)
-{
- BUG_ON(1); /* unused but needed by bitbang code */
- return 0;
-}
-
static int sh_msiof_spi_probe(struct platform_device *pdev)
{
struct resource *r;
@@ -594,10 +587,6 @@ static int sh_msiof_spi_probe(struct pla
p->bitbang.chipselect = sh_msiof_spi_chipselect;
p->bitbang.setup_transfer = sh_msiof_spi_setup_transfer;
p->bitbang.txrx_bufs = sh_msiof_spi_txrx;
- p->bitbang.txrx_word[SPI_MODE_0] = sh_msiof_spi_txrx_word;
- p->bitbang.txrx_word[SPI_MODE_1] = sh_msiof_spi_txrx_word;
- p->bitbang.txrx_word[SPI_MODE_2] = sh_msiof_spi_txrx_word;
- p->bitbang.txrx_word[SPI_MODE_3] = sh_msiof_spi_txrx_word;
ret = spi_bitbang_start(&p->bitbang);
if (ret == 0)
_
Patches currently in -mm which might be from damm@xxxxxxxxxxxxx are
linux-next.patch
clocksource-add-argument-to-resume-callback.patch
clocksource-start-cmt-at-clocksource-resume.patch
spi-superh-msiof-spi-master-driver.patch
spi-allow-using-spi_bitbang_setup-with-custom-txrx_bufs.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
