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

[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
...@@ -56,21 +56,24 @@ static struct resource coyote_uart_resource = { ...@@ -56,21 +56,24 @@ static struct resource coyote_uart_resource = {
.flags = IORESOURCE_MEM, .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, .mapbase = IXP4XX_UART2_BASE_PHYS,
.irq = IRQ_IXP4XX_UART2, .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
.flags = UPF_BOOT_AUTOCONF, .irq = IRQ_IXP4XX_UART2,
.iotype = UPIO_MEM, .flags = UPF_BOOT_AUTOCONF,
.regshift = 2, .iotype = UPIO_MEM,
.uartclk = IXP4XX_UART_XTAL, .regshift = 2,
.uartclk = IXP4XX_UART_XTAL,
},
{ },
}; };
static struct platform_device coyote_uart = { static struct platform_device coyote_uart = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = &coyote_uart_data, .platform_data = coyote_uart_data,
}, },
.num_resources = 1, .num_resources = 1,
.resource = &coyote_uart_resource, .resource = &coyote_uart_resource,
...@@ -87,10 +90,10 @@ static void __init coyote_init(void) ...@@ -87,10 +90,10 @@ static void __init coyote_init(void)
*IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
if (machine_is_ixdpg425()) { if (machine_is_ixdpg425()) {
coyote_uart_data.membase = coyote_uart_data[0].membase =
(char*)(IXP4XX_UART1_BASE_VIRT + REG_OFFSET); (char*)(IXP4XX_UART1_BASE_VIRT + REG_OFFSET);
coyote_uart_data.mapbase = IXP4XX_UART1_BASE_PHYS; coyote_uart_data[0].mapbase = IXP4XX_UART1_BASE_PHYS;
coyote_uart_data.irq = IRQ_IXP4XX_UART1; coyote_uart_data[0].irq = IRQ_IXP4XX_UART1;
} }
......
...@@ -95,7 +95,8 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { ...@@ -95,7 +95,8 @@ static struct plat_serial8250_port ixdp425_uart_data[] = {
.iotype = UPIO_MEM, .iotype = UPIO_MEM,
.regshift = 2, .regshift = 2,
.uartclk = IXP4XX_UART_XTAL, .uartclk = IXP4XX_UART_XTAL,
} },
{ },
}; };
static struct platform_device ixdp425_uart = { static struct platform_device ixdp425_uart = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment