Commit 498cb951 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Tony Lindgren
Browse files

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: default avatarAndrei Emeltchenko <andrei.emeltchenko@nokia.com>
Acked-by: default avatarG, Manjunath Kondaiah <manjugk@ti.com>
Acked-by: default avatarGovindraj.R <govindraj.raja@ti.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e8a7e48b

arch/arm/mach-omap1/serial.c

+4 −2
Original line number Diff line number Diff line
@@ -52,9 +52,11 @@ static inline void omap_serial_outp(struct plat_serial8250_port *p, int offset, 
 */

static void __init omap_serial_reset(struct plat_serial8250_port *p)

{

	omap_serial_outp(p, UART_OMAP_MDR1, 0x07);	/* disable UART */

	omap_serial_outp(p, UART_OMAP_MDR1,

			UART_OMAP_MDR1_DISABLE);	/* disable UART */

	omap_serial_outp(p, UART_OMAP_SCR, 0x08);	/* TX watermark */

	omap_serial_outp(p, UART_OMAP_MDR1, 0x00);	/* enable UART */

	omap_serial_outp(p, UART_OMAP_MDR1,

			UART_OMAP_MDR1_16X_MODE);	/* enable UART */



	if (!cpu_is_omap15xx()) {

		omap_serial_outp(p, UART_OMAP_SYSC, 0x01);

arch/arm/mach-omap2/serial.c

+9 −6
Original line number Diff line number Diff line
@@ -169,9 +169,9 @@ static inline void serial_write_reg(struct omap_uart_state *uart, int offset, 


static inline void __init omap_uart_reset(struct omap_uart_state *uart)

{

	serial_write_reg(uart, UART_OMAP_MDR1, 0x07);

	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, 0x00);

	serial_write_reg(uart, UART_OMAP_MDR1, UART_OMAP_MDR1_16X_MODE);

}



#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3)
@@ -247,9 +247,10 @@ static void omap_uart_restore_context(struct omap_uart_state *uart) 
	uart->context_valid = 0;



	if (uart->errata & UART_ERRATA_i202_MDR1_ACCESS)

		omap_uart_mdr1_errataset(uart, 0x07, 0xA0);

		omap_uart_mdr1_errataset(uart, UART_OMAP_MDR1_DISABLE, 0xA0);

	else

		serial_write_reg(uart, UART_OMAP_MDR1, 0x7);

		serial_write_reg(uart, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE);



	serial_write_reg(uart, UART_LCR, 0xBF); /* Config B mode */

	efr = serial_read_reg(uart, UART_EFR);

	serial_write_reg(uart, UART_EFR, UART_EFR_ECB);
@@ -268,11 +269,13 @@ static void omap_uart_restore_context(struct omap_uart_state *uart) 
	serial_write_reg(uart, UART_OMAP_SCR, uart->scr);

	serial_write_reg(uart, UART_OMAP_WER, uart->wer);

	serial_write_reg(uart, UART_OMAP_SYSC, uart->sysc);



	if (uart->errata & UART_ERRATA_i202_MDR1_ACCESS)

		omap_uart_mdr1_errataset(uart, 0x00, 0xA1);

		omap_uart_mdr1_errataset(uart, UART_OMAP_MDR1_16X_MODE, 0xA1);

	else

		/* UART 16x mode */

		serial_write_reg(uart, UART_OMAP_MDR1, 0x00);

		serial_write_reg(uart, UART_OMAP_MDR1,

				UART_OMAP_MDR1_16X_MODE);

}

#else

static inline void omap_uart_save_context(struct omap_uart_state *uart) {}

arch/arm/plat-omap/include/plat/omap-serial.h

+0 −3
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ 
 */

#define OMAP_SERIAL_NAME	"ttyO"



#define OMAP_MDR1_DISABLE	0x07

#define OMAP_MDR1_MODE13X	0x03

#define OMAP_MDR1_MODE16X	0x00

#define OMAP_MODE13X_SPEED	230400



/*

drivers/serial/omap-serial.c

+3 −3
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, 


	/* Protocol, Baud Rate, and Interrupt Settings */



	serial_out(up, UART_OMAP_MDR1, OMAP_MDR1_DISABLE);

	serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE);

	serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB);



	up->efr = serial_in(up, UART_EFR);
@@ -774,9 +774,9 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, 
	serial_out(up, UART_LCR, cval);



	if (baud > 230400 && baud != 3000000)

		serial_out(up, UART_OMAP_MDR1, OMAP_MDR1_MODE13X);

		serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_13X_MODE);

	else

		serial_out(up, UART_OMAP_MDR1, OMAP_MDR1_MODE16X);

		serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_16X_MODE);



	/* Hardware Flow Control Configuration */

include/linux/serial_reg.h

+12 −0
Original line number Diff line number Diff line
@@ -341,5 +341,17 @@ 
#define UART_OMAP_SYSS		0x16	/* System status register */

#define UART_OMAP_WER		0x17	/* Wake-up enable register */



/*

 * These are the definitions for the MDR1 register

 */

#define UART_OMAP_MDR1_16X_MODE		0x00	/* UART 16x mode */

#define UART_OMAP_MDR1_SIR_MODE		0x01	/* SIR mode */

#define UART_OMAP_MDR1_16X_ABAUD_MODE	0x02	/* UART 16x auto-baud */

#define UART_OMAP_MDR1_13X_MODE		0x03	/* UART 13x mode */

#define UART_OMAP_MDR1_MIR_MODE		0x04	/* MIR mode */

#define UART_OMAP_MDR1_FIR_MODE		0x05	/* FIR mode */

#define UART_OMAP_MDR1_CIR_MODE		0x06	/* CIR mode */

#define UART_OMAP_MDR1_DISABLE		0x07	/* Disable (default state) */



#endif /* _LINUX_SERIAL_REG_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE