From patchwork Thu Sep 6 12:45:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1414241 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 2D98EDFFCF for ; Thu, 6 Sep 2012 12:51:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755584Ab2IFMvX (ORCPT ); Thu, 6 Sep 2012 08:51:23 -0400 Received: from na3sys009aog110.obsmtp.com ([74.125.149.203]:50469 "EHLO na3sys009aog110.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755820Ab2IFMvQ (ORCPT ); Thu, 6 Sep 2012 08:51:16 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]) (using TLSv1) by na3sys009aob110.postini.com ([74.125.148.12]) with SMTP ID DSNKUEicQwuObAbFk4BPEs5yLDQxb40Sdig2@postini.com; Thu, 06 Sep 2012 05:51:16 PDT Received: by lbbgj3 with SMTP id gj3so1101697lbb.19 for ; Thu, 06 Sep 2012 05:51:14 -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=rnxhQW38D0gnmd3gQH0G0OOkv2a+ahiZptzP8SiSze8=; b=ntJH0PEQN/mL+ntXV7QEj9rasUmuoaP1+A6QHxJy/GqL6FsaAOa+NCUQc0d40FhlE5 5+2yolDMeTiETJgAtXE7iestXYgSv1LCmzU1G56c/WpuZjarJlYM//i8AQZHSy5XuEW0 oxKnZ5jwG1xQO7kpR8IRcIVXsDC7Z/Sf5McpMIMo/n/Cal8Nz1rVYBjpsexVtsy0Xngf tBpCUtMCA4mIKFjUKcjTm+sScVL3bUPqUeN6f52tQZPhs/yswecEg7oZ1vv/H/BzDikO 6BZ18L/gN9nzAKEsExkpNpL9kpwe6vRs1wUIi+kosQlbtFtAvlYIZPvxp5j0B+/2daxB KxvA== Received: by 10.112.37.8 with SMTP id u8mr856864lbj.30.1346935873969; Thu, 06 Sep 2012 05:51:13 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id n7sm563884lbk.10.2012.09.06.05.51.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Sep 2012 05:51:13 -0700 (PDT) From: Felipe Balbi To: Greg KH Cc: alan@linux.intel.com, 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 , Felipe Balbi Subject: [PATCH v4 21/21] serial: omap: enable RX and TX FIFO usage Date: Thu, 6 Sep 2012 15:45:40 +0300 Message-Id: <1346935540-1792-22-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1346935540-1792-1-git-send-email-balbi@ti.com> References: <20120906122948.GC29202@arwen.pp.htv.fi> <1346935540-1792-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQmTdJ4joAKwQGNsK+lN0RYm1PQTt/WUrDEg7Bo/Xv2EzPOsCfxCEvlHNBYyw6mahwg2bQyE Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org enable RX FIFO for 16 characters and TX FIFO for 16 spaces. Tested-by: Shubhrajyoti D Signed-off-by: Felipe Balbi --- drivers/tty/serial/omap-serial.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 164c3c9..cfd2094 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -56,8 +56,8 @@ #define OMAP_UART_SCR_RX_TRIG_GRANU1_MASK (1 << 7) /* FCR register bitmasks */ -#define OMAP_UART_FCR_RX_FIFO_TRIG_SHIFT 6 #define OMAP_UART_FCR_RX_FIFO_TRIG_MASK (0x3 << 6) +#define OMAP_UART_FCR_TX_FIFO_TRIG_MASK (0x3 << 4) /* MVR register bitmasks */ #define OMAP_UART_MVR_SCHEME_SHIFT 30 @@ -834,9 +834,13 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, up->scr |= OMAP_UART_SCR_RX_TRIG_GRANU1_MASK; - /* Set receive FIFO threshold to 1 byte */ + /* Set receive FIFO threshold to 16 characters and + * transmit FIFO threshold to 16 spaces + */ up->fcr &= ~OMAP_UART_FCR_RX_FIFO_TRIG_MASK; - up->fcr |= (0x1 << OMAP_UART_FCR_RX_FIFO_TRIG_SHIFT); + up->fcr &= ~OMAP_UART_FCR_TX_FIFO_TRIG_MASK; + up->fcr |= UART_FCR6_R_TRIGGER_16 | UART_FCR6_T_TRIGGER_24 | + UART_FCR_ENABLE_FIFO; serial_out(up, UART_FCR, up->fcr); serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);