[adm5120] resync 2.6.28 config

[openwrt.git] / target / linux / ixp4xx / patches-2.6.26 / 192-cambria_gpio_device.patch

diff --git a/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
index c79a03f..a9ade59 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/cambria-setup.c
 +++ b/arch/arm/mach-ixp4xx/cambria-setup.c
-@@ -214,6 +214,21 @@
+@@ -214,6 +214,21 @@ static struct platform_device cambria_gp
        .dev.platform_data = &cambria_gpio_leds_data,
  };
  
@@ -22,8 +22,8 @@
  
  static struct latch_led cambria_latch_leds[] = {
        {
-@@ -337,6 +352,11 @@
-       cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(IXP4XX_EXP_BUS_BASE(3), 0x0fff);
+@@ -337,6 +352,11 @@ static void __init cambria_gw2350_setup(
+       cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(0x53FF0000, 0x0fff);
        cambria_optional_uart_data[1].irq               = IRQ_IXP4XX_GPIO4;
  
 +      cambria_gpio_resources[0].start = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) |\
@@ -34,7 +34,7 @@
        platform_device_register(&cambria_optional_uart);
        platform_device_register(&cambria_npec_device);
        platform_device_register(&cambria_npea_device);
-@@ -361,6 +381,10 @@
+@@ -363,6 +383,10 @@ static void __init cambria_gw2358_setup(
        cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(0x53F80000, 0x0fff);
        cambria_optional_uart_data[1].irq               = IRQ_IXP4XX_GPIO4;
  
@@ -44,4 +44,4 @@
 +      platform_device_register(&cambria_gpio);
        platform_device_register(&cambria_optional_uart);
  
-       cambria_npec_data.phy = 2;
+       platform_device_register(&cambria_npec_device);