From patchwork Sat Oct 6 12:41:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 1557331 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 8382E3FD56 for ; Sat, 6 Oct 2012 12:41:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756123Ab2JFMlc (ORCPT ); Sat, 6 Oct 2012 08:41:32 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:47242 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756064Ab2JFMlb (ORCPT ); Sat, 6 Oct 2012 08:41:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:Sender:Message-Id:Subject:Cc:To:From:References:In-Reply-To; bh=vihrEv8iQsKIC2YvGiYlkt6O6HNWYJCdD9McRt+4fMA=; b=FcJURQoIZvtMmlJ/3laD/i9QEhS55b+hPVIU5OJ32YYEsgMU+SCpUNqp/UV7W2bSfhlMyxiaxluHRrv98AcUrv+E15egjCv4hv9+e0JhdLsfGLG0WfPFbgDYH8Nt7QmosBxgsOCrwCG5WKjkYasmRvbQLMG2DyBjy1UejqejBVI=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd]:39596 helo=rmk-PC.arm.linux.org.uk) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1TKTh5-00087L-Kl; Sat, 06 Oct 2012 13:41:23 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1TKTh5-0002mn-37; Sat, 06 Oct 2012 13:41:23 +0100 In-Reply-To: <20121006123803.GD15246@n2100.arm.linux.org.uk> References: <20121006123803.GD15246@n2100.arm.linux.org.uk> From: Russell King To: Tony Lindgren , Alan Cox , Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-serial@vger.kernel.org Subject: [RFC 07/24] SERIAL: omap: allow hardware assisted IXANY mode to be disabled Message-Id: Date: Sat, 06 Oct 2012 13:41:23 +0100 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Nothing was clearing the UART_MCR_XONANY bit, so once the ixany mode gets set, there's no possibility to disable it. Clear this bit when IXANY mode is cleared. Signed-off-by: Russell King --- drivers/tty/serial/omap-serial.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index f2535fe..6314827 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -696,6 +696,8 @@ serial_omap_configure_xonxoff */ if (termios->c_iflag & IXANY) up->mcr |= UART_MCR_XONANY; + else + up->mcr &= ~UART_MCR_XONANY; serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR); serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);