* [PATCH v3] tty: serial: msm_serial: code cleanup in msm_console_setup
@ 2015-01-12 13:45 Pramod Gurav
2015-01-13 0:24 ` Stephen Boyd
0 siblings, 1 reply; 2+ messages in thread
From: Pramod Gurav @ 2015-01-12 13:45 UTC (permalink / raw)
To: Stephen Boyd
Cc: David Brown, Daniel Walker, Bryan Huntsman, Greg Kroah-Hartman,
Jiri Slaby, linux-arm-msm, linux-serial, linux-kernel,
Pramod Gurav
The change does following:
- baud, flow, bits, parity were being overwritten as they were
being reinitialized after parsing. Initialize them when they are
declared so that user provided setting are not overwritten.
- msm_set_baud_rate() is anyway called in uart_set_options when it calls
msm_set_termios(). msm_reset() is called when we change the baud rate.
Hence doing away with both of these calls.
- CR_CMD_PROTECTION_EN and CR_TX_ENABLE settings are done in msm_set_baud_rate.
So do away with this here.
Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com>
---
Changes since v2:
- initialize baud, flow, bits, parity when they are declared.
- undo msm_init_clock removal as suggested by Stephen.
- Remove unused variable msm_port
Tested on IFC6410.
drivers/tty/serial/msm_serial.c | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index c88b522..a0cc6e0 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -920,14 +920,15 @@ static void msm_console_write(struct console *co, const char *s,
static int __init msm_console_setup(struct console *co, char *options)
{
struct uart_port *port;
- struct msm_port *msm_port;
- int baud = 0, flow, bits, parity;
+ int baud = 115200;
+ int bits = 8;
+ int parity = 'n';
+ int flow = 'n';
if (unlikely(co->index >= UART_NR || co->index < 0))
return -ENXIO;
port = get_port_from_line(co->index);
- msm_port = UART_TO_MSM(port);
if (unlikely(!port->membase))
return -ENXIO;
@@ -937,23 +938,6 @@ static int __init msm_console_setup(struct console *co, char *options)
if (options)
uart_parse_options(options, &baud, &parity, &bits, &flow);
- bits = 8;
- parity = 'n';
- flow = 'n';
- msm_write(port, UART_MR2_BITS_PER_CHAR_8 | UART_MR2_STOP_BIT_LEN_ONE,
- UART_MR2); /* 8N1 */
-
- if (baud < 300 || baud > 115200)
- baud = 115200;
- msm_set_baud_rate(port, baud);
-
- msm_reset(port);
-
- if (msm_port->is_uartdm) {
- msm_write(port, UART_CR_CMD_PROTECTION_EN, UART_CR);
- msm_write(port, UART_CR_TX_ENABLE, UART_CR);
- }
-
pr_info("msm_serial: console setup on port #%d\n", port->line);
return uart_set_options(port, co, baud, parity, bits, flow);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] tty: serial: msm_serial: code cleanup in msm_console_setup
2015-01-12 13:45 [PATCH v3] tty: serial: msm_serial: code cleanup in msm_console_setup Pramod Gurav
@ 2015-01-13 0:24 ` Stephen Boyd
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Boyd @ 2015-01-13 0:24 UTC (permalink / raw)
To: Pramod Gurav
Cc: David Brown, Daniel Walker, Bryan Huntsman, Greg Kroah-Hartman,
Jiri Slaby, linux-arm-msm, linux-serial, linux-kernel
On 01/12/2015 05:45 AM, Pramod Gurav wrote:
> The change does following:
> - baud, flow, bits, parity were being overwritten as they were
> being reinitialized after parsing. Initialize them when they are
> declared so that user provided setting are not overwritten.
> - msm_set_baud_rate() is anyway called in uart_set_options when it calls
> msm_set_termios(). msm_reset() is called when we change the baud rate.
> Hence doing away with both of these calls.
> - CR_CMD_PROTECTION_EN and CR_TX_ENABLE settings are done in msm_set_baud_rate.
> So do away with this here.
>
> Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com>
>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-13 0:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-12 13:45 [PATCH v3] tty: serial: msm_serial: code cleanup in msm_console_setup Pramod Gurav
2015-01-13 0:24 ` Stephen Boyd
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.