diff options
author | Andrei Emeltchenko <andrei.emeltchenko@nokia.com> | 2010-11-30 17:11:49 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-11-30 17:11:49 -0500 |
commit | 498cb95175c29ed96bf32f30df2d11ec1c7f3879 (patch) | |
tree | f46ffac45790929c8e7f1bf2838f537bc9e31e48 /drivers/serial | |
parent | e8a7e48bb248a1196484d3f8afa53bded2b24e71 (diff) |
OMAP: Serial: Define OMAP uart MDR1 reg and remove magic numbers
Define MDR1 register serial definitions used in serial and
bluetooth drivers.
Change magic number to ones defined in serial_reg for omap1/2
serial driver.
Remove redefined MDR1 register definitions in omap-serial driver.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
Acked-by: G, Manjunath Kondaiah <manjugk@ti.com>
Acked-by: Govindraj.R <govindraj.raja@ti.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/omap-serial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/omap-serial.c b/drivers/serial/omap-serial.c index 14365f72b664..03a96db67de4 100644 --- a/drivers/serial/omap-serial.c +++ b/drivers/serial/omap-serial.c | |||
@@ -753,7 +753,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, | |||
753 | 753 | ||
754 | /* Protocol, Baud Rate, and Interrupt Settings */ | 754 | /* Protocol, Baud Rate, and Interrupt Settings */ |
755 | 755 | ||
756 | serial_out(up, UART_OMAP_MDR1, OMAP_MDR1_DISABLE); | 756 | serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE); |
757 | serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB); | 757 | serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB); |
758 | 758 | ||
759 | up->efr = serial_in(up, UART_EFR); | 759 | up->efr = serial_in(up, UART_EFR); |
@@ -774,9 +774,9 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, | |||
774 | serial_out(up, UART_LCR, cval); | 774 | serial_out(up, UART_LCR, cval); |
775 | 775 | ||
776 | if (baud > 230400 && baud != 3000000) | 776 | if (baud > 230400 && baud != 3000000) |
777 | serial_out(up, UART_OMAP_MDR1, OMAP_MDR1_MODE13X); | 777 | serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_13X_MODE); |
778 | else | 778 | else |
779 | serial_out(up, UART_OMAP_MDR1, OMAP_MDR1_MODE16X); | 779 | serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_16X_MODE); |
780 | 780 | ||
781 | /* Hardware Flow Control Configuration */ | 781 | /* Hardware Flow Control Configuration */ |
782 | 782 | ||