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

Commit 8c741ed7 authored by Deepak Saxena's avatar Deepak Saxena Committed by Russell King
Browse files

[PATCH] ARM: 2835/1: Add UPF_SKIP_TEST to IXP4xx serial ports 



Patch from Deepak Saxena

This allows the serial driver autconf to work properly on all the IXP
serial ports. W/o it we basically put the serial port in an unrecoverable
state and lose console.

Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7b1fbf29

arch/arm/mach-ixp4xx/coyote-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static struct plat_serial8250_port coyote_uart_data[] = { 
		.mapbase	= IXP4XX_UART2_BASE_PHYS,

		.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,

		.irq		= IRQ_IXP4XX_UART2,

		.flags		= UPF_BOOT_AUTOCONF,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= IXP4XX_UART_XTAL,

arch/arm/mach-ixp4xx/gtwx5715-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static struct plat_serial8250_port gtwx5715_uart_platform_data[] = { 
	.mapbase	= IXP4XX_UART2_BASE_PHYS,

	.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,

	.irq		= IRQ_IXP4XX_UART2,

	.flags		= UPF_BOOT_AUTOCONF,

	.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

	.iotype		= UPIO_MEM,

	.regshift	= 2,

	.uartclk	= IXP4XX_UART_XTAL,

arch/arm/mach-ixp4xx/ixdp425-setup.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { 
		.mapbase	= IXP4XX_UART1_BASE_PHYS,

		.membase	= (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,

		.irq		= IRQ_IXP4XX_UART1,

		.flags		= UPF_BOOT_AUTOCONF,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= IXP4XX_UART_XTAL,
@@ -91,7 +91,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { 
		.mapbase	= IXP4XX_UART2_BASE_PHYS,

		.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,

		.irq		= IRQ_IXP4XX_UART1,

		.flags		= UPF_BOOT_AUTOCONF,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= IXP4XX_UART_XTAL,