Merge remote-tracking branches 'spi/topic/delay', 'spi/topic/dw', 'sp…

…i/topic/fsl-dspi' and 'spi/topic/fsl-espi' into spi-next
mariux64 · Dec 12, 2016 · 3bc1ad2 · 3bc1ad2
5 parents 0afa072 + 8244bd3 + 80b444e + ccf7d8e + 7e2ef00
commit 3bc1ad2
Show file tree

Hide file tree

Showing 6 changed files with 703 additions and 347 deletions.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
@@ -380,7 +380,6 @@ config SPI_FSL_DSPI
 config SPI_FSL_ESPI
 	tristate "Freescale eSPI controller"
 	depends on FSL_SOC
-	select SPI_FSL_LIB
 	help
 	  This enables using the Freescale eSPI controllers in master mode.
 	  From MPC8536, 85xx platform uses the controller, and all P10xx,

diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
@@ -502,6 +502,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
 	master->handle_err = dw_spi_handle_err;
 	master->max_speed_hz = dws->max_freq;
 	master->dev.of_node = dev->of_node;
+	master->flags = SPI_MASTER_GPIO_SS;
 
 	/* Basic HW init */
 	spi_hw_init(dev, dws);