Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b4a1617 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[SERIAL] uart_port iotype member should use UPIO_* 



Convert usage of SERIAL_IO_* to UPIO_*.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 53ea68ec

arch/mips/lasat/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -135,7 +135,7 @@ void __init serial_init(void) 
	memset(&s, 0, sizeof(s));

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





	s.flags = STD_COM_FLAGS;

	s.flags = STD_COM_FLAGS;

	s.iotype = SERIAL_IO_MEM;

	s.iotype = UPIO_MEM;





	if (mips_machtype == MACH_LASAT_100) {

	if (mips_machtype == MACH_LASAT_100) {

		s.uartclk = LASAT_BASE_BAUD_100 * 16;

		s.uartclk = LASAT_BASE_BAUD_100 * 16;

arch/mips/mips-boards/atlas/atlas_setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ static void __init serial_init(void) 
	s.irq = ATLASINT_UART;

	s.irq = ATLASINT_UART;

	s.uartclk = ATLAS_BASE_BAUD * 16;

	s.uartclk = ATLAS_BASE_BAUD * 16;

	s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;

	s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;

	s.iotype = SERIAL_IO_PORT;

	s.iotype = UPIO_PORT;

	s.regshift = 3;

	s.regshift = 3;





	if (early_serial_setup(&s) != 0) {

	if (early_serial_setup(&s) != 0) {

arch/mips/mips-boards/sead/sead_setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ static void __init serial_init(void) 
	s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0;

	s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0;

	s.uartclk = SEAD_BASE_BAUD * 16;

	s.uartclk = SEAD_BASE_BAUD * 16;

	s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;

	s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;

	s.iotype = 0;

	s.iotype = UPIO_PORT;

	s.regshift = 3;

	s.regshift = 3;





	if (early_serial_setup(&s) != 0) {

	if (early_serial_setup(&s) != 0) {

arch/mips/mips-boards/sim/sim_setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ static void __init serial_init(void) 
	s.irq =  0;

	s.irq =  0;

	s.uartclk = BASE_BAUD * 16;

	s.uartclk = BASE_BAUD * 16;

	s.flags = ASYNC_BOOT_AUTOCONF | UPF_SKIP_TEST;

	s.flags = ASYNC_BOOT_AUTOCONF | UPF_SKIP_TEST;

	s.iotype = SERIAL_IO_PORT | ASYNC_SKIP_TEST;

	s.iotype = UPIO_PORT;

	s.regshift = 0;

	s.regshift = 0;

	s.timeout = 4;

	s.timeout = 4;

arch/mips/philips/pnx8550/common/platform.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ struct ip3106_port ip3106_ports[] = { 
	[0] = {

	[0] = {

		.port   = {

		.port   = {

			.type		= PORT_IP3106,

			.type		= PORT_IP3106,

			.iotype		= SERIAL_IO_MEM,

			.iotype		= UPIO_MEM,

			.membase	= (void __iomem *)PNX8550_UART_PORT0,

			.membase	= (void __iomem *)PNX8550_UART_PORT0,

			.mapbase	= PNX8550_UART_PORT0,

			.mapbase	= PNX8550_UART_PORT0,

			.irq		= PNX8550_UART_INT(0),

			.irq		= PNX8550_UART_INT(0),
@@ -80,7 +80,7 @@ struct ip3106_port ip3106_ports[] = { 
	[1] = {

	[1] = {

		.port   = {

		.port   = {

			.type		= PORT_IP3106,

			.type		= PORT_IP3106,

			.iotype		= SERIAL_IO_MEM,

			.iotype		= UPIO_MEM,

			.membase	= (void __iomem *)PNX8550_UART_PORT1,

			.membase	= (void __iomem *)PNX8550_UART_PORT1,

			.mapbase	= PNX8550_UART_PORT1,

			.mapbase	= PNX8550_UART_PORT1,

			.irq		= PNX8550_UART_INT(1),

			.irq		= PNX8550_UART_INT(1),