spi: davinci: Remove chip select GPIO pdata

The DaVinci SPI can use either:
- Internal chip selects (inside the SPI host)
- External chip selects (using GPIO)
- External chip selects passed in pdata

The last way of passing external chip selects through
platform data is not used in the kernel. Delete it to make
the code simpler when refactoring GPIO.

Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@kernel.org>
Cc: Michele Dionisio <michele.dionisio@gmail.com>
Cc: Frode Isaksen <fisaksen@baylibre.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 3dabc20b68a168683d6d3b7f39b55ad90a1fc54e..d502cf504debbd11721964aa93b7707e1c271194 100644 (file)
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -432,13 +432,6 @@ static int davinci_spi_setup(struct spi_device *spi)
                        retval = gpio_direction_output(
                                      spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
                        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_direction_output(
-                                     spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
-                       internal_cs = false;
                }
 
                if (retval) {

diff --git a/include/linux/platform_data/spi-davinci.h b/include/linux/platform_data/spi-davinci.h
index f4edcb03c40c9f22bbefc708c831c922cfc9fe4f..0638fb6353bc381bc2237be97d08e699d5e2c8e9 100644 (file)
--- a/include/linux/platform_data/spi-davinci.h
+++ b/include/linux/platform_data/spi-davinci.h
@@ -36,9 +36,6 @@ enum {
  * @num_chipselect: number of chipselects supported by this SPI master
  * @intr_line: interrupt line used to connect the SPI IP to the ARM interrupt
  *             controller withn the SoC. Possible values are 0 and 1.
- * @chip_sel:  list of GPIOs which can act as chip-selects for the SPI.
- *             SPI_INTERN_CS denotes internal SPI chip-select. Not necessary
- *             to populate if all chip-selects are internal.
  * @cshold_bug:        set this to true if the SPI controller on your chip requires
  *             a write to CSHOLD bit in between transfers (like in DM355).
  * @dma_event_q: DMA event queue to use if SPI_IO_TYPE_DMA is used for any
@@ -48,7 +45,6 @@ struct davinci_spi_platform_data {
        u8                      version;
        u8                      num_chipselect;
        u8                      intr_line;
-       u8                      *chip_sel;
        u8                      prescaler_limit;
        bool                    cshold_bug;
        enum dma_event_q        dma_event_q;