summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:48:59 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:48:59 +0100
commit455765f02eabaa0c6041ca92ba9c138117f1b4fd (patch)
tree4ab0604365ebbbd945b43a29d43ded94895c611d /drivers/spi
parent7c2fde9b1a3961dfd47839940490116010b7bbde (diff)
parent044d0bb620be2ecb02c7f8c2d4b547f7b7101811 (diff)
downloadlinux-455765f02eabaa0c6041ca92ba9c138117f1b4fd.tar.bz2
Merge remote-tracking branch 'spi/topic/nuc900' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-nuc900.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c
index 2ad3d74ac021..b21f8f20060a 100644
--- a/drivers/spi/spi-nuc900.c
+++ b/drivers/spi/spi-nuc900.c
@@ -362,7 +362,7 @@ static int nuc900_spi_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, hw);
init_completion(&hw->done);
- master->mode_bits = SPI_MODE_0;
+ master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
master->num_chipselect = hw->pdata->num_cs;
master->bus_num = hw->pdata->bus_num;
hw->bitbang.master = hw->master;