diff options
| author | Deepak Saxena <dsaxena@plexity.net> | 2005-08-03 14:58:21 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-08-03 14:58:21 -0400 |
| commit | 8c741ed74d121dbc97c9fb7f9a66c768d4c547c4 (patch) | |
| tree | f76456dabc65f20688993ae9fe4dc99354228432 | |
| parent | 7b1fbf292bb4c855ddae8add8c459e94684f7543 (diff) | |
[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: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-ixp4xx/coyote-setup.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ixp4xx/gtwx5715-setup.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c index 4ff4393ef0ea..7f58afb27e71 100644 --- a/arch/arm/mach-ixp4xx/coyote-setup.c +++ b/arch/arm/mach-ixp4xx/coyote-setup.c | |||
| @@ -61,7 +61,7 @@ static struct plat_serial8250_port coyote_uart_data[] = { | |||
| 61 | .mapbase = IXP4XX_UART2_BASE_PHYS, | 61 | .mapbase = IXP4XX_UART2_BASE_PHYS, |
| 62 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, | 62 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, |
| 63 | .irq = IRQ_IXP4XX_UART2, | 63 | .irq = IRQ_IXP4XX_UART2, |
| 64 | .flags = UPF_BOOT_AUTOCONF, | 64 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, |
| 65 | .iotype = UPIO_MEM, | 65 | .iotype = UPIO_MEM, |
| 66 | .regshift = 2, | 66 | .regshift = 2, |
| 67 | .uartclk = IXP4XX_UART_XTAL, | 67 | .uartclk = IXP4XX_UART_XTAL, |
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c index 8ba1cd9406e7..65e356bd10d6 100644 --- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c +++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c | |||
| @@ -83,7 +83,7 @@ static struct plat_serial8250_port gtwx5715_uart_platform_data[] = { | |||
| 83 | .mapbase = IXP4XX_UART2_BASE_PHYS, | 83 | .mapbase = IXP4XX_UART2_BASE_PHYS, |
| 84 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, | 84 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, |
| 85 | .irq = IRQ_IXP4XX_UART2, | 85 | .irq = IRQ_IXP4XX_UART2, |
| 86 | .flags = UPF_BOOT_AUTOCONF, | 86 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, |
| 87 | .iotype = UPIO_MEM, | 87 | .iotype = UPIO_MEM, |
| 88 | .regshift = 2, | 88 | .regshift = 2, |
| 89 | .uartclk = IXP4XX_UART_XTAL, | 89 | .uartclk = IXP4XX_UART_XTAL, |
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index c2ba759e9946..4633470a6a37 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
| @@ -82,7 +82,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { | |||
| 82 | .mapbase = IXP4XX_UART1_BASE_PHYS, | 82 | .mapbase = IXP4XX_UART1_BASE_PHYS, |
| 83 | .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, | 83 | .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, |
| 84 | .irq = IRQ_IXP4XX_UART1, | 84 | .irq = IRQ_IXP4XX_UART1, |
| 85 | .flags = UPF_BOOT_AUTOCONF, | 85 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, |
| 86 | .iotype = UPIO_MEM, | 86 | .iotype = UPIO_MEM, |
| 87 | .regshift = 2, | 87 | .regshift = 2, |
| 88 | .uartclk = IXP4XX_UART_XTAL, | 88 | .uartclk = IXP4XX_UART_XTAL, |
| @@ -91,7 +91,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { | |||
| 91 | .mapbase = IXP4XX_UART2_BASE_PHYS, | 91 | .mapbase = IXP4XX_UART2_BASE_PHYS, |
| 92 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, | 92 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, |
| 93 | .irq = IRQ_IXP4XX_UART1, | 93 | .irq = IRQ_IXP4XX_UART1, |
| 94 | .flags = UPF_BOOT_AUTOCONF, | 94 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, |
| 95 | .iotype = UPIO_MEM, | 95 | .iotype = UPIO_MEM, |
| 96 | .regshift = 2, | 96 | .regshift = 2, |
| 97 | .uartclk = IXP4XX_UART_XTAL, | 97 | .uartclk = IXP4XX_UART_XTAL, |