SERIAL 8250: Fixes for Alchemy UARTs. (b2b13cdf) · Commits · 戴 / test

Limit the amount of address space claimed for Alchemy serial ports to 0x1000. On the Au1300, ports are only 0x1000 apart, and the registers only extend to 0x110 at most on all supported alchemy models. On the Au1300 the autodetect logic no longer works and this makes it necessary to specify the port type through platform data. Because of this the MSR quirk needs to be moved outside the autoconfig() function which will no longer be called when UPF_FIXED_TYPE is specified. Signed-off-by:

Manuel Lauss <manuel.lauss@gmail.com> Cc: Andrew Morton <akpm@linux-foundation.org>, Cc: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Signed-off-by:

Ralf Baechle <ralf@linux-mips.org>

drivers/serial/8250.c

+8 −7

Original line number	Diff line number	Diff line
		@@ -1217,12 +1217,6 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
		}
		#endif

		#ifdef CONFIG_SERIAL_8250_AU1X00
		/* if access method is AU, it is a 16550 with a quirk */
		if (up->port.type == PORT_16550A && up->port.iotype == UPIO_AU)
		up->bugs \|= UART_BUG_NOMSR;
		#endif

		serial_outp(up, UART_LCR, save_lcr);

		if (up->capabilities != uart_config[up->port.type].flags) {
		@@ -2428,7 +2422,7 @@ serial8250_pm(struct uart_port *port, unsigned int state,
		static unsigned int serial8250_port_size(struct uart_8250_port *pt)
		{
		if (pt->port.iotype == UPIO_AU)
		return 0x100000;
		return 0x1000;
		#ifdef CONFIG_ARCH_OMAP
		if (is_omap_port(pt))
		return 0x16 << pt->port.regshift;
		@@ -2585,6 +2579,13 @@ static void serial8250_config_port(struct uart_port *port, int flags)

		if (flags & UART_CONFIG_TYPE)
		autoconfig(up, probeflags);

		#ifdef CONFIG_SERIAL_8250_AU1X00
		/* if access method is AU, it is a 16550 with a quirk */
		if (up->port.type == PORT_16550A && up->port.iotype == UPIO_AU)
		up->bugs \|= UART_BUG_NOMSR;
		#endif

		if (up->port.type != PORT_UNKNOWN && flags & UART_CONFIG_IRQ)
		autoconfig_irq(up);

Admin message