From patchwork Thu Aug 23 10:33:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1365671 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 79381DF2AB for ; Thu, 23 Aug 2012 10:39:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030261Ab2HWKjX (ORCPT ); Thu, 23 Aug 2012 06:39:23 -0400 Received: from na3sys009aog115.obsmtp.com ([74.125.149.238]:53757 "EHLO na3sys009aog115.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933890Ab2HWKiC (ORCPT ); Thu, 23 Aug 2012 06:38:02 -0400 Received: from mail-lpp01m010-f42.google.com ([209.85.215.42]) (using TLSv1) by na3sys009aob115.postini.com ([74.125.148.12]) with SMTP ID DSNKUDYICVm44lKWbaaOn+Cv2n1x1d5rTtyP@postini.com; Thu, 23 Aug 2012 03:38:02 PDT Received: by lahl5 with SMTP id l5so333647lah.29 for ; Thu, 23 Aug 2012 03:37:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=QJ97Grv8o551acOgI7+Wdynubllz4NpUvwWpo0V+IgQ=; b=EXswHlrKfluWSvwQZMp8a4Y9mQmPuRQmb+B5ejH8Tb1ifi0J3SSjWHfpLrmHChgNY6 nPy8Ie+h1O5fVnjHidvhRf8p0LWasLcrqpgr2odZkHEQvjceWqzsSRr0DvAejJVCdeyp agyUonEaaZBmDoKvJFSpzGIg6ipl79te7HKr0rBj8X68XOB96lxBnf0iBxfxV8YIQoHG 6WDp587nNJ2ziQctO5kwB6O/iy/GIzs63ukPNKcSFyfmupYgfqbwoUb8eXibJKvnqsQw nMoZj+VjkUHpKhnI1pMkfURDn09ch3D9xZP0XY+rpP5SoOwd4j4yuDPuY5ZFscbgKn/o 72Sg== Received: by 10.112.98.231 with SMTP id el7mr690580lbb.14.1345718277964; Thu, 23 Aug 2012 03:37:57 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id lr17sm7077512lab.12.2012.08.23.03.37.56 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Aug 2012 03:37:57 -0700 (PDT) From: Felipe Balbi To: alan@linux.intel.com Cc: Tony Lindgren , Kevin Hilman , Linux OMAP Mailing List , Linux ARM Kernel Mailing List , linux-serial@vger.kernel.org, Linux Kernel Mailing List , Santosh Shilimkar , Shubhrajyoti Datta , Sourav Poddar , Vikram Pandita , stable@vger.kernel.org, Felipe Balbi Subject: [PATCH v3 20/23] serial: omap: fix software flow control Date: Thu, 23 Aug 2012 13:33:00 +0300 Message-Id: <1345717983-18179-21-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1345717983-18179-1-git-send-email-balbi@ti.com> References: <1345717983-18179-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQkQQAN8yO8Xzz9EzJA8GTh2miMDcJrclCPzuCXjW7BxI+K6I+AuRRD0ifrc+cFF/3VWWKhm Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Vikram Pandita Software flow control register bits were not defined correctly. Also clarify the IXON and IXOFF logic to reflect what userspace wants. Cc: stable@vger.kernel.org Tested-by: Shubhrajyoti D Signed-off-by: Vikram Pandita Signed-off-by: Shubhrajyoti D Signed-off-by: Felipe Balbi Acked-by: Tony Lindgren --- arch/arm/plat-omap/include/plat/omap-serial.h | 4 ++-- drivers/tty/serial/omap-serial.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h index 743ac80..12e6805 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 0x04 +#define OMAP_UART_SW_TX 0x8 /* Enable XON/XOFF flow control on input */ -#define OMAP_UART_SW_RX 0x04 +#define OMAP_UART_SW_RX 0x2 #define OMAP_UART_SYSC_RESET 0X07 #define OMAP_UART_TCR_TRIG 0X0F diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index c3579c0..d49981d 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -606,19 +606,19 @@ serial_omap_configure_xonxoff /* * IXON Flag: - * Enable XON/XOFF flow control on output. - * Transmit XON1, XOFF1 + * Flow control for OMAP.TX + * OMAP.RX should listen for XON/XOFF */ if (termios->c_iflag & IXON) - up->efr |= OMAP_UART_SW_TX; + up->efr |= OMAP_UART_SW_RX; /* * IXOFF Flag: - * Enable XON/XOFF flow control on input. - * Receiver compares XON1, XOFF1. + * Flow control for OMAP.RX + * OMAP.TX should send XON/XOFF */ if (termios->c_iflag & IXOFF) - up->efr |= OMAP_UART_SW_RX; + up->efr |= OMAP_UART_SW_TX; serial_out(up, UART_EFR, up->efr | UART_EFR_ECB); serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);