From: "Govindraj.R" <govindraj.raja@ti.com>
To: linux-omap@vger.kernel.org
Cc: linux-serial@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Kevin Hilman <khilman@ti.com>, Tony Lindgren <tony@atomide.com>,
Partha Basak <p-basak2@ti.com>,
Vishwanath Sripathy <vishwanath.bs@ti.com>,
Rajendra Nayak <rnayak@ti.com>,
Santosh Shilimkar <santosh.shilimkar@ti.com>,
Govindraj R <govindraj.raja@ti.com>
Subject: [PATCH v8 09/20] OMAP2+: UART: Remove uart reset function.
Date: Fri, 11 Nov 2011 15:27:26 +0530 [thread overview]
Message-ID: <1321005446-21741-10-git-send-email-govindraj.raja@ti.com> (raw)
In-Reply-To: <1321005446-21741-1-git-send-email-govindraj.raja@ti.com>
Remove the uart reset function which is configuring the
TX empty irq which can now be handled within omap-serial driver.
Signed-off-by: Govindraj.R <govindraj.raja@ti.com>
---
arch/arm/mach-omap2/serial.c | 14 --------------
arch/arm/plat-omap/include/plat/omap-serial.h | 2 ++
drivers/tty/serial/omap-serial.c | 1 +
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 3d5df9a..06887d3 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -74,19 +74,6 @@ struct omap_uart_state {
static LIST_HEAD(uart_list);
static u8 num_uarts;
-/*
- * Internal UARTs need to be initialized for the 8250 autoconfig to work
- * properly. Note that the TX watermark initialization may not be needed
- * once the 8250.c watermark handling code is merged.
- */
-
-static inline void __init omap_uart_reset(struct omap_uart_state *uart)
-{
- serial_write_reg(uart, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE);
- serial_write_reg(uart, UART_OMAP_SCR, 0x08);
- serial_write_reg(uart, UART_OMAP_MDR1, UART_OMAP_MDR1_16X_MODE);
-}
-
#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3)
/*
@@ -521,7 +508,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata)
omap_device_enable(uart->pdev);
omap_uart_idle_init(uart);
- omap_uart_reset(uart);
omap_hwmod_enable_wakeup(uart->oh);
omap_device_idle(uart->pdev);
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
index 70e7738..5b913c7 100644
--- a/arch/arm/plat-omap/include/plat/omap-serial.h
+++ b/arch/arm/plat-omap/include/plat/omap-serial.h
@@ -33,6 +33,8 @@
#define OMAP_MODE13X_SPEED 230400
+#define OMAP_UART_SCR_TX_EMPTY 0x08
+
/* WER = 0x7F
* Enable module level wakeup in WER reg
*/
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 5327ff0..f5a5ed6 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -770,6 +770,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
serial_out(up, UART_IER, up->ier);
serial_out(up, UART_LCR, cval); /* reset DLAB */
up->lcr = cval;
+ up->scr = OMAP_UART_SCR_TX_EMPTY;
/* FIFOs and DMA Settings */
--
1.7.4.1
next prev parent reply other threads:[~2011-11-11 9:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-11 9:57 [PATCH v8 00/20] OMAP2+: UART: Runtime adaptation + cleanup Govindraj.R
2011-11-11 9:57 ` [PATCH v8 01/20] OMAP2+: UART: cleanup + remove uart pm specific API Govindraj.R
2011-11-11 9:57 ` [PATCH v8 02/20] OMAP2+: UART: cleanup 8250 console driver support Govindraj.R
2011-11-11 9:57 ` [PATCH v8 03/20] OMAP2+: UART: Cleanup part of clock gating mechanism for uart Govindraj.R
2011-11-11 9:57 ` [PATCH v8 04/20] OMAP2+: UART: Add default mux for all uarts Govindraj.R
2011-11-11 9:57 ` [PATCH v8 05/20] OMAP2+: UART: Remove mapbase/membase fields from pdata Govindraj.R
2011-11-11 9:57 ` [PATCH v8 06/20] OMAP2+: UART: Add runtime pm support for omap-serial driver Govindraj.R
2011-11-11 9:57 ` [PATCH v8 07/20] OMAP2+: UART: Remove context_save and move context restore to driver Govindraj.R
2011-11-11 9:57 ` [PATCH v8 08/20] OMAP2+: UART: Ensure all reg values configured are available from port structure Govindraj.R
2011-11-11 9:57 ` Govindraj.R [this message]
2011-12-07 0:21 ` [PATCH v8 00/20] OMAP2+: UART: Runtime adaptation + cleanup Kevin Hilman
2011-12-07 0:46 ` Alan Cox
2011-12-13 14:15 ` Rajendra Nayak
2011-12-13 17:35 ` Kevin Hilman
2011-12-13 13:01 ` Govindraj
2011-12-13 19:26 ` Kevin Hilman
2011-12-14 8:46 ` Govindraj
2011-12-14 15:29 ` Kevin Hilman
2011-12-14 16:20 ` Govindraj
2011-12-14 18:56 ` Kevin Hilman
2011-12-13 23:32 ` Kevin Hilman
2011-12-14 9:21 ` Govindraj
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=1321005446-21741-10-git-send-email-govindraj.raja@ti.com \
--to=govindraj.raja@ti.com \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=p-basak2@ti.com \
--cc=rnayak@ti.com \
--cc=santosh.shilimkar@ti.com \
--cc=tony@atomide.com \
--cc=vishwanath.bs@ti.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).