Merge remote-tracking branches 'spi/fix/davinci', 'spi/fix/dw', 'spi/fix/fsl', 'spi...

diff --cc drivers/spi/spi-davinci.c
index 48f1d26e6ad9868f9ac8c8e11fb0953e90f707da,84a9fb1ab984f44f4bbb2ecf05c268442badfd17,276a3884fb3c1d43c928b0b975b8d7aa67f6be58,276a3884fb3c1d43c928b0b975b8d7aa67f6be58,276a3884fb3c1d43c928b0b975b8d7aa67f6be58,276a3884fb3c1d43c928b0b975b8d7aa67f6be58,276a3884fb3c1d43c928b0b975b8d7aa67f6be58..134fb6eb7b19247dd2bf729d102fcf5e9263bf7c
--- 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
--- 6/drivers/spi/spi-davinci.c
--- 7/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@@@@@@@ -413,20 -410,20 -413,20 -413,20 -413,20 -413,20 -413,20 +410,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);

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

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