Merge remote-tracking branches 'spi/topic/davinci', 'spi/topic/doc', 'spi/topic/dw...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi-davinci.c
index 63c82a61c97517a54305e38b09164b49ca101c71,25886d8a84baa147aabdb5ced933ca63de0390fc,276a3884fb3c1d43c928b0b975b8d7aa67f6be58,514852cb7b3cfeec09d7687fc38f032fd62c04ed,276a3884fb3c1d43c928b0b975b8d7aa67f6be58..63700ab7bd9ff6687d03d7f900f1ddbc98a69d27
--- 1/drivers/spi/spi-davinci.c
--- 2/drivers/spi/spi-davinci.c
--- 3/drivers/spi/spi-davinci.c
--- 4/drivers/spi/spi-davinci.c
--- 5/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@@@@@ -414,20 -441,20 -413,20 -417,20 -413,20 +445,20 @@@@@@ static int davinci_spi_setup(struct spi
                           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));
  +++                   retval = gpio_direction_output(
  +++                                 spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
                        internal_cs = false;
                }
 ----   }
     
 ----   if (retval) {
 ----           dev_err(&spi->dev, "GPIO %d setup failed (%d)\n",
 ----                   spi->cs_gpio, retval);
 ----           return retval;
 ----   }
 ++++           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 (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);
@@@@@@ -437,7 -464,16 -436,13 -440,13 -436,13 +468,16 @@@@@@
        else
                clear_io_bits(dspi->base + SPIGCR1, SPIGCR1_LOOPBACK_MASK);
     
- ---   return retval;
+ +++   return davinci_spi_of_setup(spi);
+    }
+    
+    static void davinci_spi_cleanup(struct spi_device *spi)
+    {
  ---   if (spi->cs_gpio >= 0)
  ---           gpio_free(spi->cs_gpio);
+ +++   struct davinci_spi_config *spicfg = spi->controller_data;
+ +++
+ +++   spi->controller_data = NULL;
+ +++   if (spi->dev.of_node)
+ +++           kfree(spicfg);
     }
     
     static int davinci_spi_check_error(struct davinci_spi *dspi, int int_status)

diff --cc drivers/spi/spi-dw-pci.c
Simple merge

diff --cc drivers/spi/spi-dw.c
index 33117fbbf6896785d4de7686093191b2016e4b8c,29f33143b795651e773ea7b9d5cc0f80c7cb2575,29f33143b795651e773ea7b9d5cc0f80c7cb2575,6bb484919e58665e0cd21d4eedbf35d16c3e0e32,29f33143b795651e773ea7b9d5cc0f80c7cb2575..72921588525008a0f4eaf615980eb884b8614108
--- 1/drivers/spi/spi-dw.c
--- 2/drivers/spi/spi-dw.c
--- 3/drivers/spi/spi-dw.c
--- 4/drivers/spi/spi-dw.c
--- 5/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@@@@@ -133,9 -133,10 -133,10 -127,9 -133,10 +127,9 @@@@@@ static int dw_spi_debugfs_init(struct d
        return 0;
     }
     
--- -static void mrst_spi_debugfs_remove(struct dw_spi *dws)
+++ +static void dw_spi_debugfs_remove(struct dw_spi *dws)
     {
 -- -   if (dws->debugfs)
 -- -           debugfs_remove_recursive(dws->debugfs);
 ++ +   debugfs_remove_recursive(dws->debugfs);
     }
     
     #else

diff --cc drivers/spi/spi-fsl-espi.c
Simple merge

diff --cc drivers/spi/spi-fsl-spi.c
Simple merge