[adm5120] resync 2.6.28 config

[openwrt.git] / target / linux / ixp4xx / patches-2.6.27 / 191-cambria_optional_uart.patch

diff --git a/target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch
index 3a034f0..946d685 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch
+++ b/target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch
@@ -1,14 +1,14 @@
 --- a/arch/arm/mach-ixp4xx/cambria-setup.c
 +++ b/arch/arm/mach-ixp4xx/cambria-setup.c
-@@ -36,6 +36,7 @@
- #include <asm/mach-types.h>
+@@ -34,6 +34,7 @@
  #include <asm/mach/arch.h>
  #include <asm/mach/flash.h>
+ #include <asm/setup.h>
 +#include <linux/irq.h>
  
  struct cambria_board_info {
        unsigned char   *model;
-@@ -105,6 +106,43 @@
+@@ -127,6 +128,43 @@ static struct platform_device cambria_ua
        .resource       = &cambria_uart_resource,
  };
  
@@ -52,38 +52,44 @@
  static struct resource cambria_pata_resources[] = {
        {
                .flags  = IORESOURCE_MEM
-@@ -287,6 +325,19 @@
- #ifdef CONFIG_SENSORS_EEPROM
+@@ -283,6 +321,19 @@ static void __init cambria_gw23xx_setup(
+ 
  static void __init cambria_gw2350_setup(void)
  {
 +      *IXP4XX_EXP_CS2 = 0xbfff0003;
-+      set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_BOTH);
-+      cambria_optional_uart_data[0].mapbase   = IXP4XX_EXP_BUS_BASE(2);
-+      cambria_optional_uart_data[0].membase   = (void __iomem *)ioremap(IXP4XX_EXP_BUS_BASE(2), 0x0fff);
++      set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING);
++      cambria_optional_uart_data[0].mapbase   = 0x52FF0000;
++      cambria_optional_uart_data[0].membase   = (void __iomem *)ioremap(0x52FF0000, 0x0fff);
 +      cambria_optional_uart_data[0].irq               = IRQ_IXP4XX_GPIO3;
 +
 +      *IXP4XX_EXP_CS3 = 0xbfff0003;
-+      set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_BOTH);
-+      cambria_optional_uart_data[1].mapbase   = IXP4XX_EXP_BUS_BASE(3);
-+      cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(IXP4XX_EXP_BUS_BASE(3), 0x0fff);
++      set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_RISING);
++      cambria_optional_uart_data[1].mapbase   = 0x53FF0000;
++      cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(0x53FF0000, 0x0fff);
 +      cambria_optional_uart_data[1].irq               = IRQ_IXP4XX_GPIO4;
 +
 +      platform_device_register(&cambria_optional_uart);
        platform_device_register(&cambria_npec_device);
        platform_device_register(&cambria_npea_device);
  
-@@ -298,6 +349,20 @@
+@@ -290,10 +341,26 @@ static void __init cambria_gw2350_setup(
+       platform_device_register(&cambria_usb1_device);
+ 
+       platform_device_register(&cambria_gpio_leds_device);
++
++      *IXP4XX_EXP_CS2 = 0xBFFF3C43;
++      *IXP4XX_EXP_CS3 = 0xBFFF3C43;
+ }
  
  static void __init cambria_gw2358_setup(void)
  {
 +      *IXP4XX_EXP_CS3 = 0xbfff0003;
-+      set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_BOTH);
++      set_irq_type(IRQ_IXP4XX_GPIO3, IRQ_TYPE_EDGE_RISING);
 +      cambria_optional_uart_data[0].mapbase   = 0x53FC0000;
 +      cambria_optional_uart_data[0].membase   = (void __iomem *)ioremap(0x53FC0000, 0x0fff);
 +      cambria_optional_uart_data[0].irq               = IRQ_IXP4XX_GPIO3;
 +
-+      *IXP4XX_EXP_CS3 = 0xbfff0003;
-+      set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_BOTH);
++      set_irq_type(IRQ_IXP4XX_GPIO4, IRQ_TYPE_EDGE_RISING);
 +      cambria_optional_uart_data[1].mapbase   = 0x53F80000;
 +      cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(0x53F80000, 0x0fff);
 +      cambria_optional_uart_data[1].irq               = IRQ_IXP4XX_GPIO4;