[ixp4xx] refresh Avila/Cambria patches

SVN-Revision: 11253

diff --git a/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
index 82368abd9305062a35428d7998fb4a2f017360ce..fd0a661b63d9ad28ffb0d098d6b21bae53bfb400 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
@@ -125,9 +125,10 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c
 +}
 +
 +subsys_initcall(cambria_pci_init);
-diff -ruN /usr/src/openwrt/clean/linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
---- /usr/src/openwrt/clean/linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c 1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c        2008-05-20 16:02:43.000000000 -0700
+Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
+===================================================================
+--- /dev/null
++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
 @@ -0,0 +1,445 @@
 +/*
 + * arch/arm/mach-ixp4xx/cambria-setup.c

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 7e4e3b9ef4471faea6568073ad15291d1eed8f84..6dfc51b652692e67aa970bc7c9bc92a8460263a0 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
@@ -2,8 +2,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
 ===================================================================
 --- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c
 +++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
-@@ -192,10 +192,28 @@ static struct platform_device avila_leds
-       .dev.platform_data      = &avila_leds_data,
+@@ -239,10 +239,28 @@ static struct platform_device avila_latc
+       .dev.platform_data  = &avila_latch_leds_data,
  };
  
 +static struct resource avila_gpio_resources[] = {

diff --git a/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch b/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
index 3e5c3fe052af7afbe566243cccd49297b8bcef5a..792acc0f3e2bc8f3f7dda7f8f8920aaccc85a02a 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
@@ -2,22 +2,22 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
 ===================================================================
 --- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c
 +++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
-@@ -247,6 +247,7 @@ static void __init avila_gw2345_setup(vo
+@@ -294,6 +294,7 @@ static void __init avila_gw2345_setup(vo
  
  static void __init avila_gw2347_setup(void)
  {
 +      avila_npeb_data.quirks |= IXP4XX_ETH_QUIRK_GW23X7;
        platform_device_register(&avila_npeb_device);
  
-       avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
-@@ -281,6 +282,7 @@ static void __init avila_gw2355_setup(vo
+       avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
+@@ -338,6 +339,7 @@ static void __init avila_gw2355_setup(vo
  
  static void __init avila_gw2357_setup(void)
  {
 +      avila_npeb_data.quirks |= IXP4XX_ETH_QUIRK_GW23X7;
        platform_device_register(&avila_npeb_device);
  
-       avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
+       avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
 Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
 ===================================================================
 --- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c