[kernel] update to 2.6.28.6

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

diff --git a/target/linux/ixp4xx/patches-2.6.27/192-cambria_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.27/192-cambria_gpio_device.patch
index 157e1f1..706d65e 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.27/192-cambria_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.27/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
 --- a/arch/arm/mach-ixp4xx/cambria-setup.c
 +++ b/arch/arm/mach-ixp4xx/cambria-setup.c

-@@ -214,6 +214,21 @@
+@@ -212,6 +212,20 @@ static struct platform_device cambria_gp

        .dev.platform_data = &cambria_gpio_leds_data,
  };
  
        .dev.platform_data = &cambria_gpio_leds_data,
  };
  


@@ -18,11 +18,10 @@
 +      .resource   = cambria_gpio_resources,
 +};
 +
 +      .resource   = cambria_gpio_resources,
 +};
 +

-+
- 

  static struct latch_led cambria_latch_leds[] = {
        {
  static struct latch_led cambria_latch_leds[] = {
        {

-@@ -337,6 +352,11 @@
+               .name   = "ledA",  /* green led */
+@@ -333,6 +347,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_optional_uart_data[1].membase   = (void __iomem *)ioremap(0x53FF0000, 0x0fff);
        cambria_optional_uart_data[1].irq               = IRQ_IXP4XX_GPIO4;
  


@@ -34,7 +33,7 @@
        platform_device_register(&cambria_optional_uart);
        platform_device_register(&cambria_npec_device);
        platform_device_register(&cambria_npea_device);
        platform_device_register(&cambria_optional_uart);
        platform_device_register(&cambria_npec_device);
        platform_device_register(&cambria_npea_device);

-@@ -363,6 +383,10 @@
+@@ -359,6 +378,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;
  
        cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(0x53F80000, 0x0fff);
        cambria_optional_uart_data[1].irq               = IRQ_IXP4XX_GPIO4;