From: Mark Brown <broonie@kernel.org>
Date: Tue, 16 Sep 2014 23:20:19 +0000 (-0700)
Subject: Merge remote-tracking branches 'spi/fix/davinci', 'spi/fix/dw', 'spi/fix/fsl', 'spi... 
X-Git-Tag: v3.17-rc6~18^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=94b0955ddd1ea4ea1089a282dd8058765fffe937;p=linux.git

Merge remote-tracking branches 'spi/fix/davinci', 'spi/fix/dw', 'spi/fix/fsl', 'spi/fix/pl022', 'spi/fix/rockchip' and 'spi/fix/sirf' into spi-linus
---

94b0955ddd1ea4ea1089a282dd8058765fffe937
diff --cc drivers/spi/spi-davinci.c
index 48f1d26e6ad9,84a9fb1ab984,276a3884fb3c,276a3884fb3c,276a3884fb3c,276a3884fb3c,276a3884fb3c..134fb6eb7b19
--- a/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);