All of lore.kernel.org
 help / color / mirror / Atom feed
From: Felipe Balbi <balbi@ti.com>
To: alan@linux.intel.com
Cc: Tony Lindgren <tony@atomide.com>, Kevin Hilman <khilman@ti.com>,
	Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
	Linux ARM Kernel Mailing List 
	<linux-arm-kernel@lists.infradead.org>,
	linux-serial@vger.kernel.org,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Santosh Shilimkar <santosh.shilimkar@ti.com>,
	Shubhrajyoti Datta <shubhrajyoti@ti.com>,
	Sourav Poddar <sourav.poddar@ti.com>, Felipe Balbi <balbi@ti.com>
Subject: [PATCH v3 23/23] serial: omap: enable RX and TX FIFO usage
Date: Thu, 23 Aug 2012 13:33:03 +0300	[thread overview]
Message-ID: <1345717983-18179-24-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1345717983-18179-1-git-send-email-balbi@ti.com>

enable RX FIFO for 16 characters and TX FIFO
for 16 spaces.

Tested-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 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 0e5ffdf..137d475 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -55,8 +55,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
@@ -820,9 +820,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);
-- 
1.7.12.rc3


WARNING: multiple messages have this Message-ID (diff)
From: balbi@ti.com (Felipe Balbi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 23/23] serial: omap: enable RX and TX FIFO usage
Date: Thu, 23 Aug 2012 13:33:03 +0300	[thread overview]
Message-ID: <1345717983-18179-24-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1345717983-18179-1-git-send-email-balbi@ti.com>

enable RX FIFO for 16 characters and TX FIFO
for 16 spaces.

Tested-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 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 0e5ffdf..137d475 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -55,8 +55,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
@@ -820,9 +820,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);
-- 
1.7.12.rc3

  parent reply	other threads:[~2012-08-23 10:39 UTC|newest]

