diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:48:59 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:48:59 -0400 |
| commit | 455765f02eabaa0c6041ca92ba9c138117f1b4fd (patch) | |
| tree | 4ab0604365ebbbd945b43a29d43ded94895c611d /drivers/spi/spi-nuc900.c | |
| parent | 7c2fde9b1a3961dfd47839940490116010b7bbde (diff) | |
| parent | 044d0bb620be2ecb02c7f8c2d4b547f7b7101811 (diff) | |
Merge remote-tracking branch 'spi/topic/nuc900' into spi-next
Diffstat (limited to 'drivers/spi/spi-nuc900.c')
| -rw-r--r-- | drivers/spi/spi-nuc900.c | 2 |
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) | |||
| 362 | platform_set_drvdata(pdev, hw); | 362 | platform_set_drvdata(pdev, hw); |
| 363 | init_completion(&hw->done); | 363 | init_completion(&hw->done); |
| 364 | 364 | ||
| 365 | master->mode_bits = SPI_MODE_0; | 365 | master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; |
| 366 | master->num_chipselect = hw->pdata->num_cs; | 366 | master->num_chipselect = hw->pdata->num_cs; |
| 367 | master->bus_num = hw->pdata->bus_num; | 367 | master->bus_num = hw->pdata->bus_num; |
| 368 | hw->bitbang.master = hw->master; | 368 | hw->bitbang.master = hw->master; |