diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-10-26 07:00:28 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-10-26 07:00:28 +0200 |
| commit | c68436fa427a69ea308d74c410067507d6c7103b (patch) | |
| tree | 4f05a23bb3eabfe1eaf1f92bf6f57a6e403ac9a4 /drivers/spi | |
| parent | 186fc4db263fc6332d6712be99a9a387087d29c7 (diff) | |
| parent | c7d35bef255dedb3ec3856982f042dde514676b0 (diff) | |
| download | u-boot-imx-c68436fa427a69ea308d74c410067507d6c7103b.zip u-boot-imx-c68436fa427a69ea308d74c410067507d6c7103b.tar.gz u-boot-imx-c68436fa427a69ea308d74c410067507d6c7103b.tar.bz2 | |
Merge remote-tracking branch 'u-boot-ti/master'
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/omap3_spi.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index e40a632..6791a7e 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -173,14 +173,13 @@ int spi_claim_bus(struct spi_slave *slave) /* standard 4-wire master mode: SCK, MOSI/out, MISO/in, nCS * REVISIT: this controller could support SPI_3WIRE mode. */ -#ifdef CONFIG_AM33XX +#ifdef CONFIG_OMAP3_SPI_D0_D1_SWAPPED /* - * The reference design on AM33xx has D0 and D1 wired up opposite - * of how it has been done on previous platforms. We assume that - * custom hardware will also follow this convention. + * Some boards have D0 wired as MOSI / D1 as MISO instead of + * The normal D0 as MISO / D1 as MOSI. */ - conf &= OMAP3_MCSPI_CHCONF_DPE0; - conf |= ~(OMAP3_MCSPI_CHCONF_IS|OMAP3_MCSPI_CHCONF_DPE1); + conf &= ~OMAP3_MCSPI_CHCONF_DPE0; + conf |= OMAP3_MCSPI_CHCONF_IS|OMAP3_MCSPI_CHCONF_DPE1; #else conf &= ~(OMAP3_MCSPI_CHCONF_IS|OMAP3_MCSPI_CHCONF_DPE1); conf |= OMAP3_MCSPI_CHCONF_DPE0; |