target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch

   1 --- a/arch/arm/mach-ixp4xx/pronghorn-setup.c
   2 +++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c
   3 @@ -51,31 +51,31 @@
   4
   5  static struct resource pronghorn_uart_resources [] = {
   6         {
   7 -               .start          = IXP4XX_UART1_BASE_PHYS,
   8 -               .end            = IXP4XX_UART1_BASE_PHYS + 0x0fff,
   9 +               .start          = IXP4XX_UART2_BASE_PHYS,
  10 +               .end            = IXP4XX_UART2_BASE_PHYS + 0x0fff,
  11                 .flags          = IORESOURCE_MEM
  12         },
  13         {
  14 -               .start          = IXP4XX_UART2_BASE_PHYS,
  15 -               .end            = IXP4XX_UART2_BASE_PHYS + 0x0fff,
  16 +               .start          = IXP4XX_UART1_BASE_PHYS,
  17 +               .end            = IXP4XX_UART1_BASE_PHYS + 0x0fff,
  18                 .flags          = IORESOURCE_MEM
  19         }
  20  };
  21
  22  static struct plat_serial8250_port pronghorn_uart_data[] = {
  23         {
  24 -               .mapbase        = IXP4XX_UART1_BASE_PHYS,
  25 -               .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
  26 -               .irq            = IRQ_IXP4XX_UART1,
  27 +               .mapbase        = IXP4XX_UART2_BASE_PHYS,
  28 +               .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
  29 +               .irq            = IRQ_IXP4XX_UART2,
  30                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
  31                 .iotype         = UPIO_MEM,
  32                 .regshift       = 2,
  33                 .uartclk        = IXP4XX_UART_XTAL,
  34         },
  35         {
  36 -               .mapbase        = IXP4XX_UART2_BASE_PHYS,
  37 -               .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
  38 -               .irq            = IRQ_IXP4XX_UART2,
  39 +               .mapbase        = IXP4XX_UART1_BASE_PHYS,
  40 +               .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
  41 +               .irq            = IRQ_IXP4XX_UART1,
  42                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
  43                 .iotype         = UPIO_MEM,
  44                 .regshift       = 2,