summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorTom Warren <twarren@nvidia.com>2012-05-15 14:32:40 -0700
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-07-07 14:07:17 +0200
commit078078cfa91f72331421e6f7a46938a58a9b21a7 (patch)
tree236b72582ed1f21e966b1d1fc89270cd36d9245d /arch/arm/include/asm
parent558cd995d6d3eaa94fb342d142289a1fa2f76ba3 (diff)
downloadtalos-obmc-uboot-078078cfa91f72331421e6f7a46938a58a9b21a7.tar.gz
talos-obmc-uboot-078078cfa91f72331421e6f7a46938a58a9b21a7.zip
spi: Tegra2: Seaboard: fix UART corruption during SPI transactions
Simon Glass's proposal to fix this on Seaboard was NAK'd, so I removed his NS16550 references and added a small delay before SPI/UART muxing. Tested on my Seaboard with large SPI reads/writes and saw no corruption (crc's matched) and no spurious comm chars. Signed-off-by: Tom Warren <twarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Jimmy Zhang <jimmzhang@nvidia.com>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/arch-tegra2/uart-spi-switch.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-tegra2/uart-spi-switch.h b/arch/arm/include/asm/arch-tegra2/uart-spi-switch.h
index e4503b15b0..82ac180acd 100644
--- a/arch/arm/include/asm/arch-tegra2/uart-spi-switch.h
+++ b/arch/arm/include/asm/arch-tegra2/uart-spi-switch.h
@@ -29,7 +29,7 @@
* time! If the board file provides this, the board config will declare it.
* Let this be a lesson for others.
*/
-void pinmux_select_uart(NS16550_t regs);
+void pinmux_select_uart(void);
/*
* Signal that we are about the use the SPI bus.
@@ -38,7 +38,7 @@ void pinmux_select_spi(void);
#else /* not CONFIG_SPI_UART_SWITCH */
-static inline void pinmux_select_uart(NS16550_t regs) {}
+static inline void pinmux_select_uart(void) {}
static inline void pinmux_select_spi(void) {}
#endif
OpenPOWER on IntegriCloud