diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-13 22:16:50 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-13 22:16:50 -0500 |
| commit | 170c2d0a87922adb43a8e8ca47cba3e30407d4d6 (patch) | |
| tree | 1e2d95a01484072e00bfa3267636e1d7836bcbd6 /drivers/spi | |
| parent | 8266bdd2d716c08c3ebb1d6975daec88826d7f75 (diff) | |
| parent | 2cd451792db174382aaca96c75bc3bf47a6065fe (diff) | |
Merge branch 'spi-mcspi' into spi-next
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 643e7e27aa47..cc4f2dd89b50 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c | |||
| @@ -765,7 +765,7 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi, | |||
| 765 | /* standard 4-wire master mode: SCK, MOSI/out, MISO/in, nCS | 765 | /* standard 4-wire master mode: SCK, MOSI/out, MISO/in, nCS |
| 766 | * REVISIT: this controller could support SPI_3WIRE mode. | 766 | * REVISIT: this controller could support SPI_3WIRE mode. |
| 767 | */ | 767 | */ |
| 768 | if (mcspi->pin_dir == MCSPI_PINDIR_D0_OUT_D1_IN) { | 768 | if (mcspi->pin_dir == MCSPI_PINDIR_D0_IN_D1_OUT) { |
| 769 | l &= ~OMAP2_MCSPI_CHCONF_IS; | 769 | l &= ~OMAP2_MCSPI_CHCONF_IS; |
| 770 | l &= ~OMAP2_MCSPI_CHCONF_DPE1; | 770 | l &= ~OMAP2_MCSPI_CHCONF_DPE1; |
| 771 | l |= OMAP2_MCSPI_CHCONF_DPE0; | 771 | l |= OMAP2_MCSPI_CHCONF_DPE0; |
| @@ -1187,8 +1187,8 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev) | |||
| 1187 | of_property_read_u32(node, "ti,spi-num-cs", &num_cs); | 1187 | of_property_read_u32(node, "ti,spi-num-cs", &num_cs); |
| 1188 | master->num_chipselect = num_cs; | 1188 | master->num_chipselect = num_cs; |
| 1189 | master->bus_num = bus_num++; | 1189 | master->bus_num = bus_num++; |
| 1190 | if (of_get_property(node, "ti,pindir-d0-in-d1-out", NULL)) | 1190 | if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL)) |
| 1191 | mcspi->pin_dir = MCSPI_PINDIR_D0_IN_D1_OUT; | 1191 | mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN; |
| 1192 | } else { | 1192 | } else { |
| 1193 | pdata = pdev->dev.platform_data; | 1193 | pdata = pdev->dev.platform_data; |
| 1194 | master->num_chipselect = pdata->num_cs; | 1194 | master->num_chipselect = pdata->num_cs; |