1 files changed, 11 insertions, 13 deletions

diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h
index 587643dae11e..6d2acad34f64 100644
--- a/drivers/spi/spi-dw.h
+++ b/drivers/spi/spi-dw.h
@@ -3,6 +3,7 @@
 
 #include <linux/io.h>
 #include <linux/scatterlist.h>
+#include <linux/gpio.h>
 
 /* Register offsets */
 #define DW_SPI_CTRL0                    0x00
@@ -104,14 +105,6 @@ struct dw_spi {
         u16                     bus_num;
         u16                     num_cs;         /* supported slave numbers */
 
-        /* Driver message queue */
-        struct workqueue_struct *workqueue;
-        struct work_struct      pump_messages;
-        spinlock_t              lock;
-        struct list_head        queue;
-        int                     busy;
-        int                     run;
-
         /* Message Transfer pump */
         struct tasklet_struct   pump_transfers;
 
@@ -186,15 +179,20 @@ static inline void spi_set_clk(struct dw_spi *dws, u16 div)
         dw_writel(dws, DW_SPI_BAUDR, div);
 }
 
-static inline void spi_chip_sel(struct dw_spi *dws, u16 cs)
+static inline void spi_chip_sel(struct dw_spi *dws, struct spi_device *spi,
+                int active)
 {
-        if (cs > dws->num_cs)
-                return;
+        u16 cs = spi->chip_select;
+        int gpio_val = active ? (spi->mode & SPI_CS_HIGH) :
+                !(spi->mode & SPI_CS_HIGH);
 
         if (dws->cs_control)
-                dws->cs_control(1);
+                dws->cs_control(active);
+        if (gpio_is_valid(spi->cs_gpio))
+                gpio_set_value(spi->cs_gpio, gpio_val);
 
-        dw_writel(dws, DW_SPI_SER, 1 << cs);
+        if (active)
+                dw_writel(dws, DW_SPI_SER, 1 << cs);
 }
 
 /* Disable IRQ bits */