diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-05-24 07:15:02 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-05-24 07:15:02 +0000 |
| commit | cdd03b171d314f9250221930fb0758fda538cf63 (patch) | |
| tree | 6e649024eef4bc56143aaf6b18d4880a67ebe513 /target/linux/ixp4xx | |
| parent | 7bc56a7c0e2e5ad1b033b50411b7b8fa7be6cffb (diff) | |
| download | upstream-cdd03b171d314f9250221930fb0758fda538cf63.tar.gz upstream-cdd03b171d314f9250221930fb0758fda538cf63.tar.bz2 upstream-cdd03b171d314f9250221930fb0758fda538cf63.zip | |
refresh Avila/Cambria patches
SVN-Revision: 11253
Diffstat (limited to 'target/linux/ixp4xx')
3 files changed, 10 insertions, 9 deletions
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 82368abd93..fd0a661b63 100644 --- 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 7e4e3b9ef4..6dfc51b652 100644 --- 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 3e5c3fe052..792acc0f3e 100644 --- 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 |