linux/drivers/spi, branch v3.12.14

spi: nuc900: Set SPI_LSB_FIRST for master->mode_bits if hw->pdata->lsb is true

2014-02-22T21:32:26Z

commit f7db1588d6028c97c098bb6445eaabc56a25fed8 upstream. Otherwise, spi_setup() fails with unsupported mode bits message. Signed-off-by: Axel Lin Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman

spi: Fix crash with double message finalisation on error handling

2014-02-22T21:32:25Z

commit 1f802f8249a0da536877842c43c7204064c4de8b upstream. This reverts commit e120cc0dcf2880a4c5c0a6cb27b655600a1cfa1d. It causes a NULL pointer dereference with drivers using the generic spi_transfer_one_message(), which always calls spi_finalize_current_message(), which zeroes master->cur_msg. Drivers implementing transfer_one_message() theirselves must always call spi_finalize_current_message(), even if the transfer failed: * @transfer_one_message: the subsystem calls the driver to transfer a single * message while queuing transfers that arrive in the meantime. When the * driver is finished with this message, it must call * spi_finalize_current_message() so the subsystem can issue the next * transfer Signed-off-by: Geert Uytterhoeven Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman

spi/pxa2xx: initialize DMA channels to -1 to prevent inadvertent match

2014-02-13T21:50:15Z

commit 483c319188c74e82b29a0ed7a7fa7065570f2193 upstream. Commit cddb339badb0 (spi/pxa2xx: convert to dma_request_slave_channel_compat()) converted the driver to use ACPI provided DMA helpers but it forgot to initialize the platform data for the channels to -1. Failing to do so will result inadvertent match in the filter function because 0 is a valid channel number. Prevent this from happening by initializing both platform data channels correctly to -1. Fixes: cddb339badb0 (spi/pxa2xx: convert to dma_request_slave_channel_compat()) Signed-off-by: Mika Westerberg Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman

spidev: fix hang when transfer_one_message fails

2014-02-13T21:50:15Z

commit e120cc0dcf2880a4c5c0a6cb27b655600a1cfa1d upstream. This corrects a problem in spi_pump_messages() that leads to an spi message hanging forever when a call to transfer_one_message() fails. This failure occurs in my MCP2210 driver when the cs_change bit is set on the last transfer in a message, an operation which the hardware does not support. Rationale Since the transfer_one_message() returns an int, we must presume that it may fail. If transfer_one_message() should never fail, it should return void. Thus, calls to transfer_one_message() should properly manage a failure. Fixes: ffbbdd21329f3 (spi: create a message queueing infrastructure) Signed-off-by: Daniel Santos Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman

spi/bcm63xx: don't substract prepend length from total length

2014-02-13T21:50:15Z

commit 86b3bde003e6bf60ccb9c09b4115b8a2f533974c upstream. The spi command must include the full message length including any prepended writes, else transfers larger than 256 bytes will be incomplete. Signed-off-by: Jonas Gorski Acked-by: Florian Fainelli Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman

spi/pxa2xx: add new ACPI IDs

2013-12-12T06:37:54Z

commit 54acbd9688e6324470671525c7916011f1ff8081 upstream. Newer Intel PCHs with LPSS have the same SPI controllers than Haswell but ACPI IDs are different. Add these IDs to the driver list. Signed-off-by: Mika Westerberg Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman

Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus

2013-10-07T13:51:59Z

Merge remote-tracking branch 'spi/fix/pxa' into spi-linus

2013-10-07T13:51:59Z

Merge remote-tracking branch 'spi/fix/mpc512x' into spi-linus

2013-10-07T13:51:58Z

Merge remote-tracking branch 'spi/fix/hspi' into spi-linus

2013-10-07T13:51:58Z