1 files changed, 53 insertions, 19 deletions

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 50f750989258..276a3884fb3c 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -30,6 +30,7 @@
 #include <linux/edma.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/of_gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
 #include <linux/slab.h>
@@ -38,8 +39,6 @@
 
 #define SPI_NO_RESOURCE         ((resource_size_t)-1)
 
-#define SPI_MAX_CHIPSELECT      2
-
 #define CS_DEFAULT      0xFF
 
 #define SPIFMT_PHASE_MASK       BIT(16)
@@ -142,7 +141,7 @@ struct davinci_spi {
         void                    (*get_rx)(u32 rx_data, struct davinci_spi *);
         u32                     (*get_tx)(struct davinci_spi *);
 
-        u8                      bytes_per_word[SPI_MAX_CHIPSELECT];
+        u8                      *bytes_per_word;
 };
 
 static struct davinci_spi_config davinci_spi_default_cfg;
@@ -213,13 +212,16 @@ static void davinci_spi_chipselect(struct spi_device *spi, int value)
         u8 chip_sel = spi->chip_select;
         u16 spidat1 = CS_DEFAULT;
         bool gpio_chipsel = false;
+        int gpio;
 
         dspi = spi_master_get_devdata(spi->master);
         pdata = &dspi->pdata;
 
-        if (pdata->chip_sel && chip_sel < pdata->num_chipselect &&
-                                pdata->chip_sel[chip_sel] != SPI_INTERN_CS)
+        if (spi->cs_gpio >= 0) {
+                /* SPI core parse and update master->cs_gpio */
                 gpio_chipsel = true;
+                gpio = spi->cs_gpio;
+        }
 
         /*
          * Board specific chip select logic decides the polarity and cs
@@ -227,9 +229,9 @@ static void davinci_spi_chipselect(struct spi_device *spi, int value)
          */
         if (gpio_chipsel) {
                 if (value == BITBANG_CS_ACTIVE)
-                        gpio_set_value(pdata->chip_sel[chip_sel], 0);
+                        gpio_set_value(gpio, spi->mode & SPI_CS_HIGH);
                 else
-                        gpio_set_value(pdata->chip_sel[chip_sel], 1);
+                        gpio_set_value(gpio, !(spi->mode & SPI_CS_HIGH));
         } else {
                 if (value == BITBANG_CS_ACTIVE) {
                         spidat1 |= SPIDAT1_CSHOLD_MASK;
@@ -392,17 +394,40 @@ static int davinci_spi_setup(struct spi_device *spi)
         int retval = 0;
         struct davinci_spi *dspi;
         struct davinci_spi_platform_data *pdata;
+        struct spi_master *master = spi->master;
+        struct device_node *np = spi->dev.of_node;
+        bool internal_cs = true;
+        unsigned long flags = GPIOF_DIR_OUT;
 
         dspi = spi_master_get_devdata(spi->master);
         pdata = &dspi->pdata;
 
+        flags |= (spi->mode & SPI_CS_HIGH) ? GPIOF_INIT_LOW : GPIOF_INIT_HIGH;
+
         if (!(spi->mode & SPI_NO_CS)) {
-                if ((pdata->chip_sel == NULL) ||
-                    (pdata->chip_sel[spi->chip_select] == SPI_INTERN_CS))
-                        set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select);
+                if (np && (master->cs_gpios != NULL) && (spi->cs_gpio >= 0)) {
+                        retval = gpio_request_one(spi->cs_gpio,
+                                                  flags, dev_name(&spi->dev));
+                        internal_cs = false;
+                } else if (pdata->chip_sel &&
+                           spi->chip_select < pdata->num_chipselect &&
+                           pdata->chip_sel[spi->chip_select] != SPI_INTERN_CS) {
+                        spi->cs_gpio = pdata->chip_sel[spi->chip_select];
+                        retval = gpio_request_one(spi->cs_gpio,
+                                                  flags, dev_name(&spi->dev));
+                        internal_cs = false;
+                }
+        }
 
+        if (retval) {
+                dev_err(&spi->dev, "GPIO %d setup failed (%d)\n",
+                        spi->cs_gpio, retval);
+                return retval;
         }
 
+        if (internal_cs)
+                set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select);
+
         if (spi->mode & SPI_READY)
                 set_io_bits(dspi->base + SPIPC0, SPIPC0_SPIENA_MASK);
 
@@ -414,6 +439,12 @@ static int davinci_spi_setup(struct spi_device *spi)
         return retval;
 }
 
+static void davinci_spi_cleanup(struct spi_device *spi)
+{
+        if (spi->cs_gpio >= 0)
+                gpio_free(spi->cs_gpio);
+}
+
 static int davinci_spi_check_error(struct davinci_spi *dspi, int int_status)
 {
         struct device *sdev = dspi->bitbang.master->dev.parent;
@@ -812,6 +843,8 @@ static int spi_davinci_get_pdata(struct platform_device *pdev,
 
         /*
          * default num_cs is 1 and all chipsel are internal to the chip
+         * indicated by chip_sel being NULL or cs_gpios being NULL or
+         * set to -ENOENT. num-cs includes internal as well as gpios.
          * indicated by chip_sel being NULL. GPIO based CS is not
          * supported yet in DT bindings.
          */
@@ -850,7 +883,7 @@ static int davinci_spi_probe(struct platform_device *pdev)
         struct resource *r;
         resource_size_t dma_rx_chan = SPI_NO_RESOURCE;
         resource_size_t dma_tx_chan = SPI_NO_RESOURCE;
-        int i = 0, ret = 0;
+        int ret = 0;
         u32 spipc0;
 
         master = spi_alloc_master(&pdev->dev, sizeof(struct davinci_spi));
@@ -876,6 +909,14 @@ static int davinci_spi_probe(struct platform_device *pdev)
         /* pdata in dspi is now updated and point pdata to that */
         pdata = &dspi->pdata;
 
+        dspi->bytes_per_word = devm_kzalloc(&pdev->dev,
+                                            sizeof(*dspi->bytes_per_word) *
+                                            pdata->num_chipselect, GFP_KERNEL);
+        if (dspi->bytes_per_word == NULL) {
+                ret = -ENOMEM;
+                goto free_master;
+        }
+
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (r == NULL) {
                 ret = -ENOENT;
@@ -915,6 +956,7 @@ static int davinci_spi_probe(struct platform_device *pdev)
         master->num_chipselect = pdata->num_chipselect;
         master->bits_per_word_mask = SPI_BPW_RANGE_MASK(2, 16);
         master->setup = davinci_spi_setup;
+        master->cleanup = davinci_spi_cleanup;
 
         dspi->bitbang.chipselect = davinci_spi_chipselect;
         dspi->bitbang.setup_transfer = davinci_spi_setup_transfer;
@@ -962,14 +1004,6 @@ static int davinci_spi_probe(struct platform_device *pdev)
         spipc0 = SPIPC0_DIFUN_MASK | SPIPC0_DOFUN_MASK | SPIPC0_CLKFUN_MASK;
         iowrite32(spipc0, dspi->base + SPIPC0);
 
-        /* initialize chip selects */
-        if (pdata->chip_sel) {
-                for (i = 0; i < pdata->num_chipselect; i++) {
-                        if (pdata->chip_sel[i] != SPI_INTERN_CS)
-                                gpio_direction_output(pdata->chip_sel[i], 1);
-                }
-        }
-
         if (pdata->intr_line)
                 iowrite32(SPI_INTLVL_1, dspi->base + SPILVL);
         else