on IXP46x we can have up to 3 npe ethernet interfaces, so set the mac for the third...

[openwrt.git] / target / linux / ixp4xx / patches-2.6.25 / 302-avila_gpio_device.patch

diff --git a/target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch
index faa08be..53b8b63 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/302-avila_gpio_device.patch
@@ -1,15 +1,13 @@
-Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
-===================================================================
---- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
-@@ -192,6 +192,24 @@ static struct platform_device avila_leds
+--- a/arch/arm/mach-ixp4xx/avila-setup.c
++++ b/arch/arm/mach-ixp4xx/avila-setup.c
+@@ -239,10 +239,28 @@
+       .dev.platform_data      = &avila_latch_leds_data,
  };
- #endif
  
-+#ifdef CONFIG_GPIO_DEVICE
 +static struct resource avila_gpio_resources[] = {
 +      {
 +              .name   = "gpio",
++              /* FIXME: gpio mask should be model specific */
 +              .start  = AVILA_GPIO_MASK,
 +              .end    = AVILA_GPIO_MASK,
 +              .flags  = 0,
@@ -22,29 +20,22 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c
 +      .num_resources          = ARRAY_SIZE(avila_gpio_resources),
 +      .resource               = avila_gpio_resources,
 +};
-+#endif
 +
  static struct platform_device *avila_devices[] __initdata = {
        &avila_i2c_gpio,
        &avila_flash,
-@@ -199,6 +217,9 @@ static struct platform_device *avila_dev
- #ifdef CONFIG_LEDS_IXP4XX
-       &avila_leds,
- #endif
-+#ifdef CONFIG_GPIO_DEVICE
+-      &avila_uart
++      &avila_uart,
 +      &avila_gpio,
-+#endif
  };
  
- static struct platform_device *avila_eth_devices[] = {
-Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
-===================================================================
---- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/avila.h
-+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h
-@@ -38,3 +38,6 @@
- 
- /* User LED */
- #define AVILA_LED_USER_GPIO   3
+ static void __init avila_gw23xx_setup(void)
+--- a/include/asm-arm/arch-ixp4xx/avila.h
++++ b/include/asm-arm/arch-ixp4xx/avila.h
+@@ -39,3 +39,6 @@
+ /* User LEDs */
+ #define AVILA_GW23XX_LED_USER_GPIO    3
+ #define AVILA_GW23X7_LED_USER_GPIO    4
 +
 +/* gpio mask used by platform device */
-+#define AVILA_GPIO_MASK               (1 << 1) | (1 << 3) | (1 << 5) | (1 << 7) | (1 << 9)
++#define AVILA_GPIO_MASK       (1 << 1) | (1 << 3) | (1 << 5) | (1 << 7) | (1 << 9)