diff options
| author | Doug Anderson <dianders@chromium.org> | 2011-07-11 11:18:46 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:58:55 -0700 |
| commit | 5f01bbea727e5643c41e0fd34f3aa9b0ed2f88c6 (patch) | |
| tree | d74c92a098c62d77a11bc1809b3e99e1153b10fc /drivers | |
| parent | 0bd5fad977366c5dcf4a7582b187fa5db31a1f61 (diff) | |
CHROMIUM: ARM: tegra: Fix SPI mux on non-FDT boards w/out SPI UART switch.
BUG=chromium-os:17437
TEST=Compiles
Change-Id: I4597afaebc3bcaad294d087ee538f80d07622705
Reviewed-on: http://gerrit.chromium.org/gerrit/3950
Tested-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Rong Chang <rongchang@chromium.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/tegra2_spi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/spi/tegra2_spi.c b/drivers/spi/tegra2_spi.c index e200a5c7d4..f82e865675 100644 --- a/drivers/spi/tegra2_spi.c +++ b/drivers/spi/tegra2_spi.c @@ -103,11 +103,15 @@ void spi_init(void) pinmux_set_func(PINGRP_GMD, PMUX_FUNC_SFLASH); pinmux_tristate_disable(PINGRP_LSPI); +#ifndef CONFIG_SPI_UART_SWITCH /* * NOTE: - * Don't set PinMux bits 3:2 to SPI here or subsequent UART data - * won't go out! It'll be correctly set in spi_uart_switch(). + * Only set PinMux bits 3:2 to SPI here on boards that don't have the + * SPI UART switch or subsequent UART data won't go out! See + * spi_uart_switch(). */ + pinmux_set_func(PINGRP_GMC, PMUX_FUNC_SFLASH); +#endif } int spi_claim_bus(struct spi_slave *slave) |