Merge remote-tracking branch 'spi/topic/nuc900' into spi-next

455765f0 · Mark Brown · 7c2fde9b · 044d0bb6 · 455765f0
Commit 455765f0 authored Sep 01, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/spi/spi-nuc900.c drivers/spi/spi-nuc900.c +1 -1

No files found.
--- 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;