| Message ID | 1392383203.31961.3.camel@phoenix (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9bf46f6df5d1e9db8b4b786d22e88d8b6edd949e |
| Delegated to: | Mark Brown |
| Headers | show |
On 02/14/2014 02:06 PM, Axel Lin wrote: > Set bits_per_word_mask so spi core will reject transfers that attempt to use > an unsupported bits_per_word value. > > spi_bitbang requires custom setup_transfer() to be defined if there is a > custom txrx_bufs(). Thus keep the empty xilinx_spi_setup_transfer() function > in the code. > > Signed-off-by: Axel Lin <axel.lin@ingics.com> > --- > drivers/spi/spi-xilinx.c | 18 ++---------------- > 1 file changed, 2 insertions(+), 16 deletions(-) > > diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c > index e6cd111..66dbefc 100644 > --- a/drivers/spi/spi-xilinx.c > +++ b/drivers/spi/spi-xilinx.c > @@ -208,26 +208,11 @@ static void xilinx_spi_chipselect(struct spi_device *spi, int is_on) > } > > /* spi_bitbang requires custom setup_transfer() to be defined if there is a > - * custom txrx_bufs(). We have nothing to setup here as the SPI IP block > - * supports 8 or 16 bits per word which cannot be changed in software. > - * SPI clock can't be changed in software either. > - * Check for correct bits per word. Chip select delay calculations could be > - * added here as soon as bitbang_work() can be made aware of the delay value. > + * custom txrx_bufs(). > */ > static int xilinx_spi_setup_transfer(struct spi_device *spi, > struct spi_transfer *t) > { > - struct xilinx_spi *xspi = spi_master_get_devdata(spi->master); > - u8 bits_per_word; > - > - bits_per_word = (t && t->bits_per_word) > - ? t->bits_per_word : spi->bits_per_word; > - if (bits_per_word != xspi->bits_per_word) { > - dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n", > - __func__, bits_per_word); > - return -EINVAL; > - } > - > return 0; > } > > @@ -406,6 +391,7 @@ static int xilinx_spi_probe(struct platform_device *pdev) > xspi->write_fn = xspi_write32_be; > } > > + master->bits_per_word_mask = SPI_BPW_MASK(bits_per_word); > xspi->bits_per_word = bits_per_word; > if (xspi->bits_per_word == 8) { > xspi->tx_fn = xspi_tx8; > Acked-by: Michal Simek <michal.simek@xilinx.com> Thanks, Michal -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Feb 14, 2014 at 09:06:43PM +0800, Axel Lin wrote: > Set bits_per_word_mask so spi core will reject transfers that attempt to use > an unsupported bits_per_word value. Applied, thanks.
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index e6cd111..66dbefc 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -208,26 +208,11 @@ static void xilinx_spi_chipselect(struct spi_device *spi, int is_on) } /* spi_bitbang requires custom setup_transfer() to be defined if there is a - * custom txrx_bufs(). We have nothing to setup here as the SPI IP block - * supports 8 or 16 bits per word which cannot be changed in software. - * SPI clock can't be changed in software either. - * Check for correct bits per word. Chip select delay calculations could be - * added here as soon as bitbang_work() can be made aware of the delay value. + * custom txrx_bufs(). */ static int xilinx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) { - struct xilinx_spi *xspi = spi_master_get_devdata(spi->master); - u8 bits_per_word; - - bits_per_word = (t && t->bits_per_word) - ? t->bits_per_word : spi->bits_per_word; - if (bits_per_word != xspi->bits_per_word) { - dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n", - __func__, bits_per_word); - return -EINVAL; - } - return 0; } @@ -406,6 +391,7 @@ static int xilinx_spi_probe(struct platform_device *pdev) xspi->write_fn = xspi_write32_be; } + master->bits_per_word_mask = SPI_BPW_MASK(bits_per_word); xspi->bits_per_word = bits_per_word; if (xspi->bits_per_word == 8) { xspi->tx_fn = xspi_tx8;
Set bits_per_word_mask so spi core will reject transfers that attempt to use an unsupported bits_per_word value. spi_bitbang requires custom setup_transfer() to be defined if there is a custom txrx_bufs(). Thus keep the empty xilinx_spi_setup_transfer() function in the code. Signed-off-by: Axel Lin <axel.lin@ingics.com> --- drivers/spi/spi-xilinx.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)