Commit 59a675b2 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[SERIAL] uart_port flags member should use UPF_*



Convert usage of ASYNC_* to UPF_*.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9b4a1617
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ void __init plat_setup(void)
		uart.type	= PORT_UNKNOWN;
		uart.uartclk	= 18432000;
		uart.irq	= COBALT_SERIAL_IRQ;
		uart.flags	= STD_COM_FLAGS;
		uart.flags	= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
		uart.iobase	= 0xc800000;
		uart.iotype	= UPIO_PORT;

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ void __init serial_init(void)

	memset(&s, 0, sizeof(s));

	s.flags = STD_COM_FLAGS;
	s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
	s.iotype = UPIO_MEM;

	if (mips_machtype == MACH_LASAT_100) {
+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void __init serial_init(void)
#endif
	s.irq = ATLASINT_UART;
	s.uartclk = ATLAS_BASE_BAUD * 16;
	s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
	s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
	s.iotype = UPIO_PORT;
	s.regshift = 3;

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static void __init serial_init(void)
#endif
	s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0;
	s.uartclk = SEAD_BASE_BAUD * 16;
	s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
	s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
	s.iotype = UPIO_PORT;
	s.regshift = 3;

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static void __init serial_init(void)
	 but poll for now */
	s.irq =  0;
	s.uartclk = BASE_BAUD * 16;
	s.flags = ASYNC_BOOT_AUTOCONF | UPF_SKIP_TEST;
	s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
	s.iotype = UPIO_PORT;
	s.regshift = 0;
	s.timeout = 4;
Loading