diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-05-02 10:17:03 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-05-02 10:17:03 +0000 |
| commit | d7d8665572aea1b814c4a59d1b25d4a41c3baa62 (patch) | |
| tree | e5ff9d6b5df84b7ab7808e1cfd9e0261db5bc4ce /target/linux/ixp4xx/patches-2.6.25 | |
| parent | aaac1064de71c495d284b981d83f70d3bd445826 (diff) | |
| download | master-31e0f0ae-d7d8665572aea1b814c4a59d1b25d4a41c3baa62.tar.gz master-31e0f0ae-d7d8665572aea1b814c4a59d1b25d4a41c3baa62.tar.bz2 master-31e0f0ae-d7d8665572aea1b814c4a59d1b25d4a41c3baa62.zip | |
update to 2.6.25.1 and refresh patches
SVN-Revision: 11006
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25')
37 files changed, 442 insertions, 415 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch b/target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch index a99bebc37d..29cafd26f3 100644 --- a/target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch +++ b/target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch @@ -2,10 +2,10 @@ drivers/rtc/rtc-isl1208.c | 357 +++++++++++++++++++++------------------------- 1 file changed, 170 insertions(+), 187 deletions(-) -Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c +Index: linux-2.6.25.1/drivers/rtc/rtc-isl1208.c =================================================================== ---- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-isl1208.c 2008-03-20 10:26:41.000000000 +1030 -+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c 2008-03-20 10:26:53.000000000 +1030 +--- linux-2.6.25.1.orig/drivers/rtc/rtc-isl1208.c ++++ linux-2.6.25.1/drivers/rtc/rtc-isl1208.c @@ -15,16 +15,15 @@ #include <linux/bcd.h> #include <linux/rtc.h> @@ -93,7 +93,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c BUG_ON(reg > ISL1208_REG_USR2); BUG_ON(reg + len > ISL1208_REG_USR2 + 1); -@@ -103,15 +84,14 @@ +@@ -103,15 +84,14 @@ isl1208_i2c_read_regs(struct i2c_client /* block write */ static int isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[], @@ -111,7 +111,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c BUG_ON(reg > ISL1208_REG_USR2); BUG_ON(reg + len > ISL1208_REG_USR2 + 1); -@@ -125,7 +105,8 @@ +@@ -125,7 +105,8 @@ isl1208_i2c_set_regs(struct i2c_client * } /* simple check to see wether we have a isl1208 */ @@ -121,7 +121,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c { u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, }; u8 zero_mask[ISL1208_RTC_SECTION_LEN] = { -@@ -139,24 +120,29 @@ +@@ -139,24 +120,29 @@ static int isl1208_i2c_validate_client(s return ret; for (i = 0; i < ISL1208_RTC_SECTION_LEN; ++i) { @@ -157,7 +157,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c /* The 6bit value in the ATR register controls the load * capacitance C_load * in steps of 0.25pF -@@ -169,51 +155,54 @@ +@@ -169,51 +155,54 @@ static int isl1208_i2c_get_atr(struct i2 * */ @@ -225,7 +225,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c { struct i2c_client *const client = to_i2c_client(dev); int sr, dtr, atr, usr; -@@ -230,20 +219,19 @@ +@@ -230,20 +219,19 @@ static int isl1208_rtc_proc(struct devic (sr & ISL1208_REG_SR_ALM) ? " ALM" : "", (sr & ISL1208_REG_SR_WRTC) ? " WRTC" : "", (sr & ISL1208_REG_SR_XTOSCB) ? " XTOSCB" : "", @@ -249,7 +249,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c usr = isl1208_i2c_get_usr(client); if (usr >= 0) -@@ -252,9 +240,8 @@ +@@ -252,9 +240,8 @@ static int isl1208_rtc_proc(struct devic return 0; } @@ -261,7 +261,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c { int sr; u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, }; -@@ -274,27 +261,30 @@ +@@ -274,27 +261,30 @@ static int isl1208_i2c_read_time(struct tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SC]); tm->tm_min = BCD2BIN(regs[ISL1208_REG_MN]); @@ -299,7 +299,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c { struct rtc_time *const tm = &alarm->time; u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, }; -@@ -307,7 +297,7 @@ +@@ -307,7 +297,7 @@ static int isl1208_i2c_read_alarm(struct } sr = isl1208_i2c_read_regs(client, ISL1208_REG_SCA, regs, @@ -308,7 +308,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c if (sr < 0) { dev_err(&client->dev, "%s: reading alarm section failed\n", __func__); -@@ -315,23 +305,25 @@ +@@ -315,23 +305,25 @@ static int isl1208_i2c_read_alarm(struct } /* MSB of each alarm register is an enable bit */ @@ -343,7 +343,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c { int sr; u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, }; -@@ -353,7 +345,7 @@ +@@ -353,7 +345,7 @@ static int isl1208_i2c_set_time(struct i } /* set WRTC */ @@ -352,7 +352,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c sr | ISL1208_REG_SR_WRTC); if (sr < 0) { dev_err(&client->dev, "%s: writing SR failed\n", __func__); -@@ -369,7 +361,7 @@ +@@ -369,7 +361,7 @@ static int isl1208_i2c_set_time(struct i } /* clear WRTC again */ @@ -361,7 +361,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c sr & ~ISL1208_REG_SR_WRTC); if (sr < 0) { dev_err(&client->dev, "%s: writing SR failed\n", __func__); -@@ -380,70 +372,69 @@ +@@ -380,70 +372,69 @@ static int isl1208_i2c_set_time(struct i } @@ -460,7 +460,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-isl1208.c { int usr = -1; -@@ -460,124 +451,116 @@ +@@ -460,124 +451,116 @@ static ssize_t isl1208_sysfs_store_usr(s return isl1208_i2c_set_usr(to_i2c_client(dev), usr) ? -EIO : count; } diff --git a/target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch b/target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch index 54b244c5f0..25f60b42dd 100644 --- a/target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch +++ b/target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch @@ -2,10 +2,10 @@ drivers/rtc/rtc-pcf8563.c | 109 +++++++++++++--------------------------------- 1 file changed, 32 insertions(+), 77 deletions(-) -Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c +Index: linux-2.6.25.1/drivers/rtc/rtc-pcf8563.c =================================================================== ---- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-pcf8563.c 2008-03-20 10:26:43.000000000 +1030 -+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c 2008-03-20 10:26:51.000000000 +1030 +--- linux-2.6.25.1.orig/drivers/rtc/rtc-pcf8563.c ++++ linux-2.6.25.1/drivers/rtc/rtc-pcf8563.c @@ -18,17 +18,7 @@ #include <linux/bcd.h> #include <linux/rtc.h> @@ -25,7 +25,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c #define PCF8563_REG_ST1 0x00 /* status */ #define PCF8563_REG_ST2 0x01 -@@ -53,8 +43,10 @@ +@@ -53,8 +43,10 @@ I2C_CLIENT_INSMOD; #define PCF8563_SC_LV 0x80 /* low voltage */ #define PCF8563_MO_C 0x80 /* century */ @@ -37,7 +37,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c /* * The meaning of MO_C bit varies by the chip type. * From PCF8563 datasheet: this bit is toggled when the years -@@ -72,16 +64,13 @@ +@@ -72,16 +64,13 @@ struct pcf8563 { int c_polarity; /* 0: MO_C=1 means 19xx, otherwise MO_C=1 means 20xx */ }; @@ -55,7 +55,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c unsigned char buf[13] = { PCF8563_REG_ST1 }; struct i2c_msg msgs[] = { -@@ -138,7 +127,7 @@ +@@ -138,7 +127,7 @@ static int pcf8563_get_datetime(struct i static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm) { @@ -64,7 +64,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-pcf8563.c int i, err; unsigned char buf[9]; -@@ -257,100 +246,66 @@ +@@ -257,100 +246,66 @@ static const struct rtc_class_ops pcf856 .set_time = pcf8563_rtc_set_time, }; diff --git a/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch b/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch index d81a570eaa..cea2e63591 100644 --- a/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch +++ b/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch @@ -2,10 +2,10 @@ drivers/rtc/rtc-x1205.c | 128 ++++++++++++++++-------------------------------- 1 file changed, 43 insertions(+), 85 deletions(-) -Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c +Index: linux-2.6.25.1/drivers/rtc/rtc-x1205.c =================================================================== ---- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-x1205.c 2008-03-20 10:24:13.000000000 +1030 -+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c 2008-03-20 10:24:23.000000000 +1030 +--- linux-2.6.25.1.orig/drivers/rtc/rtc-x1205.c ++++ linux-2.6.25.1/drivers/rtc/rtc-x1205.c @@ -22,20 +22,7 @@ #include <linux/rtc.h> #include <linux/delay.h> @@ -28,7 +28,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c /* offsets into CCR area */ -@@ -91,19 +78,7 @@ +@@ -91,19 +78,7 @@ I2C_CLIENT_INSMOD; #define X1205_HR_MIL 0x80 /* Set in ccr.hour for 24 hr mode */ @@ -49,7 +49,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c /* * In the routines that deal directly with the x1205 hardware, we use -@@ -497,58 +472,51 @@ +@@ -497,58 +472,51 @@ static ssize_t x1205_sysfs_show_dtrim(st } static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL); @@ -135,7 +135,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c i2c_set_clientdata(client, rtc); -@@ -565,45 +533,35 @@ +@@ -565,45 +533,35 @@ static int x1205_probe(struct i2c_adapte else dev_err(&client->dev, "couldn't read status\n"); diff --git a/target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch b/target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch index de874e44ad..5a2fb4ca03 100644 --- a/target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch @@ -45,10 +45,10 @@ now calls machine_restart() directly. create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c create mode 100644 include/asm-arm/arch-ixp4xx/fsg.h -diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig -index efa0485..fc14932 100644 ---- a/arch/arm/configs/ixp4xx_defconfig -+++ b/arch/arm/configs/ixp4xx_defconfig +Index: linux-2.6.25.1/arch/arm/configs/ixp4xx_defconfig +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/configs/ixp4xx_defconfig ++++ linux-2.6.25.1/arch/arm/configs/ixp4xx_defconfig @@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y CONFIG_MACH_NAS100D=y CONFIG_MACH_DSMG600=y @@ -94,10 +94,10 @@ index efa0485..fc14932 100644 CONFIG_RTC_DRV_X1205=y CONFIG_RTC_DRV_PCF8563=y # CONFIG_RTC_DRV_PCF8583 is not set -diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig -index e774447..db8b5fe 100644 ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig @@ -125,6 +125,15 @@ config ARCH_IXDP4XX depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435 default y @@ -114,11 +114,11 @@ index e774447..db8b5fe 100644 # # Certain registers and IRQs are only enabled if supporting IXP465 CPUs # -diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile -index c195688..2e6bbf9 100644 ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas10 obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o @@ -126,7 +126,7 @@ index c195688..2e6bbf9 100644 obj-y += common.o -@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o +@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D) += nas100d-se obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o @@ -134,11 +134,10 @@ index c195688..2e6bbf9 100644 obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -diff --git a/arch/arm/mach-ixp4xx/fsg-pci.c b/arch/arm/mach-ixp4xx/fsg-pci.c -new file mode 100644 -index 0000000..f19f3f6 +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-pci.c +=================================================================== --- /dev/null -+++ b/arch/arm/mach-ixp4xx/fsg-pci.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-pci.c @@ -0,0 +1,71 @@ +/* + * arch/arch/mach-ixp4xx/fsg-pci.c @@ -211,11 +210,10 @@ index 0000000..f19f3f6 +} + +subsys_initcall(fsg_pci_init); -diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c -new file mode 100644 -index 0000000..0db3a90 +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-setup.c +=================================================================== --- /dev/null -+++ b/arch/arm/mach-ixp4xx/fsg-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-setup.c @@ -0,0 +1,276 @@ +/* + * arch/arm/mach-ixp4xx/fsg-setup.c @@ -493,11 +491,10 @@ index 0000000..0db3a90 + .init_machine = fsg_init, +MACHINE_END + -diff --git a/include/asm-arm/arch-ixp4xx/fsg.h b/include/asm-arm/arch-ixp4xx/fsg.h -new file mode 100644 -index 0000000..c0100cc +Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/fsg.h +=================================================================== --- /dev/null -+++ b/include/asm-arm/arch-ixp4xx/fsg.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/fsg.h @@ -0,0 +1,50 @@ +/* + * include/asm-arm/arch-ixp4xx/fsg.h @@ -549,10 +546,10 @@ index 0000000..c0100cc +#define FSG_LED_USB_BIT 4 +#define FSG_LED_RING_BIT 5 +#define FSG_LED_SYNC_BIT 7 -diff --git a/include/asm-arm/arch-ixp4xx/hardware.h b/include/asm-arm/arch-ixp4xx/hardware.h -index 73e8dc3..fa723a6 100644 ---- a/include/asm-arm/arch-ixp4xx/hardware.h -+++ b/include/asm-arm/arch-ixp4xx/hardware.h +Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h +=================================================================== +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/hardware.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h @@ -45,5 +45,6 @@ #include "nslu2.h" #include "nas100d.h" @@ -560,10 +557,10 @@ index 73e8dc3..fa723a6 100644 +#include "fsg.h" #endif /* _ASM_ARCH_HARDWARE_H */ -diff --git a/include/asm-arm/arch-ixp4xx/irqs.h b/include/asm-arm/arch-ixp4xx/irqs.h -index 1180160..674af4a 100644 ---- a/include/asm-arm/arch-ixp4xx/irqs.h -+++ b/include/asm-arm/arch-ixp4xx/irqs.h +Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/irqs.h +=================================================================== +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/irqs.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/irqs.h @@ -128,4 +128,11 @@ #define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7 #define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6 @@ -576,6 +573,3 @@ index 1180160..674af4a 100644 +#define IRQ_FSG_PCI_INTC IRQ_IXP4XX_GPIO5 + #endif --- -1.5.2.5 - diff --git a/target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch b/target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch index 5e82d1f57e..4830b19805 100644 --- a/target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch +++ b/target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch @@ -18,10 +18,10 @@ KernelVersion: v2.6.25-rc6-117-g457fb60 3 files changed, 268 insertions(+), 0 deletions(-) create mode 100644 drivers/leds/leds-fsg.c -diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig -index 859814f..aefbe04 100644 ---- a/drivers/leds/Kconfig -+++ b/drivers/leds/Kconfig +Index: linux-2.6.25.1/drivers/leds/Kconfig +=================================================================== +--- linux-2.6.25.1.orig/drivers/leds/Kconfig ++++ linux-2.6.25.1/drivers/leds/Kconfig @@ -46,6 +46,12 @@ config LEDS_SPITZ This option enables support for the LEDs on Sharp Zaurus SL-Cxx00 series (C1000, C3000, C3100). @@ -35,11 +35,11 @@ index 859814f..aefbe04 100644 config LEDS_TOSA tristate "LED Support for the Sharp SL-6000 series" depends on LEDS_CLASS && PXA_SHARPSL -diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile -index 84ced3b..b17bd91 100644 ---- a/drivers/leds/Makefile -+++ b/drivers/leds/Makefile -@@ -21,6 +21,7 @@ obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o +Index: linux-2.6.25.1/drivers/leds/Makefile +=================================================================== +--- linux-2.6.25.1.orig/drivers/leds/Makefile ++++ linux-2.6.25.1/drivers/leds/Makefile +@@ -22,6 +22,7 @@ obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o @@ -47,11 +47,10 @@ index 84ced3b..b17bd91 100644 # LED Triggers obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o -diff --git a/drivers/leds/leds-fsg.c b/drivers/leds/leds-fsg.c -new file mode 100644 -index 0000000..a7421b8 +Index: linux-2.6.25.1/drivers/leds/leds-fsg.c +=================================================================== --- /dev/null -+++ b/drivers/leds/leds-fsg.c ++++ linux-2.6.25.1/drivers/leds/leds-fsg.c @@ -0,0 +1,261 @@ +/* + * LED Driver for the Freecom FSG-3 @@ -314,6 +313,3 @@ index 0000000..a7421b8 +MODULE_AUTHOR("Rod Whitby <rod@whitby.id.au>"); +MODULE_DESCRIPTION("Freecom FSG-3 LED driver"); +MODULE_LICENSE("GPL"); --- -1.5.2.5 - diff --git a/target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch b/target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch index 9a322a714a..492b84c0d9 100644 --- a/target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch +++ b/target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.19/drivers/char/random.c +Index: linux-2.6.25.1/drivers/char/random.c =================================================================== ---- linux-2.6.19.orig/drivers/char/random.c -+++ linux-2.6.19/drivers/char/random.c +--- linux-2.6.25.1.orig/drivers/char/random.c ++++ linux-2.6.25.1/drivers/char/random.c @@ -248,9 +248,9 @@ /* * Configuration information diff --git a/target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch index c7169ce2fb..a32cb7067b 100644 --- a/target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c ---- linux-2.6.23/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-10-22 15:09:33.000000000 +0200 -@@ -76,9 +76,36 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/gateway7001-setup.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/gateway7001-setup.c +@@ -76,9 +76,36 @@ static struct platform_device gateway700 .resource = &gateway7001_uart_resource, }; diff --git a/target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch index 5209e72d5c..7b279e0c20 100644 --- a/target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/wg302v2-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c ---- linux-2.6.23/arch/arm/mach-ixp4xx/wg302v2-setup.c 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c 2007-10-22 15:02:20.000000000 +0200 -@@ -77,9 +77,27 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v2-setup.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v2-setup.c +@@ -77,9 +77,27 @@ static struct platform_device wg302v2_ua .resource = &wg302v2_uart_resource, }; diff --git a/target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch b/target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch index fb895e0234..156fcb1ade 100644 --- a/target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig =================================================================== ---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:23.000000000 +1030 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030 -@@ -57,6 +57,14 @@ +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +@@ -57,6 +57,14 @@ config MACH_WG302V2 WG302 v2 or WAG302 v2 Access Points. For more information on this platform, see http://openwrt.org @@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig config ARCH_IXDP425 bool "IXDP425" help -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile =================================================================== ---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:23.000000000 +1030 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030 -@@ -16,6 +16,7 @@ +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +@@ -16,6 +16,7 @@ obj-pci-$(CONFIG_MACH_DSMG600) += dsmg6 obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o @@ -29,17 +29,18 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile obj-y += common.o -@@ -30,5 +31,6 @@ +@@ -30,6 +31,7 @@ obj-$(CONFIG_MACH_DSMG600) += dsmg6 obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o +obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o -Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-pci.c + obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-pci.c 2008-03-12 21:21:26.000000000 +1030 +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c @@ -0,0 +1,74 @@ +/* + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c @@ -115,10 +116,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-pci.c +} + +subsys_initcall(pronghornmetro_pci_init); -Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2008-03-12 21:21:26.000000000 +1030 +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c @@ -0,0 +1,147 @@ +/* + * arch/arm/mach-ixp4xx/pronghornmetro-setup.c @@ -267,11 +268,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-setup.c + .init_machine = pronghornmetro_init, +MACHINE_END +#endif -Index: linux-2.6.24/Documentation/arm/IXP4xx +Index: linux-2.6.25.1/Documentation/arm/IXP4xx =================================================================== ---- linux-2.6.24.orig/Documentation/arm/IXP4xx 2008-03-12 21:20:48.000000000 +1030 -+++ linux-2.6.24/Documentation/arm/IXP4xx 2008-03-12 21:21:26.000000000 +1030 -@@ -111,6 +111,9 @@ +--- linux-2.6.25.1.orig/Documentation/arm/IXP4xx ++++ linux-2.6.25.1/Documentation/arm/IXP4xx +@@ -111,6 +111,9 @@ http://www.adiengineering.com/productsCo the platform has two mini-PCI slots used for 802.11[bga] cards. Finally, there is an IDE port hanging off the expansion bus. @@ -281,11 +282,11 @@ Index: linux-2.6.24/Documentation/arm/IXP4xx Gateworks Avila Network Platform http://www.gateworks.com/avila_sbc.htm -Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h +Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h =================================================================== ---- linux-2.6.24.orig/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:20:48.000000000 +1030 -+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:21:26.000000000 +1030 -@@ -41,7 +41,8 @@ +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h +@@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_set * Some boards are using UART2 as console */ if (machine_is_adi_coyote() || machine_is_gtwx5715() || diff --git a/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch index 2fb376982a..3a523d190b 100644 --- a/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ---- linux-2.6.23/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-10-22 15:41:27.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-10-22 15:43:30.000000000 +0200 -@@ -104,9 +104,36 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +@@ -104,9 +104,36 @@ static struct platform_device pronghornm .resource = pronghornmetro_pata_resources, }; diff --git a/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch b/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch index c029ceda1b..c0efcb01a8 100644 --- a/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig =================================================================== ---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030 -@@ -65,6 +65,14 @@ +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO Engineering Pronghorn Metro Platform. For more information on this platform, see <file:Documentation/arm/IXP4xx>. @@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig config ARCH_IXDP425 bool "IXDP425" help -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile =================================================================== ---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030 -@@ -17,6 +17,7 @@ +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +@@ -17,6 +17,7 @@ obj-pci-$(CONFIG_MACH_GATEWAY7001) += ga obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o @@ -29,17 +29,18 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile obj-y += common.o -@@ -32,5 +33,6 @@ +@@ -32,6 +33,7 @@ obj-$(CONFIG_MACH_GATEWAY7001) += gatewa obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o +obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o -Index: linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c + obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c 2008-03-12 21:21:26.000000000 +1030 +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c @@ -0,0 +1,120 @@ +/* + * arch/arm/mach-ixp4xx/compex-setup.c @@ -161,11 +162,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c + .init_machine = compex_init, +MACHINE_END +#endif -Index: linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c =================================================================== ---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c 2008-03-12 21:20:48.000000000 +1030 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c 2008-03-12 21:21:26.000000000 +1030 -@@ -66,7 +66,7 @@ +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c +@@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = { int __init ixdp425_pci_init(void) { if (machine_is_ixdp425() || machine_is_ixcdp1100() || @@ -174,11 +175,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c pci_common_init(&ixdp425_pci); return 0; } -Index: linux-2.6.24/arch/arm/tools/mach-types +Index: linux-2.6.25.1/arch/arm/tools/mach-types =================================================================== ---- linux-2.6.24.orig/arch/arm/tools/mach-types 2008-03-12 21:20:48.000000000 +1030 -+++ linux-2.6.24/arch/arm/tools/mach-types 2008-03-12 21:21:26.000000000 +1030 -@@ -1278,7 +1278,7 @@ +--- linux-2.6.25.1.orig/arch/arm/tools/mach-types ++++ linux-2.6.25.1/arch/arm/tools/mach-types +@@ -1276,7 +1276,7 @@ oiab MACH_OIAB OIAB 1269 smdk6400 MACH_SMDK6400 SMDK6400 1270 nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271 greenphone MACH_GREENPHONE GREENPHONE 1272 diff --git a/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch index 081349ad3d..ffca727f2a 100644 --- a/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/compex-setup.c ---- linux-2.6.23/arch/arm/mach-ixp4xx/compex-setup.c 2007-10-23 18:39:29.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-10-23 18:45:34.000000000 +0200 -@@ -90,9 +90,36 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/compex-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c +@@ -90,9 +90,36 @@ static struct platform_device compex_uar .resource = compex_uart_resources, }; diff --git a/target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch b/target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch index 30a7c55ae0..dfb2546d7c 100644 --- a/target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig =================================================================== ---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:27.000000000 +1030 -@@ -73,6 +73,14 @@ +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +@@ -73,6 +73,14 @@ config MACH_COMPEX WP18 or NP18A boards. For more information on this platform, see http://openwrt.org @@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig config ARCH_IXDP425 bool "IXDP425" help -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile =================================================================== ---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:27.000000000 +1030 -@@ -18,6 +18,7 @@ +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +@@ -18,6 +18,7 @@ obj-pci-$(CONFIG_MACH_WG302V2) += wg302 obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o @@ -29,17 +29,18 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile obj-y += common.o -@@ -34,5 +35,6 @@ +@@ -34,6 +35,7 @@ obj-$(CONFIG_MACH_WG302V2) += wg302v2-se obj-$(CONFIG_MACH_FSG) += fsg-setup.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o obj-$(CONFIG_MACH_COMPEX) += compex-setup.o +obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o -Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-pci.c + obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-pci.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-pci.c 2008-03-12 21:21:27.000000000 +1030 +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-pci.c @@ -0,0 +1,65 @@ +/* + * arch/arch/mach-ixp4xx/wrt300nv2-pci.c @@ -106,10 +107,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-pci.c +} + +subsys_initcall(wrt300nv2_pci_init); -Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2008-03-12 21:21:27.000000000 +1030 +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c @@ -0,0 +1,108 @@ +/* + * arch/arm/mach-ixp4xx/wrt300nv2-setup.c @@ -219,11 +220,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-setup.c + .init_machine = wrt300nv2_init, +MACHINE_END +#endif -Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h +Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h =================================================================== ---- linux-2.6.24.orig/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:21:26.000000000 +1030 -+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:21:27.000000000 +1030 -@@ -42,7 +42,7 @@ +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h +@@ -42,7 +42,7 @@ static __inline__ void __arch_decomp_set */ if (machine_is_adi_coyote() || machine_is_gtwx5715() || machine_is_gateway7001() || machine_is_wg302v2() || diff --git a/target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch index 24dad0aea9..69f5246173 100644 --- a/target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/wrt300nv2-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c ---- linux-2.6.23/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-10-23 19:20:08.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-10-23 19:22:19.000000000 +0200 -@@ -76,9 +76,36 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +@@ -76,9 +76,36 @@ static struct platform_device wrt300nv2_ .resource = &wrt300nv2_uart_resource, }; diff --git a/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch b/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch index a83c421cbf..507007ee85 100644 --- a/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig ---- linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig 2007-10-23 19:20:08.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-10-23 19:26:46.000000000 +0200 -@@ -65,6 +65,14 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO Engineering Pronghorn Metro Platform. For more information on this platform, see <file:Documentation/arm/IXP4xx>. @@ -16,7 +17,7 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/m config MACH_COMPEX bool "Compex WP18 / NP18A" select PCI -@@ -163,7 +171,7 @@ +@@ -163,7 +171,7 @@ config MACH_FSG # config CPU_IXP46X bool @@ -25,10 +26,11 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/m default y config CPU_IXP43X -diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile ---- linux-2.6.23/arch/arm/mach-ixp4xx/Makefile 2007-10-23 19:20:08.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile 2007-10-23 19:23:52.000000000 +0200 -@@ -19,6 +19,7 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +@@ -19,6 +19,7 @@ obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o @@ -36,7 +38,7 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/ obj-y += common.o -@@ -36,6 +37,7 @@ +@@ -36,6 +37,7 @@ obj-$(CONFIG_MACH_FSG) += fsg-setup.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o @@ -44,9 +46,10 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/ obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c ---- linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c 2007-10-23 19:23:52.000000000 +0200 +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c @@ -0,0 +1,71 @@ +/* + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c @@ -119,9 +122,10 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c linux-2.6.23-owrt/a +} + +subsys_initcall(sidewinder_pci_init); -diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-setup.c ---- linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-setup.c 2007-10-23 19:23:52.000000000 +0200 +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-setup.c @@ -0,0 +1,115 @@ +/* + * arch/arm/mach-ixp4xx/sidewinder-setup.c diff --git a/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch index 953ce3c412..6cfc5beb51 100644 --- a/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch @@ -1,6 +1,7 @@ -diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c ---- linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c 2007-11-14 13:58:58.000000000 +0100 +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c @@ -0,0 +1,151 @@ +/* + * arch/arm/mach-ixp4xx/ap1000-setup.c @@ -153,10 +154,11 @@ diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c linux-2.6.23.1-owrt + .init_machine = ap1000_init, +MACHINE_END +#endif -diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c ---- linux-2.6.23.1/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-11-14 13:15:50.000000000 +0100 -+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-11-14 13:27:16.000000000 +0100 -@@ -66,7 +66,8 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c +@@ -66,7 +66,8 @@ struct hw_pci ixdp425_pci __initdata = { int __init ixdp425_pci_init(void) { if (machine_is_ixdp425() || machine_is_ixcdp1100() || @@ -166,10 +168,11 @@ diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.23.1-owrt/ pci_common_init(&ixdp425_pci); return 0; } -diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Kconfig ---- linux-2.6.23.1/arch/arm/mach-ixp4xx/Kconfig 2007-11-14 13:15:50.000000000 +0100 -+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-11-14 13:25:07.000000000 +0100 -@@ -89,6 +89,14 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +@@ -89,6 +89,14 @@ config MACH_WRT300NV2 WRT300N v2 router. For more information on this platform, see http://openwrt.org @@ -184,10 +187,11 @@ diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23.1-owrt/arch/a config ARCH_IXDP425 bool "IXDP425" help -diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Makefile ---- linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile 2007-11-14 13:15:50.000000000 +0100 -+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Makefile 2007-11-14 13:31:29.000000000 +0100 -@@ -20,6 +20,7 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o @@ -195,10 +199,11 @@ diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile linux-2.6.23.1-owrt/arch/ obj-y += common.o -@@ -38,5 +39,6 @@ +@@ -38,6 +39,7 @@ obj-$(CONFIG_MACH_PRONGHORNMETRO) += pro obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o +obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o + obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o diff --git a/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch index 2ab59ff066..2d1a5f2a29 100644 --- a/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c ---- linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c 2007-11-14 14:11:10.000000000 +0100 -+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c 2007-11-14 14:09:30.000000000 +0100 -@@ -90,9 +90,37 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ap1000-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c +@@ -90,9 +90,37 @@ static struct platform_device ap1000_uar .resource = ap1000_uart_resources }; diff --git a/target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch b/target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch index 379b5aa578..0b54355a7b 100644 --- a/target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig =================================================================== ---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:28.000000000 +1030 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:29.000000000 +1030 -@@ -49,6 +49,14 @@ +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +@@ -49,6 +49,14 @@ config MACH_GATEWAY7001 7001 Access Point. For more information on this platform, see http://openwrt.org @@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig config MACH_WG302V2 bool "Netgear WG302 v2 / WAG302 v2" select PCI -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile =================================================================== ---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:28.000000000 +1030 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:29.000000000 +1030 -@@ -14,6 +14,7 @@ +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +@@ -14,6 +14,7 @@ obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-p obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o @@ -29,18 +29,18 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o -@@ -33,6 +34,7 @@ - obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o - obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o +@@ -33,6 +34,7 @@ obj-$(CONFIG_MACH_NSLU2) += nslu2-setup. + obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o + obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o +obj-$(CONFIG_MACH_WG302V1) += wg302v1-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o -Index: linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-pci.c +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-pci.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-pci.c 2008-03-12 21:21:29.000000000 +1030 +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-pci.c @@ -0,0 +1,63 @@ +/* + * arch/arch/mach-ixp4xx/wg302v1-pci.c @@ -105,10 +105,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-pci.c +} + +subsys_initcall(wg302v1_pci_init); -Index: linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-setup.c +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-03-12 21:21:29.000000000 +1030 +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c @@ -0,0 +1,109 @@ +/* + * arch/arm/mach-ixp4xx/wg302v1-setup.c diff --git a/target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch index 250d85e6d9..03314b5457 100644 --- a/target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c ---- linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:06:42.000000000 +0100 -+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:03:16.000000000 +0100 -@@ -77,9 +77,27 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c +@@ -77,9 +77,27 @@ static struct platform_device wg302v1_ua .resource = &wg302v1_uart_resource, }; diff --git a/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch index b370088aec..db8923d36c 100644 --- a/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch +++ b/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c ---- linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:12:03.000000000 +0100 -+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:11:34.000000000 +0100 -@@ -100,6 +100,36 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c +@@ -100,6 +100,36 @@ static struct platform_device *wg302v1_d &wg302_eth[0], }; @@ -38,7 +39,7 @@ diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-setup.c linux-2.6.23.12-o static void __init wg302v1_init(void) { ixp4xx_sys_init(); -@@ -118,6 +148,7 @@ +@@ -118,6 +148,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1 /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, diff --git a/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch index cb6551680c..ec72314a88 100644 --- a/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.25/170-ixdpg425_mac_plat_info.patch @@ -1,6 +1,8 @@ ---- linux-2.6.24.2/arch/arm/mach-ixp4xx/coyote-setup.c 2008-02-11 06:51:11.000000000 +0100 -+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/coyote-setup.c 2008-04-07 12:39:48.000000000 +0200 -@@ -73,9 +73,37 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/coyote-setup.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/coyote-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/coyote-setup.c +@@ -73,9 +73,37 @@ static struct platform_device coyote_uar .resource = &coyote_uart_resource, }; diff --git a/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch index c02866b597..3b7ad83c96 100644 --- a/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Kconfig ---- linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig 2008-04-09 01:34:46.000000000 +0200 -+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2008-04-09 00:06:48.000000000 +0200 -@@ -150,6 +150,14 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +@@ -150,6 +150,14 @@ config ARCH_PRPMC1100 PrPCM1100 Processor Mezanine Module. For more information on this platform, see <file:Documentation/arm/IXP4xx>. @@ -16,10 +17,11 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.2-owrt/arch/a config MACH_NAS100D bool prompt "NAS100D" -diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Makefile ---- linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile 2008-04-09 01:34:46.000000000 +0200 -+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Makefile 2008-04-09 00:07:45.000000000 +0200 -@@ -22,6 +22,7 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +@@ -22,6 +22,7 @@ obj-pci-$(CONFIG_MACH_COMPEX) += ixdp42 obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o @@ -27,7 +29,7 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.2-owrt/arch/ obj-y += common.o -@@ -42,6 +43,7 @@ +@@ -42,6 +43,7 @@ obj-$(CONFIG_MACH_COMPEX) += compex-setu obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o @@ -35,9 +37,10 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.2-owrt/arch/ obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-setup.c ---- linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-setup.c 2008-04-09 01:58:52.000000000 +0200 +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c @@ -0,0 +1,162 @@ +/* + * arch/arm/mach-ixp4xx/tw5334-setup.c @@ -201,9 +204,10 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c linux-2.6.24.2-owrt + .init_machine = tw5334_init, +MACHINE_END +#endif -diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-pci.c ---- linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-pci.c 2008-04-09 00:35:32.000000000 +0200 +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c @@ -0,0 +1,69 @@ +/* + * arch/arch/mach-ixp4xx/tw5334-pci.c @@ -274,9 +278,11 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c linux-2.6.24.2-owrt/a +} + +subsys_initcall(tw5334_pci_init); ---- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/uncompress.h 2008-04-07 08:59:19.000000000 +0200 -+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2008-04-09 13:22:42.000000000 +0200 -@@ -42,7 +42,8 @@ +Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h +=================================================================== +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h +@@ -42,7 +42,8 @@ static __inline__ void __arch_decomp_set */ if (machine_is_adi_coyote() || machine_is_gtwx5715() || machine_is_gateway7001() || machine_is_wg302v2() || 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 4fbc1de8a6..ccd4045a8a 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 @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/Kconfig ---- linux-2.6.24.5/arch/arm/mach-ixp4xx/Kconfig 2008-04-28 20:22:27.000000000 +0200 -+++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/Kconfig 2008-04-28 20:26:44.000000000 +0200 -@@ -25,6 +25,14 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +@@ -25,6 +25,14 @@ config MACH_AVILA Avila Network Platform. For more information on this platform, see <file:Documentation/arm/IXP4xx>. @@ -16,7 +17,7 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.5-owrt/arch/a config MACH_LOFT bool "Loft" depends on MACH_AVILA -@@ -200,7 +208,7 @@ +@@ -200,7 +208,7 @@ config CPU_IXP46X config CPU_IXP43X bool @@ -25,10 +26,11 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.5-owrt/arch/a default y config MACH_GTWX5715 -diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/Makefile ---- linux-2.6.24.5/arch/arm/mach-ixp4xx/Makefile 2008-04-28 20:22:27.000000000 +0200 -+++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/Makefile 2008-04-28 20:26:44.000000000 +0200 -@@ -7,6 +7,7 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +@@ -7,6 +7,7 @@ obj-pci-n := obj-pci-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_AVILA) += avila-pci.o @@ -36,7 +38,7 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.5-owrt/arch/ obj-pci-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o -@@ -28,6 +29,7 @@ +@@ -28,6 +29,7 @@ obj-y += common.o obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-setup.o obj-$(CONFIG_MACH_AVILA) += avila-setup.o @@ -44,9 +46,10 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.5-owrt/arch/ obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o -diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-pci.c linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-pci.c ---- linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-pci.c 2008-04-28 20:30:35.000000000 +0200 +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-pci.c @@ -0,0 +1,74 @@ +/* + * arch/arch/mach-ixp4xx/cambria-pci.c @@ -122,9 +125,10 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-pci.c linux-2.6.24.5-owrt/ +} + +subsys_initcall(cambria_pci_init); -diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-setup.c ---- linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.24.5-owrt/arch/arm/mach-ixp4xx/cambria-setup.c 2008-04-28 21:07:16.000000000 +0200 +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-setup.c @@ -0,0 +1,250 @@ +/* + * arch/arm/mach-ixp4xx/cambria-setup.c @@ -376,9 +380,10 @@ diff -Nur linux-2.6.24.5/arch/arm/mach-ixp4xx/cambria-setup.c linux-2.6.24.5-owr + .init_machine = cambria_init, +MACHINE_END +#endif -diff -Nur linux-2.6.24.5/include/asm-arm/arch-ixp4xx/hardware.h linux-2.6.24.5-owrt/include/asm-arm/arch-ixp4xx/hardware.h ---- linux-2.6.24.5/include/asm-arm/arch-ixp4xx/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.24.5-owrt/include/asm-arm/arch-ixp4xx/hardware.h 2008-04-28 21:07:16.000000000 +0200 +Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h +=================================================================== +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/hardware.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h @@ -18,7 +18,7 @@ #define __ASM_ARCH_HARDWARE_H__ diff --git a/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch b/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch index f2f53a0bc7..4faad529ae 100644 --- a/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch +++ b/target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch @@ -1,7 +1,7 @@ -diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig -index f9cc2b6..8eda6ee 100644 ---- a/drivers/net/arm/Kconfig -+++ b/drivers/net/arm/Kconfig +Index: linux-2.6.25.1/drivers/net/arm/Kconfig +=================================================================== +--- linux-2.6.25.1.orig/drivers/net/arm/Kconfig ++++ linux-2.6.25.1/drivers/net/arm/Kconfig @@ -47,3 +47,11 @@ config EP93XX_ETH help This is a driver for the ethernet hardware included in EP93xx CPUs. @@ -14,20 +14,19 @@ index f9cc2b6..8eda6ee 100644 + help + Say Y here if you want to use built-in Ethernet ports + on IXP4xx processor. -diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile -index a4c8682..7c812ac 100644 ---- a/drivers/net/arm/Makefile -+++ b/drivers/net/arm/Makefile +Index: linux-2.6.25.1/drivers/net/arm/Makefile +=================================================================== +--- linux-2.6.25.1.orig/drivers/net/arm/Makefile ++++ linux-2.6.25.1/drivers/net/arm/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_ARM_ETHER3) += ether3.o obj-$(CONFIG_ARM_ETHER1) += ether1.o obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o +obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o -diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c -new file mode 100644 -index 0000000..c617b64 +Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c +=================================================================== --- /dev/null -+++ b/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c @@ -0,0 +1,1265 @@ +/* + * Intel IXP4xx Ethernet driver for Linux @@ -1294,11 +1293,11 @@ index 0000000..c617b64 +MODULE_ALIAS("platform:ixp4xx_eth"); +module_init(eth_init_module); +module_exit(eth_cleanup_module); -diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c -index 83c137e..63a23fa 100644 ---- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c -+++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c -@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, const void *msg, const char *what) +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c +@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, co return -ETIMEDOUT; } @@ -1308,7 +1307,7 @@ index 83c137e..63a23fa 100644 return 0; } -@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, void *msg, const char *what) +@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, vo return -ETIMEDOUT; } @@ -1318,11 +1317,11 @@ index 83c137e..63a23fa 100644 return 0; } -diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c -index e833013..fab94ea 100644 ---- a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c -+++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c -@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int queue) +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c +@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int que case 3: mask[0] = 0xFF; break; } diff --git a/target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch b/target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch index fad4033419..dce76554ac 100644 --- a/target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch +++ b/target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.23-openwrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c ---- linux-2.6.23/arch/arm/mach-ixp4xx/ixp4xx_npe.c 2007-10-22 22:18:15.000000000 +0200 -+++ linux-2.6.23-openwrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c 2007-10-22 22:32:48.000000000 +0200 -@@ -585,6 +585,8 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c +@@ -592,6 +592,8 @@ int npe_load_firmware(struct npe *npe, c npe_reset(npe); #endif diff --git a/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch b/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch index 4e6c959d92..93a5d2d1fc 100644 --- a/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c +Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c =================================================================== ---- linux-2.6.24.2.orig/drivers/net/arm/ixp4xx_eth.c -+++ linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c +--- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c @@ -165,14 +165,15 @@ struct port { struct net_device *netdev; struct napi_struct napi; @@ -20,7 +20,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c }; /* NPE message structure */ -@@ -316,13 +317,14 @@ static void mdio_write(struct net_device +@@ -316,12 +317,13 @@ static void mdio_write(struct net_device spin_unlock_irqrestore(&mdio_lock, flags); } @@ -32,12 +32,10 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c int cycles = 0; - mdio_write(dev, phy_id, MII_BMCR, port->mii_bmcr | BMCR_RESET); -- + mdio_write(dev, phy_id, MII_BMCR, port->mii_bmcr[idx] | BMCR_RESET); -+ + while (cycles < MAX_MII_RESET_RETRIES) { if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) { - #if DEBUG_MDIO @@ -335,12 +337,12 @@ static void phy_reset(struct net_device cycles++; } @@ -107,7 +105,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c + } +} +#endif - ++ +static void phy_power_down(struct net_device *dev, int idx) +{ + struct port *port = netdev_priv(dev); @@ -121,13 +119,13 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c +static void phy_power_up(struct net_device *dev, int idx) +{ + struct port *port = netdev_priv(dev); -+ + + mdio_write(dev, port->mii[idx].phy_id, MII_BMCR, port->mii_bmcr[idx]); +} static void mdio_thread(struct work_struct *work) { -@@ -790,9 +848,12 @@ static int eth_ioctl(struct net_device * +@@ -792,9 +850,12 @@ static int eth_ioctl(struct net_device * if (!netif_running(dev)) return -EINVAL; @@ -142,7 +140,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c return err; } -@@ -944,7 +1005,8 @@ static int eth_open(struct net_device *d +@@ -947,7 +1008,8 @@ static int eth_open(struct net_device *d } } @@ -152,7 +150,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c memset(&msg, 0, sizeof(msg)); msg.cmd = NPE_VLAN_SETRXQOSENTRY; -@@ -1103,10 +1165,8 @@ static int eth_close(struct net_device * +@@ -1107,10 +1169,8 @@ static int eth_close(struct net_device * printk(KERN_CRIT "%s: unable to disable loopback\n", dev->name); @@ -165,7 +163,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c if (!ports_open) qmgr_disable_irq(TXDONE_QUEUE); -@@ -1117,6 +1177,42 @@ static int eth_close(struct net_device * +@@ -1120,6 +1180,42 @@ static int eth_close(struct net_device * return 0; } @@ -208,7 +206,7 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c static int __devinit eth_init_one(struct platform_device *pdev) { struct port *port; -@@ -1189,20 +1285,7 @@ static int __devinit eth_init_one(struct +@@ -1192,20 +1288,7 @@ static int __devinit eth_init_one(struct __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control); udelay(50); @@ -230,11 +228,11 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread); return 0; -Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h +Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h =================================================================== ---- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/platform.h -+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h -@@ -106,12 +106,15 @@ struct sys_timer; +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h +@@ -95,12 +95,15 @@ struct sys_timer; #define IXP4XX_ETH_NPEB 0x10 #define IXP4XX_ETH_NPEC 0x20 diff --git a/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch b/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch index 6e1056e55d..7d635deac5 100644 --- a/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch +++ b/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c +Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c =================================================================== ---- linux-2.6.24.2.orig/drivers/net/arm/ixp4xx_eth.c -+++ linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c +--- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c @@ -322,8 +322,12 @@ static void phy_reset(struct net_device struct port *port = netdev_priv(dev); int phy_id = port->mii[idx].phy_id; diff --git a/target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch b/target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch index c0b55aa118..18d5d87371 100644 --- a/target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c ---- linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c 2008-04-22 12:24:29.000000000 +0200 -+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c 2008-04-24 13:26:56.000000000 +0200 -@@ -571,8 +571,8 @@ +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c +=================================================================== +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c +@@ -575,8 +575,8 @@ int npe_load_firmware(struct npe *npe, c for (i = 0; i < image->size; i++) image->data[i] = swab32(image->data[i]); @@ -12,7 +13,7 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.24.2-owrt/a "IXP42x\n"); goto err; } -@@ -594,7 +594,7 @@ +@@ -598,7 +598,7 @@ int npe_load_firmware(struct npe *npe, c "revision 0x%X:%X\n", (image->id >> 16) & 0xFF, (image->id >> 8) & 0xFF, image->id & 0xFF); @@ -21,9 +22,10 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.24.2-owrt/a if (!npe->id) instr_size = NPE_A_42X_INSTR_SIZE; else -diff -Nur linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c linux-2.6.24.2-owrt/drivers/net/arm/ixp4xx_eth.c ---- linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c 2008-04-22 12:24:29.000000000 +0200 -+++ linux-2.6.24.2-owrt/drivers/net/arm/ixp4xx_eth.c 2008-04-24 18:23:24.000000000 +0200 +Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c +=================================================================== +--- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c @@ -32,6 +32,7 @@ #include <linux/kernel.h> #include <linux/mii.h> @@ -32,7 +34,7 @@ diff -Nur linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c linux-2.6.24.2-owrt/driver #include <asm/arch/npe.h> #include <asm/arch/qmgr.h> -@@ -1238,12 +1239,16 @@ +@@ -1338,12 +1339,16 @@ static struct platform_driver drv = { static int __init eth_init_module(void) { @@ -53,10 +55,11 @@ diff -Nur linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c linux-2.6.24.2-owrt/driver __raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control); return platform_driver_register(&drv); -diff -Nur linux-2.6.24.2/include/asm-arm/arch-ixp4xx/cpu.h linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/cpu.h ---- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/cpu.h 2008-04-22 12:24:29.000000000 +0200 -+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/cpu.h 2008-04-24 18:15:29.000000000 +0200 -@@ -34,6 +34,8 @@ +Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/cpu.h +=================================================================== +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/cpu.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/cpu.h +@@ -34,6 +34,8 @@ static inline u32 ixp4xx_read_feature_bi val &= ~IXP4XX_FEATURE_RESERVED; if (!cpu_is_ixp46x()) val &= ~IXP4XX_FEATURE_IXP46X_ONLY; @@ -65,9 +68,10 @@ diff -Nur linux-2.6.24.2/include/asm-arm/arch-ixp4xx/cpu.h linux-2.6.24.2-owrt/i return val; } -diff -Nur linux-2.6.24.2/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h ---- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2008-04-22 12:24:29.000000000 +0200 -+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2008-04-24 18:15:13.000000000 +0200 +Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +=================================================================== +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h @@ -628,11 +628,12 @@ #define IXP4XX_FEATURE_XSCALE_MAX_FREQ (3 << 22) #define IXP4XX_FEATURE_RESERVED (0xFF << 24) diff --git a/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch b/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch index 3950456bdb..c3349f158a 100644 --- a/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch +++ b/target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch @@ -1,8 +1,8 @@ -diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig -index a3df09e..94e7aa7 100644 ---- a/drivers/net/wan/Kconfig -+++ b/drivers/net/wan/Kconfig -@@ -334,6 +334,15 @@ config DSCC4_PCI_RST +Index: linux-2.6.25.1/drivers/net/wan/Kconfig +=================================================================== +--- linux-2.6.25.1.orig/drivers/net/wan/Kconfig ++++ linux-2.6.25.1/drivers/net/wan/Kconfig +@@ -338,6 +338,15 @@ config DSCC4_PCI_RST Say Y if your card supports this feature. @@ -18,10 +18,10 @@ index a3df09e..94e7aa7 100644 config DLCI tristate "Frame Relay DLCI support" ---help--- -diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile -index d61fef3..1b1d116 100644 ---- a/drivers/net/wan/Makefile -+++ b/drivers/net/wan/Makefile +Index: linux-2.6.25.1/drivers/net/wan/Makefile +=================================================================== +--- linux-2.6.25.1.orig/drivers/net/wan/Makefile ++++ linux-2.6.25.1/drivers/net/wan/Makefile @@ -42,6 +42,7 @@ obj-$(CONFIG_C101) += c101.o obj-$(CONFIG_WANXL) += wanxl.o obj-$(CONFIG_PCI200SYN) += pci200syn.o @@ -30,11 +30,10 @@ index d61fef3..1b1d116 100644 clean-files := wanxlfw.inc $(obj)/wanxl.o: $(obj)/wanxlfw.inc -diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c -new file mode 100644 -index 0000000..cf971b3 +Index: linux-2.6.25.1/drivers/net/wan/ixp4xx_hss.c +=================================================================== --- /dev/null -+++ b/drivers/net/wan/ixp4xx_hss.c ++++ linux-2.6.25.1/drivers/net/wan/ixp4xx_hss.c @@ -0,0 +1,2886 @@ +/* + * Intel IXP4xx HSS (synchronous serial port) driver for Linux diff --git a/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch b/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch index 4aa7a988be..e8e59dfb27 100644 --- a/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch +++ b/target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch @@ -1,6 +1,7 @@ -diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c/chips/eeprom.c ---- linux-2.6.23.orig/drivers/i2c/chips/eeprom.c 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/drivers/i2c/chips/eeprom.c 2007-10-11 00:57:25.000000000 -0500 +Index: linux-2.6.25.1/drivers/i2c/chips/eeprom.c +=================================================================== +--- linux-2.6.25.1.orig/drivers/i2c/chips/eeprom.c ++++ linux-2.6.25.1/drivers/i2c/chips/eeprom.c @@ -33,6 +33,8 @@ #include <linux/jiffies.h> #include <linux/i2c.h> @@ -9,8 +10,8 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c +#include <linux/eeprom.h> /* Addresses to scan */ - static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54, -@@ -41,26 +43,7 @@ static unsigned short normal_i2c[] = { 0 + static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54, +@@ -41,26 +43,7 @@ static const unsigned short normal_i2c[] /* Insmod parameters */ I2C_CLIENT_INSMOD_1(eeprom); @@ -38,7 +39,7 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c static int eeprom_attach_adapter(struct i2c_adapter *adapter); static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind); -@@ -191,6 +174,7 @@ static int eeprom_detect(struct i2c_adap +@@ -197,6 +180,7 @@ static int eeprom_detect(struct i2c_adap data->valid = 0; mutex_init(&data->update_lock); data->nature = UNKNOWN; @@ -46,7 +47,7 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c /* Tell the I2C layer a new client has arrived */ if ((err = i2c_attach_client(new_client))) -@@ -214,6 +198,9 @@ static int eeprom_detect(struct i2c_adap +@@ -224,6 +208,9 @@ static int eeprom_detect(struct i2c_adap if (err) goto exit_detach; @@ -56,7 +57,7 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c return 0; exit_detach: -@@ -239,6 +226,41 @@ static int eeprom_detach_client(struct i +@@ -249,6 +236,41 @@ static int eeprom_detach_client(struct i return 0; } @@ -98,9 +99,10 @@ diff -uprN linux-2.6.23.orig/drivers/i2c/chips/eeprom.c linux-2.6.23/drivers/i2c static int __init eeprom_init(void) { return i2c_add_driver(&eeprom_driver); -diff -uprN linux-2.6.23.orig/include/linux/eeprom.h linux-2.6.23/include/linux/eeprom.h ---- linux-2.6.23.orig/include/linux/eeprom.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-2.6.23/include/linux/eeprom.h 2007-10-11 00:57:25.000000000 -0500 +Index: linux-2.6.25.1/include/linux/eeprom.h +=================================================================== +--- /dev/null ++++ linux-2.6.25.1/include/linux/eeprom.h @@ -0,0 +1,71 @@ +#ifndef _LINUX_EEPROM_H +#define _LINUX_EEPROM_H @@ -173,12 +175,13 @@ diff -uprN linux-2.6.23.orig/include/linux/eeprom.h linux-2.6.23/include/linux/e +extern int unregister_eeprom_notifier(struct notifier_block *nb); + +#endif /* _LINUX_EEPROM_H */ -diff -uprN linux-2.6.23.orig/include/linux/notifier.h linux-2.6.23/include/linux/notifier.h ---- linux-2.6.23.orig/include/linux/notifier.h 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/include/linux/notifier.h 2007-10-11 00:57:25.000000000 -0500 -@@ -231,5 +231,8 @@ static inline int notifier_to_errno(int - #define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */ - #define PM_POST_SUSPEND 0x0004 /* Suspend finished */ +Index: linux-2.6.25.1/include/linux/notifier.h +=================================================================== +--- linux-2.6.25.1.orig/include/linux/notifier.h ++++ linux-2.6.25.1/include/linux/notifier.h +@@ -248,5 +248,8 @@ extern struct blocking_notifier_head reb + #define VT_WRITE 0x0003 /* A char got output */ + #define VT_UPDATE 0x0004 /* A bigger update occurred */ +/* eeprom notifier chain */ +#define EEPROM_REGISTER 0x0001 diff --git a/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch index 0c18956e34..4c103acce4 100644 --- a/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.25/296-avila_mac_plat_info.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.25.1/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 +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c @@ -132,6 +132,31 @@ static struct platform_device avila_pata .resource = avila_pata_resources, }; diff --git a/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch index e35ddbe334..7f2d611aa4 100644 --- a/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch +++ b/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.25.1/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 +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c @@ -14,10 +14,18 @@ #include <linux/kernel.h> #include <linux/init.h> @@ -35,9 +35,9 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c static struct flash_platform_data avila_flash_data = { .map_name = "cfi_probe", .width = 2, -@@ -192,10 +207,160 @@ static void __init avila_fixup(struct ma - t->hdr.size = 0; - } +@@ -163,10 +178,160 @@ static struct platform_device *avila_dev + &avila_uart + }; +static void __init avila_gw23xx_setup(void) +{ @@ -196,7 +196,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); avila_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; -@@ -213,9 +378,28 @@ static void __init avila_init(void) +@@ -184,9 +349,28 @@ static void __init avila_init(void) platform_device_register(&avila_pata); diff --git a/target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch b/target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch index 825773900a..14be023f77 100644 --- a/target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch +++ b/target/linux/ixp4xx/patches-2.6.25/301-avila_led.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h +Index: linux-2.6.25.1/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 +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/avila.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h @@ -36,4 +36,6 @@ #define AVILA_PCI_INTC_PIN 9 #define AVILA_PCI_INTD_PIN 8 @@ -10,10 +10,10 @@ Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h +/* User LEDs */ +#define AVILA_GW23XX_LED_USER_GPIO 3 +#define AVILA_GW23X7_LED_USER_GPIO 4 -Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.25.1/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 +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c @@ -26,6 +26,7 @@ # include <linux/eeprom.h> #endif @@ -48,7 +48,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c static struct platform_device *avila_devices[] __initdata = { &avila_i2c_gpio, &avila_flash, -@@ -211,6 +231,8 @@ static void __init avila_gw23xx_setup(vo +@@ -182,6 +202,8 @@ static void __init avila_gw23xx_setup(vo { platform_device_register(&avila_npeb_device); platform_device_register(&avila_npec_device); @@ -57,7 +57,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c } #ifdef CONFIG_SENSORS_EEPROM -@@ -218,6 +240,8 @@ static void __init avila_gw2342_setup(vo +@@ -189,6 +211,8 @@ static void __init avila_gw2342_setup(vo { platform_device_register(&avila_npeb_device); platform_device_register(&avila_npec_device); @@ -66,7 +66,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c } static void __init avila_gw2345_setup(void) -@@ -228,22 +252,30 @@ static void __init avila_gw2345_setup(vo +@@ -199,22 +223,30 @@ static void __init avila_gw2345_setup(vo avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */ platform_device_register(&avila_npec_device); @@ -97,9 +97,9 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c } static void __init avila_gw2355_setup(void) -@@ -254,11 +286,16 @@ static void __init avila_gw2355_setup(vo +@@ -225,11 +257,16 @@ static void __init avila_gw2355_setup(vo - avila_npec_data.phy = 5; + avila_npec_data.phy = 16; platform_device_register(&avila_npec_device); + + platform_device_register(&avila_leds_device); 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 aee0eeeeca..8c91f0d0b8 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 @@ -1,7 +1,7 @@ -Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.25.1/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 +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c @@ -192,10 +192,28 @@ static struct platform_device avila_leds .dev.platform_data = &avila_leds_data, }; @@ -31,11 +31,11 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c + &avila_gpio, }; - static char avila_rtc_probe[] __initdata = "rtc-ds1672.probe=0,0x68 "; -Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/avila.h + static void __init avila_gw23xx_setup(void) +Index: linux-2.6.25.1/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 +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/avila.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h @@ -39,3 +39,6 @@ /* User LEDs */ #define AVILA_GW23XX_LED_USER_GPIO 3 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 ffba2bb390..fa91b38f2d 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 @@ -1,8 +1,8 @@ -Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.25.1/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 -@@ -276,6 +276,7 @@ static void __init avila_gw2345_setup(vo +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c +@@ -247,6 +247,7 @@ static void __init avila_gw2345_setup(vo static void __init avila_gw2347_setup(void) { @@ -10,7 +10,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c platform_device_register(&avila_npeb_device); avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO; -@@ -310,6 +311,7 @@ static void __init avila_gw2355_setup(vo +@@ -281,6 +282,7 @@ static void __init avila_gw2355_setup(vo static void __init avila_gw2357_setup(void) { @@ -18,11 +18,11 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c platform_device_register(&avila_npeb_device); avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO; -Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c +Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c =================================================================== ---- linux-2.6.24.2.orig/drivers/net/arm/ixp4xx_eth.c -+++ linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c -@@ -347,6 +347,14 @@ static void phy_reset(struct net_device +--- linux-2.6.25.1.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c +@@ -348,6 +348,14 @@ static void phy_reset(struct net_device return; } @@ -37,11 +37,11 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c /* restart auto negotiation */ bmcr = mdio_read(dev, phy_id, MII_BMCR); bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART); -Index: linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h +Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h =================================================================== ---- linux-2.6.24.2.orig/include/asm-arm/arch-ixp4xx/platform.h -+++ linux-2.6.24.2/include/asm-arm/arch-ixp4xx/platform.h -@@ -115,6 +115,8 @@ struct eth_plat_info { +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h +@@ -104,6 +104,8 @@ struct eth_plat_info { u8 txreadyq; u8 hwaddr[6]; u32 phy_mask; diff --git a/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch b/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch index f4910261e3..2b7cd76eb1 100644 --- a/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch +++ b/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23.14/arch/arm/common/dmabounce.c +Index: linux-2.6.25.1/arch/arm/common/dmabounce.c =================================================================== ---- linux-2.6.23.14.orig/arch/arm/common/dmabounce.c 2008-01-24 22:03:28.475500801 +0100 -+++ linux-2.6.23.14/arch/arm/common/dmabounce.c 2008-01-24 22:17:36.415822168 +0100 -@@ -116,6 +116,10 @@ +--- linux-2.6.25.1.orig/arch/arm/common/dmabounce.c ++++ linux-2.6.25.1/arch/arm/common/dmabounce.c +@@ -117,6 +117,10 @@ alloc_safe_buffer(struct dmabounce_devic } else if (size <= device_info->large.size) { pool = &device_info->large; } else { @@ -13,11 +13,11 @@ Index: linux-2.6.23.14/arch/arm/common/dmabounce.c pool = NULL; } -Index: linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig =================================================================== ---- linux-2.6.23.14.orig/arch/arm/mach-ixp4xx/Kconfig 2008-01-24 22:10:29.331484012 +0100 -+++ linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig 2008-01-24 22:11:42.891675973 +0100 -@@ -220,6 +220,11 @@ +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +@@ -236,6 +236,11 @@ config DMABOUNCE default y depends on PCI diff --git a/target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch b/target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch index db76d15da4..0ec214918a 100644 --- a/target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch +++ b/target/linux/ixp4xx/patches-2.6.25/401-avila_pci_dev.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.14/include/asm-arm/arch-ixp4xx/avila.h +Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h =================================================================== ---- linux-2.6.23.14.orig/include/asm-arm/arch-ixp4xx/avila.h 2008-01-31 17:40:36.000000000 +0100 -+++ linux-2.6.23.14/include/asm-arm/arch-ixp4xx/avila.h 2008-01-31 17:40:42.000000000 +0100 +--- linux-2.6.25.1.orig/include/asm-arm/arch-ixp4xx/avila.h ++++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h @@ -25,7 +25,7 @@ /* * AVILA PCI IRQs |