summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2012-10-16 17:09:22 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 11:38:44 -0800
commit51b8318a818623899f9eb24ce697d43301bbe349 (patch)
tree3e5ae6f1b775f5b60df4ea3af0cd602c3bdaa6d5 /arch
parent8217df07c9d8debd39a6d8e1e2271e97a3c899c7 (diff)
downloadlinux-3.10-51b8318a818623899f9eb24ce697d43301bbe349.tar.gz
linux-3.10-51b8318a818623899f9eb24ce697d43301bbe349.tar.bz2
linux-3.10-51b8318a818623899f9eb24ce697d43301bbe349.zip
Revert "serial: omap: fix software flow control"
commit a4f743851f74fc3e0cc40c13082e65c24139f481 upstream. This reverts commit 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6 (serial: omap: fix software flow control). As Russell has pointed out, that commit isn't fixing Software Flow Control at all, and it actually makes it even more broken. It was agreed to revert this commit and use Russell's latest UART patches instead. Signed-off-by: Felipe Balbi <balbi@ti.com> Cc: Russell King <linux@arm.linux.org.uk> Acked-by: Tony Lindgren <tony@atomide.com> Cc: Andreas Bießmann <andreas.devel@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-omap/include/plat/omap-serial.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
index c369c9d242a..9ff444469f3 100644
--- a/arch/arm/plat-omap/include/plat/omap-serial.h
+++ b/arch/arm/plat-omap/include/plat/omap-serial.h
@@ -42,10 +42,10 @@
#define OMAP_UART_WER_MOD_WKUP 0X7F
/* Enable XON/XOFF flow control on output */
-#define OMAP_UART_SW_TX 0x8
+#define OMAP_UART_SW_TX 0x04
/* Enable XON/XOFF flow control on input */
-#define OMAP_UART_SW_RX 0x2
+#define OMAP_UART_SW_RX 0x04
#define OMAP_UART_SYSC_RESET 0X07
#define OMAP_UART_TCR_TRIG 0X0F