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

Commit bcaafbe4 authored by Stefan Sorensen's avatar Stefan Sorensen Committed by Russell King
Browse files

[PATCH] ARM: 2790/1: Properly terminate plat_serial8250_port arrays on ixdp425 and 


	coyote

Patch from Stefan Sorensen

On the ixdp425 and coyote platforms, the plat_serial8250_port arrays are
missing the terminating entry required by serial8250_probe.

Signed-off-by: default avatarStefan Sorensen <ssoe@kirktelecom.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d1d890ed

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

+15 −12
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ static struct resource coyote_uart_resource = { 
	.flags	= IORESOURCE_MEM,

};



static struct plat_serial8250_port coyote_uart_data = {

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,
@@ -64,13 +65,15 @@ static struct plat_serial8250_port coyote_uart_data = { 
		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= IXP4XX_UART_XTAL,

	},

	{ },

};



static struct platform_device coyote_uart = {

	.name		= "serial8250",

	.id		= 0,

	.dev			= {

		.platform_data	= &coyote_uart_data,

		.platform_data	= coyote_uart_data,

	},

	.num_resources	= 1,

	.resource	= &coyote_uart_resource,
@@ -87,10 +90,10 @@ static void __init coyote_init(void) 
	*IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;



	if (machine_is_ixdpg425()) {

		coyote_uart_data.membase =

		coyote_uart_data[0].membase =

			(char*)(IXP4XX_UART1_BASE_VIRT + REG_OFFSET);

		coyote_uart_data.mapbase = IXP4XX_UART1_BASE_PHYS;

		coyote_uart_data.irq = IRQ_IXP4XX_UART1;

		coyote_uart_data[0].mapbase = IXP4XX_UART1_BASE_PHYS;

		coyote_uart_data[0].irq = IRQ_IXP4XX_UART1;

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { 
		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= IXP4XX_UART_XTAL,

	}

	},

	{ },

};



static struct platform_device ixdp425_uart = {