refresh Avila/Cambria patches

SVN-Revision: 11253
This commit is contained in:
Gabor Juhos 2008-05-24 07:15:02 +00:00
parent 7bc56a7c0e
commit cdd03b171d
3 changed files with 10 additions and 9 deletions

View file

@ -125,9 +125,10 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c
+} +}
+ +
+subsys_initcall(cambria_pci_init); +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 Index: 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 --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
@@ -0,0 +1,445 @@ @@ -0,0 +1,445 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/cambria-setup.c + * arch/arm/mach-ixp4xx/cambria-setup.c

View file

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

View file

@ -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.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.25.4/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) static void __init avila_gw2347_setup(void)
{ {
+ avila_npeb_data.quirks |= IXP4XX_ETH_QUIRK_GW23X7; + avila_npeb_data.quirks |= IXP4XX_ETH_QUIRK_GW23X7;
platform_device_register(&avila_npeb_device); 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;
@@ -281,6 +282,7 @@ static void __init avila_gw2355_setup(vo @@ -338,6 +339,7 @@ static void __init avila_gw2355_setup(vo
static void __init avila_gw2357_setup(void) static void __init avila_gw2357_setup(void)
{ {
+ avila_npeb_data.quirks |= IXP4XX_ETH_QUIRK_GW23X7; + avila_npeb_data.quirks |= IXP4XX_ETH_QUIRK_GW23X7;
platform_device_register(&avila_npeb_device); 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 Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
=================================================================== ===================================================================
--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c --- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c