You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
--- a/arch/arm/mach-ixp4xx/pronghorn-setup.c
|
|
+++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c
|
|
@@ -52,31 +52,31 @@ static struct platform_device pronghorn_
|
|
|
|
static struct resource pronghorn_uart_resources [] = {
|
|
{
|
|
- .start = IXP4XX_UART1_BASE_PHYS,
|
|
- .end = IXP4XX_UART1_BASE_PHYS + 0x0fff,
|
|
+ .start = IXP4XX_UART2_BASE_PHYS,
|
|
+ .end = IXP4XX_UART2_BASE_PHYS + 0x0fff,
|
|
.flags = IORESOURCE_MEM
|
|
},
|
|
{
|
|
- .start = IXP4XX_UART2_BASE_PHYS,
|
|
- .end = IXP4XX_UART2_BASE_PHYS + 0x0fff,
|
|
+ .start = IXP4XX_UART1_BASE_PHYS,
|
|
+ .end = IXP4XX_UART1_BASE_PHYS + 0x0fff,
|
|
.flags = IORESOURCE_MEM
|
|
}
|
|
};
|
|
|
|
static struct plat_serial8250_port pronghorn_uart_data[] = {
|
|
{
|
|
- .mapbase = IXP4XX_UART1_BASE_PHYS,
|
|
- .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
|
|
- .irq = IRQ_IXP4XX_UART1,
|
|
+ .mapbase = IXP4XX_UART2_BASE_PHYS,
|
|
+ .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
|
|
+ .irq = IRQ_IXP4XX_UART2,
|
|
.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
|
.iotype = UPIO_MEM,
|
|
.regshift = 2,
|
|
.uartclk = IXP4XX_UART_XTAL,
|
|
},
|
|
{
|
|
- .mapbase = IXP4XX_UART2_BASE_PHYS,
|
|
- .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
|
|
- .irq = IRQ_IXP4XX_UART2,
|
|
+ .mapbase = IXP4XX_UART1_BASE_PHYS,
|
|
+ .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
|
|
+ .irq = IRQ_IXP4XX_UART1,
|
|
.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
|
|
.iotype = UPIO_MEM,
|
|
.regshift = 2,
|