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

ad14ad73 · Mark Brown · b3d6c800 · cb52c673 · ad14ad73 · ad14ad73
Commit ad14ad73 authored Oct 25, 2013 by Mark Brown
Expand all Show whitespace changes
Inline Side-by-side

Showing with 234 additions and 40 deletions

drivers/spi/Kconfig drivers/spi/Kconfig +1 -1

drivers/spi/spi-rspi.c drivers/spi/spi-rspi.c +231 -39

include/linux/spi/rspi.h include/linux/spi/rspi.h +2 -0

No files found.
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -370,7 +370,7 @@ config SPI_PXA2XX_PCI
 config SPI_RSPI
 	tristate "Renesas RSPI controller"
-	depends on SUPERH && SH_DMAE_BASE
+	depends on (SUPERH || ARCH_SHMOBILE) && SH_DMAE_BASE
 	help
 	  SPI driver for Renesas RSPI blocks.

--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
--- a/include/linux/spi/rspi.h
+++ b/include/linux/spi/rspi.h
@@ -26,6 +26,8 @@ struct rspi_plat_data {
 	unsigned int dma_rx_id;
 	unsigned dma_width_16bit:1;	/* DMAC read/write width = 16-bit */
+	u16 num_chipselect;
 };
 #endif