Thread overview: 219+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-23 10:32 [PATCH v3 00/23] OMAP UART patches Felipe Balbi
2012-08-23 10:32 ` Felipe Balbi
2012-08-23 10:32 ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 01/23] serial: omap: define and use to_uart_omap_port() Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-24 19:07   ` Tony Lindgren
2012-08-24 19:07     ` Tony Lindgren
2012-08-24 19:07     ` Tony Lindgren
2012-08-23 10:32 ` [PATCH v3 02/23] serial: omap: define helpers for pdata function pointers Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 03/23] serial: omap: don't access the platform_device Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-24 19:07   ` Tony Lindgren
2012-08-24 19:07     ` Tony Lindgren
2012-08-24 19:07     ` Tony Lindgren
2012-09-05 20:27   ` Greg KH
2012-09-05 20:27     ` Greg KH
2012-09-05 20:27     ` Greg KH
2012-09-06 12:29     ` Felipe Balbi
2012-09-06 12:29       ` Felipe Balbi
2012-09-06 12:29       ` Felipe Balbi
2012-09-06 12:45       ` [PATCH v4 00/21] OMAP UART Patches Felipe Balbi
2012-09-06 12:45         ` Felipe Balbi
2012-09-06 12:45         ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 01/21] serial: omap: don't access the platform_device Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 02/21] serial: omap: drop DMA support Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 03/21] serial: add OMAP-specific defines Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 04/21] serial: omap: simplify IRQ handling Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 05/21] serial: omap: refactor receive_chars() into rdi/rlsi handlers Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 06/21] serial: omap: move THRE check to transmit_chars() Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 07/21] serial: omap: stick to put_autosuspend Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 08/21] serial: omap: set dev->drvdata before enabling pm_runtime Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 09/21] serial: omap: drop unnecessary check from remove Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 10/21] serial: omap: make sure to suspend device before remove Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 11/21] serial: omap: don't save IRQ flags on hardirq Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 12/21] serial: omap: fix sequence of pm_runtime_* calls Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 13/21] serial: omap: optimization with section annotations Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 14/21] serial: omap: drop "inline" from IRQ handler prototype Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 15/21] serial: omap: unlock the port lock Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 16/21] serial: omap: implement set_wake Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 17/21] serial: omap: make sure to put() on poll_get_char Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 18/21] serial: omap: fix software flow control Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 19/21] serial: omap: remove unnecessary header and add a missing one Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45         ` [PATCH v4 20/21] serial: omap: move uart_omap_port definition to C file Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 21:58           ` Kevin Hilman
2012-09-06 21:58             ` Kevin Hilman
2012-09-06 21:58             ` Kevin Hilman
2012-09-06 12:45         ` [PATCH v4 21/21] serial: omap: enable RX and TX FIFO usage Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 12:45           ` Felipe Balbi
2012-09-06 16:18         ` [PATCH v4 00/21] OMAP UART Patches Greg KH
2012-09-06 16:18           ` Greg KH
2012-09-06 16:18           ` Greg KH
2012-09-06 17:25           ` Felipe Balbi
2012-09-06 17:25             ` Felipe Balbi
2012-09-06 17:25             ` Felipe Balbi
2012-09-06 21:37         ` Paul Walmsley
2012-09-06 21:37           ` Paul Walmsley
2012-09-06 21:37           ` Paul Walmsley
2012-09-11 22:02           ` Paul Walmsley
2012-09-11 22:02             ` Paul Walmsley
2012-09-11 22:02             ` Paul Walmsley
2012-09-12  6:23             ` Felipe Balbi
2012-09-12  6:23               ` Felipe Balbi
2012-09-12  6:23               ` Felipe Balbi
2012-09-12 20:25               ` Paul Walmsley
2012-09-12 20:25                 ` Paul Walmsley
2012-09-12 20:25                 ` Paul Walmsley
2012-09-13  5:01                 ` Felipe Balbi
2012-09-13  5:01                   ` Felipe Balbi
2012-09-13  5:01                   ` Felipe Balbi
2012-09-16  1:22               ` Paul Walmsley
2012-09-16  1:22                 ` Paul Walmsley
2012-09-16  1:22                 ` Paul Walmsley
2012-09-16 18:36                 ` Felipe Balbi
2012-09-16 18:36                   ` Felipe Balbi
2012-09-16 18:36                   ` Felipe Balbi
2012-09-06 22:44         ` Kevin Hilman
2012-09-06 22:44           ` Kevin Hilman
2012-09-06 22:44           ` Kevin Hilman
2012-09-07  5:49           ` Felipe Balbi
2012-09-07  5:49             ` Felipe Balbi
2012-09-07  5:49             ` Felipe Balbi
2012-09-07 20:53             ` Kevin Hilman
2012-09-07 20:53               ` Kevin Hilman
2012-09-07 20:53               ` Kevin Hilman
2012-09-08 19:04               ` Felipe Balbi
2012-09-08 19:04                 ` Felipe Balbi
2012-09-08 19:04                 ` Felipe Balbi
2012-09-11 11:31                 ` Shubhrajyoti
2012-09-11 11:31                   ` Shubhrajyoti
2012-09-11 11:31                   ` Shubhrajyoti
2012-09-11 11:54                   ` Felipe Balbi
2012-09-11 11:54                     ` Felipe Balbi
2012-09-11 11:54                     ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 04/23] serial: omap: drop DMA support Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 05/23] serial: add OMAP-specific defines Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 06/23] serial: omap: simplify IRQ handling Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 07/23] serial: omap: refactor receive_chars() into rdi/rlsi handlers Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 08/23] serial: omap: move THRE check to transmit_chars() Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 09/23] serial: omap: stick to put_autosuspend Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 10/23] serial: omap: set dev->drvdata before enabling pm_runtime Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 11/23] serial: omap: drop unnecessary check from remove Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 12/23] serial: omap: make sure to suspend device before remove Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 13/23] serial: omap: don't save IRQ flags on hardirq Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 14/23] serial: omap: fix sequence of pm_runtime_* calls Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 15/23] serial: omap: optimization with section annotations Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 16/23] serial: omap: drop "inline" from IRQ handler prototype Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 17/23] serial: omap: unlock the port lock Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 18/23] serial: omap: implement set_wake Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32 ` [PATCH v3 19/23] serial: omap: make sure to put() on poll_get_char Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:32   ` Felipe Balbi
2012-08-23 10:33 ` [PATCH v3 20/23] serial: omap: fix software flow control Felipe Balbi
2012-08-23 10:33   ` Felipe Balbi
2012-08-23 10:33   ` Felipe Balbi
2012-08-24 19:08   ` Tony Lindgren
2012-08-24 19:08     ` Tony Lindgren
2012-08-24 19:08     ` Tony Lindgren
2012-09-05 20:27   ` Greg KH
2012-09-05 20:27     ` Greg KH
2012-09-05 20:27     ` Greg KH
2012-09-06 12:31     ` Felipe Balbi
2012-09-06 12:31       ` Felipe Balbi
2012-09-06 12:31       ` Felipe Balbi
2012-08-23 10:33 ` [PATCH v3 21/23] serial: omap: remove unnecessary header and add a missing one Felipe Balbi
2012-08-23 10:33   ` Felipe Balbi
2012-08-23 10:33   ` Felipe Balbi
2012-08-23 10:33 ` [PATCH v3 22/23] serial: omap: move uart_omap_port definition to C file Felipe Balbi
2012-08-23 10:33   ` Felipe Balbi
2012-08-23 10:33   ` Felipe Balbi
2012-08-24 19:08   ` Tony Lindgren
2012-08-24 19:08     ` Tony Lindgren
2012-08-24 19:08     ` Tony Lindgren
2012-08-23 10:33 ` Felipe Balbi [this message]
2012-08-23 10:33   ` [PATCH v3 23/23] serial: omap: enable RX and TX FIFO usage Felipe Balbi
2012-08-23 10:33   ` Felipe Balbi
2012-08-24 10:40 ` [PATCH v3 00/23] OMAP UART patches Felipe Balbi
2012-08-24 10:40   ` Felipe Balbi
2012-08-24 10:40   ` Felipe Balbi
2012-09-04 11:45   ` Felipe Balbi
2012-09-04 11:45     ` Felipe Balbi
2012-09-04 11:45     ` Felipe Balbi
2012-09-05 20:18     ` Greg KH
2012-09-05 20:18       ` Greg KH
2012-09-05 20:18       ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1345717983-18179-24-git-send-email-balbi@ti.com \
    --to=balbi@ti.com \
    --cc=alan@linux.intel.com \
    --cc=khilman@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=santosh.shilimkar@ti.com \
    --cc=shubhrajyoti@ti.com \
    --cc=sourav.poddar@ti.com \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.