diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-09-29 12:34:46 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-09-29 12:34:46 -0700 |
| commit | 347bcf7521e0d300fed253c39553f98fddec8a3d (patch) | |
| tree | 4aa8327359b65879e02bc98c035699f151235a41 /drivers/spi | |
| parent | a249a0aa389491494231d92e8143d11f17b17487 (diff) | |
| parent | 7eb6532a8361fbe0b36e0f6f529e1e6eb4b06619 (diff) | |
| download | kernel_samsung_tuna-347bcf7521e0d300fed253c39553f98fddec8a3d.zip kernel_samsung_tuna-347bcf7521e0d300fed253c39553f98fddec8a3d.tar.gz kernel_samsung_tuna-347bcf7521e0d300fed253c39553f98fddec8a3d.tar.bz2 | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/omap2_mcspi.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index 969cdd2..d54389c 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c @@ -650,6 +650,7 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) { struct omap2_mcspi_cs *cs = spi->controller_state; + struct omap2_mcspi_device_config *cd = spi->controller_data; struct omap2_mcspi *mcspi; struct spi_master *spi_cntrl; u32 l = 0, div = 0; @@ -675,8 +676,13 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi, /* standard 4-wire master mode: SCK, MOSI/out, MISO/in, nCS * REVISIT: this controller could support SPI_3WIRE mode. */ - l &= ~(OMAP2_MCSPI_CHCONF_IS|OMAP2_MCSPI_CHCONF_DPE1); - l |= OMAP2_MCSPI_CHCONF_DPE0; + if (cd->swap_datalines) { + l &= ~OMAP2_MCSPI_CHCONF_DPE0; + l |= OMAP2_MCSPI_CHCONF_IS | OMAP2_MCSPI_CHCONF_DPE1; + } else { + l &= ~(OMAP2_MCSPI_CHCONF_IS | OMAP2_MCSPI_CHCONF_DPE1); + l |= OMAP2_MCSPI_CHCONF_DPE0; + } /* wordlength */ l &= ~OMAP2_MCSPI_CHCONF_WL_MASK; |