xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata

Browse Source 
Conflicts:
	drivers/spi/spi-rspi.c
This commit is contained in:
Mark Brown
2013-08-29 13:59:05 +01:00
parent a1216394e6 8d4d08ce83
commit b5f9a9d511
977 changed files with 10456 additions and 98571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/spi/spi-xilinx.c
View File

@@ -232,6 +232,21 @@ static int xilinx_spi_setup_transfer(struct spi_device *spi,
return 0;
}
static int xilinx_spi_setup(struct spi_device *spi)
{
/* always return 0, we can not check the number of bits.
* There are cases when SPI setup is called before any driver is
* there, in that case the SPI core defaults to 8 bits, which we
* do not support in some cases. But if we return an error, the
* SPI device would not be registered and no driver can get hold of it
* When the driver is there, it will call SPI setup again with the
* correct number of bits per transfer.
* If a driver setups with the wrong bit number, it will fail when
* it tries to do a transfer
*/
return 0;
}
static void xilinx_spi_fill_tx_fifo(struct xilinx_spi *xspi)
{
u8 sr;
@@ -376,6 +391,7 @@ static int xilinx_spi_probe(struct platform_device *pdev)
xspi->bitbang.chipselect = xilinx_spi_chipselect;
xspi->bitbang.setup_transfer = xilinx_spi_setup_transfer;
xspi->bitbang.txrx_bufs = xilinx_spi_txrx_bufs;
xspi->bitbang.master->setup = xilinx_spi_setup;
init_completion(&xspi->done);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);