111-pronghorn_swap_uarts.patch 1.4 KB

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