summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-11 16:48:29 +0000
committerMark Brown <broonie@kernel.org>2016-01-11 16:48:29 +0000
commit9b17e80150f8c6300b49e5f073a9a28dae2299fb (patch)
tree2b2965f711a300c0770e863d03f2ae6e14b41390 /drivers/spi
parent174c21163d83f730f7e0194d4682d5149946a7f8 (diff)
parent218e0b575ffe6de1c93249871b25bbf570fe1cb5 (diff)
Merge remote-tracking branch 'spi/topic/sunxi' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-sun4i.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c
index fbb0a4d74e91..a6d936c68674 100644
--- a/drivers/spi/spi-sun4i.c
+++ b/drivers/spi/spi-sun4i.c
@@ -140,6 +140,9 @@ static void sun4i_spi_set_cs(struct spi_device *spi, bool enable)
reg &= ~SUN4I_CTL_CS_MASK;
reg |= SUN4I_CTL_CS(spi->chip_select);
+ /* We want to control the chip select manually */
+ reg |= SUN4I_CTL_CS_MANUAL;
+
if (enable)
reg |= SUN4I_CTL_CS_LEVEL;
else
@@ -222,9 +225,6 @@ static int sun4i_spi_transfer_one(struct spi_master *master,
else
reg |= SUN4I_CTL_DHB;
- /* We want to control the chip select manually */
- reg |= SUN4I_CTL_CS_MANUAL;
-
sun4i_spi_write(sspi, SUN4I_CTL_REG, reg);
/* Ensure that we have a parent clock fast enough */