spi: xilinx: Convert to let spi core validate bits_per_word
Subsystems (2)
PATCH 1/1 spi: xilinx: Convert to let spi core validate bits_per_word
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.
--- drivers/spi/spi-xilinx.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
drivers/spi/spi-xilinx.c +2 -16
@@ -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;
Signature · 8 lines
1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 46 lines · Axel Lin
Set
bits_per_word_maskso spi core will reject transfers that attempt to use an unsupportedbits_per_wordvalue.
spi_bitbangrequires customsetup_transfer()to be defined if there is a customtxrx_bufs(). Thus keep the emptyxilinx_spi_setup_transfer()function in the code.Signed-off-by Axel Lin <[email protected]>--- drivers/spi/spi-xilinx.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)drivers/spi/spi-xilinx.c +1
-16@@ -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 ; }
drivers/spi/spi-xilinx.c static int xilinx_spi_probe(struct platform_device *pdev) · line 397
Quoted 7 lines
drivers/spi/spi-xilinx.c +1
-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;
Thanks,
Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Mark Brown
AppliedQuoted 2 lines · Axel Lin
Set
bits_per_word_maskso spi core will reject transfers that attempt to use an unsupportedbits_per_wordvalue.
Applied, thanks.