diff options
Diffstat (limited to 'target/linux')
160 files changed, 1981 insertions, 2054 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.23/001-kexec_atags.patch b/target/linux/ixp4xx/patches-2.6.23/001-kexec_atags.patch index 895375d..f4f60c9 100644 --- a/target/linux/ixp4xx/patches-2.6.23/001-kexec_atags.patch +++ b/target/linux/ixp4xx/patches-2.6.23/001-kexec_atags.patch @@ -1,6 +1,7 @@ -diff -uprN linux-2.6.23.orig/arch/arm/kernel/relocate_kernel.S linux-2.6.23/arch/arm/kernel/relocate_kernel.S ---- linux-2.6.23.orig/arch/arm/kernel/relocate_kernel.S 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/arch/arm/kernel/relocate_kernel.S 2007-10-09 22:19:32.000000000 -0500 +Index: linux-2.6.23.17/arch/arm/kernel/relocate_kernel.S +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/kernel/relocate_kernel.S ++++ linux-2.6.23.17/arch/arm/kernel/relocate_kernel.S @@ -7,6 +7,23 @@ .globl relocate_new_kernel relocate_new_kernel: @@ -51,9 +52,10 @@ diff -uprN linux-2.6.23.orig/arch/arm/kernel/relocate_kernel.S linux-2.6.23/arch relocate_new_kernel_end: .globl relocate_new_kernel_size -diff -uprN linux-2.6.23.orig/arch/arm/kernel/setup.c linux-2.6.23/arch/arm/kernel/setup.c ---- linux-2.6.23.orig/arch/arm/kernel/setup.c 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/arch/arm/kernel/setup.c 2007-10-09 20:06:10.000000000 -0500 +Index: linux-2.6.23.17/arch/arm/kernel/setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/kernel/setup.c ++++ linux-2.6.23.17/arch/arm/kernel/setup.c @@ -24,6 +24,7 @@ #include <linux/interrupt.h> #include <linux/smp.h> @@ -105,9 +107,10 @@ diff -uprN linux-2.6.23.orig/arch/arm/kernel/setup.c linux-2.6.23/arch/arm/kerne /* * If we have the old style parameters, convert them to * a tag list. -diff -uprN linux-2.6.23.orig/include/asm-arm/kexec.h linux-2.6.23/include/asm-arm/kexec.h ---- linux-2.6.23.orig/include/asm-arm/kexec.h 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/include/asm-arm/kexec.h 2007-10-09 22:19:32.000000000 -0500 +Index: linux-2.6.23.17/include/asm-arm/kexec.h +=================================================================== +--- linux-2.6.23.17.orig/include/asm-arm/kexec.h ++++ linux-2.6.23.17/include/asm-arm/kexec.h @@ -14,6 +14,8 @@ #define KEXEC_ARCH KEXEC_ARCH_ARM diff --git a/target/linux/ixp4xx/patches-2.6.23/012-velocity_BE.patch b/target/linux/ixp4xx/patches-2.6.23/012-velocity_BE.patch index 3143353..40a7215 100644 --- a/target/linux/ixp4xx/patches-2.6.23/012-velocity_BE.patch +++ b/target/linux/ixp4xx/patches-2.6.23/012-velocity_BE.patch @@ -1,6 +1,7 @@ -diff -uprN linux-2.6.23.orig/drivers/net/via-velocity.c linux-2.6.23/drivers/net/via-velocity.c ---- linux-2.6.23.orig/drivers/net/via-velocity.c 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/drivers/net/via-velocity.c 2007-10-11 00:53:45.000000000 -0500 +Index: linux-2.6.23.17/drivers/net/via-velocity.c +=================================================================== +--- linux-2.6.23.17.orig/drivers/net/via-velocity.c ++++ linux-2.6.23.17/drivers/net/via-velocity.c @@ -96,11 +96,31 @@ MODULE_AUTHOR("VIA Networking Technologi MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("VIA Networking Velocity Family Gigabit Ethernet Adapter Driver"); @@ -782,9 +783,10 @@ diff -uprN linux-2.6.23.orig/drivers/net/via-velocity.c linux-2.6.23/drivers/net /* * Disable MIICR_MAUTO, so that mii addr can be set normally */ -diff -uprN linux-2.6.23.orig/drivers/net/via-velocity.h linux-2.6.23/drivers/net/via-velocity.h ---- linux-2.6.23.orig/drivers/net/via-velocity.h 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/drivers/net/via-velocity.h 2007-10-11 00:53:45.000000000 -0500 +Index: linux-2.6.23.17/drivers/net/via-velocity.h +=================================================================== +--- linux-2.6.23.17.orig/drivers/net/via-velocity.h ++++ linux-2.6.23.17/drivers/net/via-velocity.h @@ -196,64 +196,70 @@ * Receive descriptor */ diff --git a/target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch b/target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch index 2a1f241..b0aee75 100644 --- a/target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch +++ b/target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch @@ -13,10 +13,10 @@ Signed-off-by: Rod Whitby <rod@whitby.id.au> include/asm-arm/arch-ixp4xx/dsmg600.h | 7 +------ 2 files changed, 15 insertions(+), 16 deletions(-) -Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/dsmg600-power.c =================================================================== ---- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/dsmg600-power.c 2008-01-11 16:20:26.000000000 +1030 -+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c 2008-01-11 16:20:30.000000000 +1030 +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/dsmg600-power.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/dsmg600-power.c @@ -26,10 +26,9 @@ #include <linux/jiffies.h> #include <linux/timer.h> @@ -29,7 +29,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c /* This is used to make sure the power-button pusher is serious. The button * must be held until the value of this counter reaches zero. */ -@@ -47,9 +46,16 @@ +@@ -47,9 +46,16 @@ static void dsmg600_power_handler(unsign * state of the power button. */ @@ -47,7 +47,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c if (power_button_countdown == 0) { /* Signal init to do the ctrlaltdel action, this will bypass * init if it hasn't started and do a kernel_restart. -@@ -58,11 +64,9 @@ +@@ -58,11 +64,9 @@ static void dsmg600_power_handler(unsign /* Change the state of the power LED to "blink" */ gpio_line_set(DSMG600_LED_PWR_GPIO, IXP4XX_GPIO_LOW); @@ -61,7 +61,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c } mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500)); -@@ -81,12 +85,12 @@ +@@ -81,12 +85,12 @@ static int __init dsmg600_power_init(voi if (!(machine_is_dsmg600())) return 0; @@ -76,7 +76,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c return -EIO; } -@@ -114,7 +118,7 @@ +@@ -114,7 +118,7 @@ static void __exit dsmg600_power_exit(vo del_timer_sync(&dsmg600_power_timer); @@ -85,10 +85,10 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c } module_init(dsmg600_power_init); -Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/dsmg600.h +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/dsmg600.h =================================================================== ---- linux-2.6.23.12-armeb.orig/include/asm-arm/arch-ixp4xx/dsmg600.h 2008-01-11 16:20:26.000000000 +1030 -+++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/dsmg600.h 2008-01-11 16:20:30.000000000 +1030 +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/dsmg600.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/dsmg600.h @@ -40,18 +40,13 @@ /* Buttons */ diff --git a/target/linux/ixp4xx/patches-2.6.23/017-nas100d_auto_power_on.patch b/target/linux/ixp4xx/patches-2.6.23/017-nas100d_auto_power_on.patch index b77df48..bf6bc07 100644 --- a/target/linux/ixp4xx/patches-2.6.23/017-nas100d_auto_power_on.patch +++ b/target/linux/ixp4xx/patches-2.6.23/017-nas100d_auto_power_on.patch @@ -10,10 +10,10 @@ Also, update the board LED setup code to use constants. Signed-off-by: Rod Whitby <rod@whitby.id.au> -Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-power.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-power.c =================================================================== ---- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/nas100d-power.c 2008-01-11 16:59:20.000000000 +1030 -+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-power.c 2008-01-11 17:03:23.000000000 +1030 +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nas100d-power.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-power.c @@ -21,15 +21,61 @@ #include <linux/irq.h> #include <linux/module.h> @@ -80,7 +80,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-power.c return IRQ_HANDLED; } -@@ -39,17 +85,30 @@ +@@ -39,17 +85,30 @@ static int __init nas100d_power_init(voi if (!(machine_is_nas100d())) return 0; @@ -114,7 +114,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-power.c return 0; } -@@ -58,7 +117,9 @@ +@@ -58,7 +117,9 @@ static void __exit nas100d_power_exit(vo if (!(machine_is_nas100d())) return; @@ -125,10 +125,10 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-power.c } module_init(nas100d_power_init); -Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/nas100d.h +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/nas100d.h =================================================================== ---- linux-2.6.23.12-armeb.orig/include/asm-arm/arch-ixp4xx/nas100d.h 2008-01-11 16:59:20.000000000 +1030 -+++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/nas100d.h 2008-01-11 17:03:23.000000000 +1030 +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/nas100d.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/nas100d.h @@ -38,15 +38,15 @@ /* Buttons */ @@ -154,11 +154,11 @@ Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/nas100d.h +#define NAS100D_LED_WLAN_GPIO 0 +#define NAS100D_LED_DISK_GPIO 3 +#define NAS100D_LED_PWR_GPIO 15 -Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c =================================================================== ---- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-11 17:03:23.000000000 +1030 -+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-11 17:06:15.000000000 +1030 -@@ -44,20 +44,20 @@ +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c +@@ -42,20 +42,20 @@ static struct platform_device nas100d_fl static struct resource nas100d_led_resources[] = { { .name = "wlan", /* green led */ diff --git a/target/linux/ixp4xx/patches-2.6.23/020-ixp4xx_i2c_gpio.patch b/target/linux/ixp4xx/patches-2.6.23/020-ixp4xx_i2c_gpio.patch index b1b5612..89d3990 100644 --- a/target/linux/ixp4xx/patches-2.6.23/020-ixp4xx_i2c_gpio.patch +++ b/target/linux/ixp4xx/patches-2.6.23/020-ixp4xx_i2c_gpio.patch @@ -6,10 +6,10 @@ Tested by the nslu2-linux and openwrt projects in public firmware releases. Acked-by: Rod Whitby <rod@whitby.id.au> Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk> -Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nslu2-setup.c =================================================================== ---- linux-2.6.24-rc6-armeb.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2008-01-05 18:10:05.000000000 +1030 -+++ linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c 2008-01-05 18:10:10.000000000 +1030 +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nslu2-setup.c @@ -18,6 +18,7 @@ #include <linux/serial.h> #include <linux/serial_8250.h> @@ -18,7 +18,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c #include <asm/mach-types.h> #include <asm/mach/arch.h> -@@ -41,7 +42,7 @@ +@@ -41,7 +42,7 @@ static struct platform_device nslu2_flas .resource = &nslu2_flash_resource, }; @@ -27,7 +27,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c .sda_pin = NSLU2_SDA_PIN, .scl_pin = NSLU2_SCL_PIN, }; -@@ -82,11 +83,12 @@ +@@ -82,11 +83,12 @@ static struct platform_device nslu2_leds }; #endif @@ -44,7 +44,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c }; static struct platform_device nslu2_beeper = { -@@ -139,7 +141,7 @@ +@@ -139,7 +141,7 @@ static struct platform_device nslu2_uart }; static struct platform_device *nslu2_devices[] __initdata = { @@ -53,10 +53,10 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c &nslu2_flash, &nslu2_beeper, #ifdef CONFIG_LEDS_IXP4XX -Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c =================================================================== ---- linux-2.6.24-rc6-armeb.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-05 18:10:05.000000000 +1030 -+++ linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-05 18:10:10.000000000 +1030 +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c @@ -16,6 +16,7 @@ #include <linux/serial.h> #include <linux/serial_8250.h> @@ -65,7 +65,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c #include <asm/mach-types.h> #include <asm/mach/arch.h> -@@ -68,16 +69,17 @@ +@@ -68,16 +69,17 @@ static struct platform_device nas100d_le }; #endif @@ -88,7 +88,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c }; static struct resource nas100d_uart_resources[] = { -@@ -124,7 +126,7 @@ +@@ -124,7 +126,7 @@ static struct platform_device nas100d_ua }; static struct platform_device *nas100d_devices[] __initdata = { @@ -97,10 +97,10 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c &nas100d_flash, #ifdef CONFIG_LEDS_IXP4XX &nas100d_leds, -Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c =================================================================== ---- linux-2.6.24-rc6-armeb.orig/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-05 18:10:05.000000000 +1030 -+++ linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-05 18:10:10.000000000 +1030 +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c @@ -18,6 +18,7 @@ #include <linux/tty.h> #include <linux/serial_8250.h> @@ -109,7 +109,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/avila-setup.c #include <asm/types.h> #include <asm/setup.h> -@@ -47,18 +48,17 @@ +@@ -47,18 +48,17 @@ static struct platform_device avila_flas .resource = &avila_flash_resource, }; @@ -133,7 +133,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/avila-setup.c }; static struct resource avila_uart_resources[] = { -@@ -133,7 +133,7 @@ +@@ -133,7 +133,7 @@ static struct platform_device avila_pata }; static struct platform_device *avila_devices[] __initdata = { @@ -142,10 +142,10 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/avila-setup.c &avila_flash, &avila_uart }; -Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/dsmg600-setup.c =================================================================== ---- linux-2.6.24-rc6-armeb.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c 2008-01-05 18:10:05.000000000 +1030 -+++ linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c 2008-01-05 18:10:10.000000000 +1030 +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/dsmg600-setup.c @@ -14,6 +14,7 @@ #include <linux/kernel.h> #include <linux/serial.h> @@ -154,7 +154,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c #include <asm/mach-types.h> #include <asm/mach/arch.h> -@@ -37,15 +38,17 @@ +@@ -37,15 +38,17 @@ static struct platform_device dsmg600_fl .resource = &dsmg600_flash_resource, }; @@ -176,7 +176,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c }; #ifdef CONFIG_LEDS_CLASS -@@ -116,7 +119,7 @@ +@@ -116,7 +119,7 @@ static struct platform_device dsmg600_ua }; static struct platform_device *dsmg600_devices[] __initdata = { @@ -185,10 +185,10 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c &dsmg600_flash, }; -Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/ixdp425-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/ixdp425-setup.c =================================================================== ---- linux-2.6.24-rc6-armeb.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c 2008-01-05 18:10:05.000000000 +1030 -+++ linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/ixdp425-setup.c 2008-01-05 18:10:10.000000000 +1030 +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/ixdp425-setup.c @@ -15,6 +15,7 @@ #include <linux/tty.h> #include <linux/serial_8250.h> @@ -197,7 +197,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/ixdp425-setup.c #include <linux/io.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> -@@ -120,18 +121,17 @@ +@@ -120,18 +121,17 @@ static struct platform_device ixdp425_fl }; #endif /* CONFIG_MTD_NAND_PLATFORM */ @@ -221,7 +221,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/ixdp425-setup.c }; static struct resource ixdp425_uart_resources[] = { -@@ -178,7 +178,7 @@ +@@ -178,7 +178,7 @@ static struct platform_device ixdp425_ua }; static struct platform_device *ixdp425_devices[] __initdata = { diff --git a/target/linux/ixp4xx/patches-2.6.23/030-ixp4xx_fsg_board_support.patch b/target/linux/ixp4xx/patches-2.6.23/030-ixp4xx_fsg_board_support.patch index c133034..d3f2f94 100644 --- a/target/linux/ixp4xx/patches-2.6.23/030-ixp4xx_fsg_board_support.patch +++ b/target/linux/ixp4xx/patches-2.6.23/030-ixp4xx_fsg_board_support.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-pci.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/fsg-pci.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-pci.c 2008-01-11 17:06:33.000000000 +1030 +--- /dev/null ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/fsg-pci.c @@ -0,0 +1,71 @@ +/* + * arch/arch/mach-ixp4xx/fsg-pci.c @@ -74,10 +74,10 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-pci.c +} + +subsys_initcall(fsg_pci_init); -Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/fsg-setup.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-setup.c 2008-01-11 17:06:33.000000000 +1030 +--- /dev/null ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/fsg-setup.c @@ -0,0 +1,220 @@ +/* + * arch/arm/mach-ixp4xx/fsg-setup.c @@ -299,11 +299,11 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-setup.c + .init_machine = fsg_init, +MACHINE_END + -Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig =================================================================== ---- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/Kconfig 2008-01-11 17:05:08.000000000 +1030 -+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Kconfig 2008-01-11 17:06:33.000000000 +1030 -@@ -125,6 +125,15 @@ +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig +@@ -125,6 +125,15 @@ config ARCH_IXDP4XX depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435 default y @@ -319,11 +319,11 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Kconfig # # Certain registers and IRQs are only enabled if supporting IXP465 CPUs # -Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Makefile =================================================================== ---- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/Makefile 2008-01-11 17:05:08.000000000 +1030 -+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Makefile 2008-01-11 17:06:33.000000000 +1030 -@@ -15,6 +15,7 @@ +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.23.17/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 @@ -331,18 +331,17 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Makefile obj-y += common.o -@@ -28,6 +29,7 @@ +@@ -28,5 +29,6 @@ obj-$(CONFIG_MACH_NAS100D) += nas100d-se obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o +obj-$(CONFIG_MACH_FSG) += fsg-setup.o fsg-power.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o - obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/fsg.h +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/fsg.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/fsg.h 2008-01-11 17:06:33.000000000 +1030 +--- /dev/null ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/fsg.h @@ -0,0 +1,50 @@ +/* + * include/asm-arm/arch-ixp4xx/fsg.h @@ -394,10 +393,10 @@ Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/fsg.h +#define FSG_LED_USB_BIT 4 +#define FSG_LED_RING_BIT 5 +#define FSG_LED_SYNC_BIT 7 -Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/hardware.h +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/hardware.h =================================================================== ---- linux-2.6.23.12-armeb.orig/include/asm-arm/arch-ixp4xx/hardware.h 2008-01-11 17:05:08.000000000 +1030 -+++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/hardware.h 2008-01-11 17:06:33.000000000 +1030 +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/hardware.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/hardware.h @@ -45,5 +45,6 @@ #include "nslu2.h" #include "nas100d.h" @@ -405,10 +404,10 @@ Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/hardware.h +#include "fsg.h" #endif /* _ASM_ARCH_HARDWARE_H */ -Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/irqs.h +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/irqs.h =================================================================== ---- linux-2.6.23.12-armeb.orig/include/asm-arm/arch-ixp4xx/irqs.h 2008-01-11 17:05:08.000000000 +1030 -+++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/irqs.h 2008-01-11 17:06:33.000000000 +1030 +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/irqs.h ++++ linux-2.6.23.17/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 @@ -421,10 +420,10 @@ Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/irqs.h +#define IRQ_FSG_PCI_INTC IRQ_IXP4XX_GPIO5 + #endif -Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-power.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/fsg-power.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-power.c 2008-01-11 17:06:33.000000000 +1030 +--- /dev/null ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/fsg-power.c @@ -0,0 +1,89 @@ +/* + * arch/arm/mach-ixp4xx/fsg-power.c @@ -515,11 +514,11 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-power.c +MODULE_AUTHOR("Rod Whitby <rod@whitby.id.au>"); +MODULE_DESCRIPTION("FSG Power/Reset driver"); +MODULE_LICENSE("GPL"); -Index: linux-2.6.23.12-armeb/drivers/leds/Kconfig +Index: linux-2.6.23.17/drivers/leds/Kconfig =================================================================== ---- linux-2.6.23.12-armeb.orig/drivers/leds/Kconfig 2008-01-11 17:05:08.000000000 +1030 -+++ linux-2.6.23.12-armeb/drivers/leds/Kconfig 2008-01-11 17:06:33.000000000 +1030 -@@ -48,6 +48,12 @@ +--- linux-2.6.23.17.orig/drivers/leds/Kconfig ++++ linux-2.6.23.17/drivers/leds/Kconfig +@@ -48,6 +48,12 @@ config LEDS_IXP4XX particular board must have LEDs and they must be connected to the GPIO lines. If unsure, say Y. @@ -532,11 +531,11 @@ Index: linux-2.6.23.12-armeb/drivers/leds/Kconfig config LEDS_TOSA tristate "LED Support for the Sharp SL-6000 series" depends on LEDS_CLASS && PXA_SHARPSL -Index: linux-2.6.23.12-armeb/drivers/leds/Makefile +Index: linux-2.6.23.17/drivers/leds/Makefile =================================================================== ---- linux-2.6.23.12-armeb.orig/drivers/leds/Makefile 2008-01-11 17:05:08.000000000 +1030 -+++ linux-2.6.23.12-armeb/drivers/leds/Makefile 2008-01-11 17:06:33.000000000 +1030 -@@ -9,6 +9,7 @@ +--- linux-2.6.23.17.orig/drivers/leds/Makefile ++++ linux-2.6.23.17/drivers/leds/Makefile +@@ -9,6 +9,7 @@ obj-$(CONFIG_LEDS_CORGI) += leds-corgi. obj-$(CONFIG_LEDS_LOCOMO) += leds-locomo.o obj-$(CONFIG_LEDS_SPITZ) += leds-spitz.o obj-$(CONFIG_LEDS_IXP4XX) += leds-ixp4xx-gpio.o @@ -544,10 +543,10 @@ Index: linux-2.6.23.12-armeb/drivers/leds/Makefile obj-$(CONFIG_LEDS_TOSA) += leds-tosa.o obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c24xx.o obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o -Index: linux-2.6.23.12-armeb/drivers/leds/leds-fsg.c +Index: linux-2.6.23.17/drivers/leds/leds-fsg.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23.12-armeb/drivers/leds/leds-fsg.c 2008-01-11 17:06:33.000000000 +1030 +--- /dev/null ++++ linux-2.6.23.17/drivers/leds/leds-fsg.c @@ -0,0 +1,243 @@ +/* + * LED Driver for the Freecom FSG-3 diff --git a/target/linux/ixp4xx/patches-2.6.23/031-ixp4xx-net-drivers-nslu2.patch b/target/linux/ixp4xx/patches-2.6.23/031-ixp4xx-net-drivers-nslu2.patch index d4c710c..cd500a5 100644 --- a/target/linux/ixp4xx/patches-2.6.23/031-ixp4xx-net-drivers-nslu2.patch +++ b/target/linux/ixp4xx/patches-2.6.23/031-ixp4xx-net-drivers-nslu2.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nslu2-setup.c =================================================================== ---- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2008-01-08 15:28:13.000000000 +1030 -+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c 2008-01-08 15:28:32.000000000 +1030 +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nslu2-setup.c @@ -24,6 +24,7 @@ #include <asm/mach/arch.h> #include <asm/mach/flash.h> @@ -10,7 +10,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c static struct flash_platform_data nslu2_flash_data = { .map_name = "cfi_probe", -@@ -140,6 +141,23 @@ +@@ -140,6 +141,23 @@ static struct platform_device nslu2_uart .resource = nslu2_uart_resources, }; @@ -34,7 +34,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c static struct platform_device *nslu2_devices[] __initdata = { &nslu2_i2c_gpio, &nslu2_flash, -@@ -147,6 +165,7 @@ +@@ -147,6 +165,7 @@ static struct platform_device *nslu2_dev #ifdef CONFIG_LEDS_IXP4XX &nslu2_leds, #endif @@ -42,7 +42,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c }; static void nslu2_power_off(void) -@@ -175,6 +194,9 @@ +@@ -175,6 +194,9 @@ static struct sys_timer nslu2_timer = { static void __init nslu2_init(void) { @@ -52,7 +52,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c ixp4xx_sys_init(); nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -@@ -191,6 +213,33 @@ +@@ -191,6 +213,33 @@ static void __init nslu2_init(void) (void)platform_device_register(&nslu2_uart); platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); diff --git a/target/linux/ixp4xx/patches-2.6.23/032-ixp4xx-net-drivers-nas100d.patch b/target/linux/ixp4xx/patches-2.6.23/032-ixp4xx-net-drivers-nas100d.patch index 1434733..656c83e 100644 --- a/target/linux/ixp4xx/patches-2.6.23/032-ixp4xx-net-drivers-nas100d.patch +++ b/target/linux/ixp4xx/patches-2.6.23/032-ixp4xx-net-drivers-nas100d.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c =================================================================== ---- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-08 15:22:07.000000000 +1030 -+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-08 15:32:32.000000000 +1030 +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c @@ -21,6 +21,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -10,7 +10,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c static struct flash_platform_data nas100d_flash_data = { .map_name = "cfi_probe", -@@ -125,12 +126,30 @@ +@@ -125,12 +126,30 @@ static struct platform_device nas100d_ua .resource = nas100d_uart_resources, }; @@ -41,7 +41,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c }; static void nas100d_power_off(void) -@@ -146,6 +165,9 @@ +@@ -146,6 +165,9 @@ static void nas100d_power_off(void) static void __init nas100d_init(void) { @@ -51,7 +51,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c ixp4xx_sys_init(); /* gpio 14 and 15 are _not_ clocks */ -@@ -165,6 +187,33 @@ +@@ -165,6 +187,33 @@ static void __init nas100d_init(void) (void)platform_device_register(&nas100d_uart); platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices)); diff --git a/target/linux/ixp4xx/patches-2.6.23/090-increase_entropy_pools.patch b/target/linux/ixp4xx/patches-2.6.23/090-increase_entropy_pools.patch index 9a322a7..333f481 100644 --- a/target/linux/ixp4xx/patches-2.6.23/090-increase_entropy_pools.patch +++ b/target/linux/ixp4xx/patches-2.6.23/090-increase_entropy_pools.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.19/drivers/char/random.c +Index: linux-2.6.23.17/drivers/char/random.c =================================================================== ---- linux-2.6.19.orig/drivers/char/random.c -+++ linux-2.6.19/drivers/char/random.c +--- linux-2.6.23.17.orig/drivers/char/random.c ++++ linux-2.6.23.17/drivers/char/random.c @@ -248,9 +248,9 @@ /* * Configuration information diff --git a/target/linux/ixp4xx/patches-2.6.23/091-nslu2_rtc_fixup.patch b/target/linux/ixp4xx/patches-2.6.23/091-nslu2_rtc_fixup.patch index 49ca1e2..0facc59 100644 --- a/target/linux/ixp4xx/patches-2.6.23/091-nslu2_rtc_fixup.patch +++ b/target/linux/ixp4xx/patches-2.6.23/091-nslu2_rtc_fixup.patch @@ -1,15 +1,16 @@ -diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/nslu2-setup.c linux-2.6.23/arch/arm/mach-ixp4xx/nslu2-setup.c ---- linux-2.6.23.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-10-11 01:04:46.000000000 -0500 -@@ -19,6 +19,7 @@ - #include <linux/serial_8250.h> +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nslu2-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nslu2-setup.c +@@ -20,6 +20,7 @@ #include <linux/leds.h> + #include <linux/i2c-gpio.h> +#include <asm/setup.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> -@@ -171,6 +172,35 @@ static struct sys_timer nslu2_timer = { +@@ -192,6 +193,35 @@ static struct sys_timer nslu2_timer = { .init = nslu2_timer_init, }; @@ -44,8 +45,8 @@ diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/nslu2-setup.c linux-2.6.23/arc + static void __init nslu2_init(void) { - ixp4xx_sys_init(); -@@ -196,6 +226,7 @@ MACHINE_START(NSLU2, "Linksys NSLU2") + uint8_t __iomem *f; +@@ -247,6 +277,7 @@ MACHINE_START(NSLU2, "Linksys NSLU2") .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, .boot_params = 0x00000100, diff --git a/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch b/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch index a6fda86..00a51bc 100644 --- a/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch +++ b/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch @@ -1,15 +1,16 @@ -diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/nas100d-setup.c linux-2.6.23/arch/arm/mach-ixp4xx/nas100d-setup.c ---- linux-2.6.23.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-10-11 01:06:33.000000000 -0500 -@@ -17,6 +17,7 @@ - #include <linux/serial_8250.h> +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c +@@ -18,6 +18,7 @@ #include <linux/leds.h> + #include <linux/i2c-gpio.h> +#include <asm/setup.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> -@@ -142,6 +143,35 @@ static void nas100d_power_off(void) +@@ -163,6 +164,35 @@ static void nas100d_power_off(void) gpio_line_set(NAS100D_PO_GPIO, IXP4XX_GPIO_HIGH); } @@ -44,8 +45,8 @@ diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/nas100d-setup.c linux-2.6.23/a + static void __init nas100d_init(void) { - ixp4xx_sys_init(); -@@ -170,6 +200,7 @@ MACHINE_START(NAS100D, "Iomega NAS 100d" + uint8_t __iomem *f; +@@ -221,6 +251,7 @@ MACHINE_START(NAS100D, "Iomega NAS 100d" .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, .boot_params = 0x00000100, diff --git a/target/linux/ixp4xx/patches-2.6.23/095-dsmg600_rtc_fixup.patch b/target/linux/ixp4xx/patches-2.6.23/095-dsmg600_rtc_fixup.patch index 3d13501..b46c294 100644 --- a/target/linux/ixp4xx/patches-2.6.23/095-dsmg600_rtc_fixup.patch +++ b/target/linux/ixp4xx/patches-2.6.23/095-dsmg600_rtc_fixup.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.22-rc4-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/dsmg600-setup.c =================================================================== ---- linux-2.6.22-rc4-armeb.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c -+++ linux-2.6.22-rc4-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/dsmg600-setup.c @@ -16,6 +16,7 @@ #include <linux/serial_8250.h> #include <linux/i2c-gpio.h> diff --git a/target/linux/ixp4xx/patches-2.6.23/096-kexec_cmdline.patch b/target/linux/ixp4xx/patches-2.6.23/096-kexec_cmdline.patch index 45ca203..d27a785 100644 --- a/target/linux/ixp4xx/patches-2.6.23/096-kexec_cmdline.patch +++ b/target/linux/ixp4xx/patches-2.6.23/096-kexec_cmdline.patch @@ -1,6 +1,7 @@ -diff -uprN linux-2.6.23.orig/kernel/ksysfs.c linux-2.6.23/kernel/ksysfs.c ---- linux-2.6.23.orig/kernel/ksysfs.c 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/kernel/ksysfs.c 2007-10-11 01:10:26.000000000 -0500 +Index: linux-2.6.23.17/kernel/ksysfs.c +=================================================================== +--- linux-2.6.23.17.orig/kernel/ksysfs.c ++++ linux-2.6.23.17/kernel/ksysfs.c @@ -49,6 +49,165 @@ KERNEL_ATTR_RW(uevent_helper); #endif diff --git a/target/linux/ixp4xx/patches-2.6.23/100-gateway7001_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/100-gateway7001_mac_plat_info.patch index c7169ce..915e501 100644 --- a/target/linux/ixp4xx/patches-2.6.23/100-gateway7001_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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.23.17/arch/arm/mach-ixp4xx/gateway7001-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c ++++ linux-2.6.23.17/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.23/101-wg302_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/101-wg302_mac_plat_info.patch index 5209e72..af638b0 100644 --- a/target/linux/ixp4xx/patches-2.6.23/101-wg302_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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.23.17/arch/arm/mach-ixp4xx/wg302v2-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c ++++ linux-2.6.23.17/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.23/110-pronghorn_metro_support.patch b/target/linux/ixp4xx/patches-2.6.23/110-pronghorn_metro_support.patch index 80115b8..1d6baae 100644 --- a/target/linux/ixp4xx/patches-2.6.23/110-pronghorn_metro_support.patch +++ b/target/linux/ixp4xx/patches-2.6.23/110-pronghorn_metro_support.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23.12/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig =================================================================== ---- linux-2.6.23.12.orig/arch/arm/mach-ixp4xx/Kconfig 2008-01-05 13:30:14.000000000 +1030 -+++ linux-2.6.23.12/arch/arm/mach-ixp4xx/Kconfig 2008-01-05 13:37:05.000000000 +1030 -@@ -57,6 +57,14 @@ +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.23.17/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.23.12/arch/arm/mach-ixp4xx/Kconfig config ARCH_IXDP425 bool "IXDP425" help -Index: linux-2.6.23.12/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Makefile =================================================================== ---- linux-2.6.23.12.orig/arch/arm/mach-ixp4xx/Makefile 2008-01-05 13:32:45.000000000 +1030 -+++ linux-2.6.23.12/arch/arm/mach-ixp4xx/Makefile 2008-01-05 13:37:37.000000000 +1030 -@@ -16,6 +16,7 @@ +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.23.17/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,17 @@ Index: linux-2.6.23.12/arch/arm/mach-ixp4xx/Makefile obj-y += common.o -@@ -30,5 +31,6 @@ +@@ -30,5 +31,6 @@ 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 fsg-power.o +obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o -Index: linux-2.6.23.12/arch/arm/mach-ixp4xx/pronghornmetro-pci.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/pronghornmetro-pci.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23.12/arch/arm/mach-ixp4xx/pronghornmetro-pci.c 2008-01-05 13:37:05.000000000 +1030 +--- /dev/null ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/pronghornmetro-pci.c @@ -0,0 +1,74 @@ +/* + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c @@ -115,10 +115,10 @@ Index: linux-2.6.23.12/arch/arm/mach-ixp4xx/pronghornmetro-pci.c +} + +subsys_initcall(pronghornmetro_pci_init); -Index: linux-2.6.23.12/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/pronghornmetro-setup.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23.12/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2008-01-05 13:37:05.000000000 +1030 +--- /dev/null ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/pronghornmetro-setup.c @@ -0,0 +1,147 @@ +/* + * arch/arm/mach-ixp4xx/pronghornmetro-setup.c @@ -267,11 +267,11 @@ Index: linux-2.6.23.12/arch/arm/mach-ixp4xx/pronghornmetro-setup.c + .init_machine = pronghornmetro_init, +MACHINE_END +#endif -Index: linux-2.6.23.12/Documentation/arm/IXP4xx +Index: linux-2.6.23.17/Documentation/arm/IXP4xx =================================================================== ---- linux-2.6.23.12.orig/Documentation/arm/IXP4xx 2008-01-05 13:30:14.000000000 +1030 -+++ linux-2.6.23.12/Documentation/arm/IXP4xx 2008-01-05 13:37:05.000000000 +1030 -@@ -111,6 +111,9 @@ +--- linux-2.6.23.17.orig/Documentation/arm/IXP4xx ++++ linux-2.6.23.17/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 +281,11 @@ Index: linux-2.6.23.12/Documentation/arm/IXP4xx Gateworks Avila Network Platform http://www.gateworks.com/avila_sbc.htm -Index: linux-2.6.23.12/include/asm-arm/arch-ixp4xx/uncompress.h +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/uncompress.h =================================================================== ---- linux-2.6.23.12.orig/include/asm-arm/arch-ixp4xx/uncompress.h 2008-01-05 13:30:14.000000000 +1030 -+++ linux-2.6.23.12/include/asm-arm/arch-ixp4xx/uncompress.h 2008-01-05 13:37:05.000000000 +1030 -@@ -41,7 +41,8 @@ +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.23.17/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.23/111-pronghorn_metro_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/111-pronghorn_metro_mac_plat_info.patch index 2fb3769..50e93da 100644 --- a/target/linux/ixp4xx/patches-2.6.23/111-pronghorn_metro_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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.23.17/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ++++ linux-2.6.23.17/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.23/120-compex_support.patch b/target/linux/ixp4xx/patches-2.6.23/120-compex_support.patch index 2488cb4..a51225b 100644 --- a/target/linux/ixp4xx/patches-2.6.23/120-compex_support.patch +++ b/target/linux/ixp4xx/patches-2.6.23/120-compex_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 18:03:34.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-10-23 18:22:41.000000000 +0200 -@@ -65,6 +65,14 @@ +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.23.17/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,10 +17,11 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/m config ARCH_IXDP425 bool "IXDP425" help -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 18:03:34.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile 2007-10-23 18:22:41.000000000 +0200 -@@ -17,6 +17,7 @@ +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.23.17/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 @@ -27,17 +29,17 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/ obj-y += common.o -@@ -32,6 +33,7 @@ +@@ -32,5 +33,6 @@ obj-$(CONFIG_MACH_GATEWAY7001) += gatewa obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o - obj-$(CONFIG_MACH_FSG) += fsg-setup.o + obj-$(CONFIG_MACH_FSG) += fsg-setup.o fsg-power.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 - obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -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 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-10-23 18:22:41.000000000 +0200 +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/compex-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/compex-setup.c @@ -0,0 +1,120 @@ +/* + * arch/arm/mach-ixp4xx/compex-setup.c @@ -159,10 +161,11 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.23-owrt/arc + .init_machine = compex_init, +MACHINE_END +#endif -diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c ---- linux-2.6.23/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-10-23 18:22:41.000000000 +0200 -@@ -66,7 +66,7 @@ +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/ixdp425-pci.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c ++++ linux-2.6.23.17/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() || @@ -171,10 +174,11 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.23-owrt/arch pci_common_init(&ixdp425_pci); return 0; } -diff -Nur linux-2.6.23/arch/arm/tools/mach-types linux-2.6.23-owrt/arch/arm/tools/mach-types ---- linux-2.6.23/arch/arm/tools/mach-types 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/tools/mach-types 2007-10-23 18:22:41.000000000 +0200 -@@ -1278,7 +1278,7 @@ +Index: linux-2.6.23.17/arch/arm/tools/mach-types +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/tools/mach-types ++++ linux-2.6.23.17/arch/arm/tools/mach-types +@@ -1278,7 +1278,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.23/121-compex_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/121-compex_mac_plat_info.patch index 081349a..f7ff461 100644 --- a/target/linux/ixp4xx/patches-2.6.23/121-compex_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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.23.17/arch/arm/mach-ixp4xx/compex-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/compex-setup.c ++++ linux-2.6.23.17/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.23/130-wrt300nv2_support.patch b/target/linux/ixp4xx/patches-2.6.23/130-wrt300nv2_support.patch index 78e525d..1dcc85b 100644 --- a/target/linux/ixp4xx/patches-2.6.23/130-wrt300nv2_support.patch +++ b/target/linux/ixp4xx/patches-2.6.23/130-wrt300nv2_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 18:39:29.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-10-23 19:11:31.000000000 +0200 -@@ -73,6 +73,14 @@ +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.23.17/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 @@ -16,10 +17,11 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/m config ARCH_IXDP425 bool "IXDP425" help -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 18:39:29.000000000 +0200 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile 2007-10-23 19:11:31.000000000 +0200 -@@ -18,6 +18,7 @@ +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.23.17/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 @@ -27,17 +29,17 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/ obj-y += common.o -@@ -34,6 +35,7 @@ - obj-$(CONFIG_MACH_FSG) += fsg-setup.o +@@ -34,5 +35,6 @@ obj-$(CONFIG_MACH_WG302V2) += wg302v2-se + obj-$(CONFIG_MACH_FSG) += fsg-setup.o fsg-power.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 - obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/wrt300nv2-pci.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wrt300nv2-pci.c ---- linux-2.6.23/arch/arm/mach-ixp4xx/wrt300nv2-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wrt300nv2-pci.c 2007-10-23 19:11:31.000000000 +0200 +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/wrt300nv2-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/wrt300nv2-pci.c @@ -0,0 +1,65 @@ +/* + * arch/arch/mach-ixp4xx/wrt300nv2-pci.c @@ -104,9 +106,10 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/wrt300nv2-pci.c linux-2.6.23-owrt/ar +} + +subsys_initcall(wrt300nv2_pci_init); -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 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-10-23 19:11:31.000000000 +0200 +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/wrt300nv2-setup.c @@ -0,0 +1,108 @@ +/* + * arch/arm/mach-ixp4xx/wrt300nv2-setup.c @@ -216,10 +219,11 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/wrt300nv2-setup.c linux-2.6.23-owrt/ + .init_machine = wrt300nv2_init, +MACHINE_END +#endif -diff -Nur linux-2.6.23/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.23-owrt/include/asm-arm/arch-ixp4xx/uncompress.h ---- linux-2.6.23/include/asm-arm/arch-ixp4xx/uncompress.h 2007-10-23 18:03:35.000000000 +0200 -+++ linux-2.6.23-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2007-10-23 19:12:30.000000000 +0200 -@@ -42,7 +42,7 @@ +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/uncompress.h +=================================================================== +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.23.17/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.23/131-wrt300nv2_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/131-wrt300nv2_mac_plat_info.patch index 24dad0a..c4e52f9 100644 --- a/target/linux/ixp4xx/patches-2.6.23/131-wrt300nv2_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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.23.17/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c ++++ linux-2.6.23.17/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.23/140-sidewinder_support.patch b/target/linux/ixp4xx/patches-2.6.23/140-sidewinder_support.patch index a83c421..024eb61 100644 --- a/target/linux/ixp4xx/patches-2.6.23/140-sidewinder_support.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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.23.17/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.23.17/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.23.17/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.23.17/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,17 +38,17 @@ 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,5 +37,6 @@ obj-$(CONFIG_MACH_FSG) += fsg-setup.o f obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o +obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o 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.23.17/arch/arm/mach-ixp4xx/sidewinder-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/sidewinder-pci.c @@ -0,0 +1,71 @@ +/* + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c @@ -119,9 +121,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.23.17/arch/arm/mach-ixp4xx/sidewinder-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.23.17/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.23/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-2.6.23/150-lanready_ap1000_support.patch index 4070da1..8e0bf60 100644 --- a/target/linux/ixp4xx/patches-2.6.23/150-lanready_ap1000_support.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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.23.17/arch/arm/mach-ixp4xx/ap1000-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.23.17/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.23.17/arch/arm/mach-ixp4xx/ixdp425-pci.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c ++++ linux-2.6.23.17/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.23.17/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.23.17/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.23.17/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.23.17/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,17 +199,18 @@ 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,5 +39,6 @@ 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 -diff -Nur linux-2.6.23.1/arch/arm/tools/mach-types linux-2.6.23.1-owrt/arch/arm/tools/mach-types ---- linux-2.6.23.1/arch/arm/tools/mach-types 2007-11-14 13:15:50.000000000 +0100 -+++ linux-2.6.23.1-owrt/arch/arm/tools/mach-types 2007-11-14 13:26:06.000000000 +0100 -@@ -1367,3 +1367,4 @@ +Index: linux-2.6.23.17/arch/arm/tools/mach-types +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/tools/mach-types ++++ linux-2.6.23.17/arch/arm/tools/mach-types +@@ -1367,3 +1367,4 @@ db88f5281 MACH_DB88F5281 DB88F5281 13 csb726 MACH_CSB726 CSB726 1359 tik27 MACH_TIK27 TIK27 1360 mx_uc7420 MACH_MX_UC7420 MX_UC7420 1361 diff --git a/target/linux/ixp4xx/patches-2.6.23/151-lanready_ap1000_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/151-lanready_ap1000_mac_plat_info.patch index 4259ff9..7ad022d 100644 --- a/target/linux/ixp4xx/patches-2.6.23/151-lanready_ap1000_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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,36 @@ +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/ap1000-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/ap1000-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/ap1000-setup.c +@@ -90,9 +90,36 @@ static struct platform_device ap1000_uar .resource = ap1000_uart_resources }; diff --git a/target/linux/ixp4xx/patches-2.6.23/160-wg302v1_support.patch b/target/linux/ixp4xx/patches-2.6.23/160-wg302v1_support.patch index 129e5ca..590a751 100644 --- a/target/linux/ixp4xx/patches-2.6.23/160-wg302v1_support.patch +++ b/target/linux/ixp4xx/patches-2.6.23/160-wg302v1_support.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/Kconfig ---- linux-2.6.23.12/arch/arm/mach-ixp4xx/Kconfig 2008-01-14 22:08:42.000000000 +0100 -+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/Kconfig 2008-01-14 22:12:21.000000000 +0100 -@@ -49,6 +49,14 @@ +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.23.17/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 @@ -16,10 +17,11 @@ diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23.12-owrt/arch config MACH_WG302V2 bool "Netgear WG302 v2 / WAG302 v2" select PCI -diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/Makefile linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/Makefile ---- linux-2.6.23.12/arch/arm/mach-ixp4xx/Makefile 2008-01-14 22:08:42.000000000 +0100 -+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/Makefile 2008-01-14 22:11:47.000000000 +0100 -@@ -14,6 +14,7 @@ +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.23.17/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 @@ -27,7 +29,7 @@ diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/Makefile linux-2.6.23.12-owrt/arc 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 @@ +@@ -33,6 +34,7 @@ obj-$(CONFIG_MACH_NSLU2) += nslu2-setup. obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o @@ -35,9 +37,10 @@ diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/Makefile linux-2.6.23.12-owrt/arc obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o fsg-power.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o -diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-pci.c linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-pci.c ---- linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-pci.c 2008-01-14 22:33:52.000000000 +0100 +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/wg302v1-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/wg302v1-pci.c @@ -0,0 +1,63 @@ +/* + * arch/arch/mach-ixp4xx/wg302v1-pci.c @@ -102,9 +105,10 @@ diff -Nur linux-2.6.23.12/arch/arm/mach-ixp4xx/wg302v1-pci.c linux-2.6.23.12-owr +} + +subsys_initcall(wg302v1_pci_init); -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 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.23.12-owrt/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-01-14 23:04:01.000000000 +0100 +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/wg302v1-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.23.17/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.23/161-wg302v1_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/161-wg302v1_mac_plat_info.patch index 250d85e..608f036 100644 --- a/target/linux/ixp4xx/patches-2.6.23/161-wg302v1_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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.23.17/arch/arm/mach-ixp4xx/wg302v1-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c ++++ linux-2.6.23.17/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.23/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-2.6.23/162-wg302v1_mem_fixup.patch index b370088..71a2e7f 100644 --- a/target/linux/ixp4xx/patches-2.6.23/162-wg302v1_mem_fixup.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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.23.17/arch/arm/mach-ixp4xx/wg302v1-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c ++++ linux-2.6.23.17/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.23/200-npe_driver.patch b/target/linux/ixp4xx/patches-2.6.23/200-npe_driver.patch index 8be7af7..6e9aaa9 100644 --- a/target/linux/ixp4xx/patches-2.6.23/200-npe_driver.patch +++ b/target/linux/ixp4xx/patches-2.6.23/200-npe_driver.patch @@ -1,8 +1,8 @@ -diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c -index 4de432e..c4c810b 100644 ---- a/arch/arm/kernel/setup.c -+++ b/arch/arm/kernel/setup.c -@@ -61,6 +61,7 @@ extern int root_mountflags; +Index: linux-2.6.23.17/arch/arm/kernel/setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/kernel/setup.c ++++ linux-2.6.23.17/arch/arm/kernel/setup.c +@@ -62,6 +62,7 @@ extern int root_mountflags; extern void _stext, _text, _etext, __data_start, _edata, _end; unsigned int processor_id; @@ -10,11 +10,11 @@ index 4de432e..c4c810b 100644 unsigned int __machine_arch_type; EXPORT_SYMBOL(__machine_arch_type); -diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig -index 61b2dfc..e774447 100644 ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -189,6 +189,20 @@ config IXP4XX_INDIRECT_PCI +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig +@@ -246,6 +246,20 @@ config IXP4XX_INDIRECT_PCI need to use the indirect method instead. If you don't know what you need, leave this option unselected. @@ -35,21 +35,21 @@ index 61b2dfc..e774447 100644 endmenu endif -diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile -index 77e00ad..4bb97e1 100644 ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -30,3 +30,5 @@ obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o - obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Makefile +@@ -44,3 +44,5 @@ obj-$(CONFIG_MACH_SIDEWINDER) += sidewin + obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o +obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o +obj-$(CONFIG_IXP4XX_NPE) += ixp4xx_npe.o -diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c -index d5008d8..10b41c6 100644 ---- a/arch/arm/mach-ixp4xx/ixdp425-setup.c -+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c -@@ -177,6 +177,31 @@ static struct platform_device ixdp425_uart = { +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/ixdp425-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/ixdp425-setup.c +@@ -177,6 +177,31 @@ static struct platform_device ixdp425_ua .resource = ixdp425_uart_resources }; @@ -79,9 +79,9 @@ index d5008d8..10b41c6 100644 +}; + static struct platform_device *ixdp425_devices[] __initdata = { - &ixdp425_i2c_controller, + &ixdp425_i2c_gpio, &ixdp425_flash, -@@ -184,7 +209,9 @@ static struct platform_device *ixdp425_devices[] __initdata = { +@@ -184,7 +209,9 @@ static struct platform_device *ixdp425_d defined(CONFIG_MTD_NAND_PLATFORM_MODULE) &ixdp425_flash_nand, #endif @@ -92,11 +92,10 @@ index d5008d8..10b41c6 100644 }; static void __init ixdp425_init(void) -diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c -new file mode 100644 -index 0000000..83c137e +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/ixp4xx_npe.c +=================================================================== --- /dev/null -+++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/ixp4xx_npe.c @@ -0,0 +1,741 @@ +/* + * Intel IXP4xx Network Processor Engine driver for Linux @@ -839,11 +838,10 @@ index 0000000..83c137e +EXPORT_SYMBOL(npe_send_message); +EXPORT_SYMBOL(npe_recv_message); +EXPORT_SYMBOL(npe_send_recv_message); -diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c -new file mode 100644 -index 0000000..e833013 +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c +=================================================================== --- /dev/null -+++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c @@ -0,0 +1,274 @@ +/* + * Intel IXP4xx Queue Manager driver for Linux @@ -1119,10 +1117,10 @@ index 0000000..e833013 +EXPORT_SYMBOL(qmgr_disable_irq); +EXPORT_SYMBOL(qmgr_request_queue); +EXPORT_SYMBOL(qmgr_release_queue); -diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig -index f9cc2b6..9274d3f 100644 ---- a/drivers/net/arm/Kconfig -+++ b/drivers/net/arm/Kconfig +Index: linux-2.6.23.17/drivers/net/arm/Kconfig +=================================================================== +--- linux-2.6.23.17.orig/drivers/net/arm/Kconfig ++++ linux-2.6.23.17/drivers/net/arm/Kconfig @@ -47,3 +47,13 @@ config EP93XX_ETH help This is a driver for the ethernet hardware included in EP93xx CPUs. @@ -1137,20 +1135,19 @@ index f9cc2b6..9274d3f 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.23.17/drivers/net/arm/Makefile +=================================================================== +--- linux-2.6.23.17.orig/drivers/net/arm/Makefile ++++ linux-2.6.23.17/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..2c23f50 +Index: linux-2.6.23.17/drivers/net/arm/ixp4xx_eth.c +=================================================================== --- /dev/null -+++ b/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.23.17/drivers/net/arm/ixp4xx_eth.c @@ -0,0 +1,1259 @@ +/* + * Intel IXP4xx Ethernet driver for Linux @@ -2411,10 +2408,10 @@ index 0000000..2c23f50 +MODULE_LICENSE("GPL v2"); +module_init(eth_init_module); +module_exit(eth_cleanup_module); -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 +Index: linux-2.6.23.17/drivers/net/wan/Kconfig +=================================================================== +--- linux-2.6.23.17.orig/drivers/net/wan/Kconfig ++++ linux-2.6.23.17/drivers/net/wan/Kconfig @@ -334,6 +334,15 @@ config DSCC4_PCI_RST Say Y if your card supports this feature. @@ -2431,10 +2428,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.23.17/drivers/net/wan/Makefile +=================================================================== +--- linux-2.6.23.17.orig/drivers/net/wan/Makefile ++++ linux-2.6.23.17/drivers/net/wan/Makefile @@ -42,6 +42,7 @@ obj-$(CONFIG_C101) += c101.o obj-$(CONFIG_WANXL) += wanxl.o obj-$(CONFIG_PCI200SYN) += pci200syn.o @@ -2443,11 +2440,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..c4cdace +Index: linux-2.6.23.17/drivers/net/wan/ixp4xx_hss.c +=================================================================== --- /dev/null -+++ b/drivers/net/wan/ixp4xx_hss.c ++++ linux-2.6.23.17/drivers/net/wan/ixp4xx_hss.c @@ -0,0 +1,1270 @@ +/* + * Intel IXP4xx HSS (synchronous serial port) driver for Linux @@ -3719,10 +3715,10 @@ index 0000000..c4cdace +MODULE_LICENSE("GPL v2"); +module_init(hss_init_module); +module_exit(hss_cleanup_module); -diff --git a/include/asm-arm/arch-ixp4xx/cpu.h b/include/asm-arm/arch-ixp4xx/cpu.h -index d2523b3..2fa3d6b 100644 ---- a/include/asm-arm/arch-ixp4xx/cpu.h -+++ b/include/asm-arm/arch-ixp4xx/cpu.h +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/cpu.h +=================================================================== +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/cpu.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/cpu.h @@ -28,4 +28,19 @@ extern unsigned int processor_id; #define cpu_is_ixp46x() ((processor_id & IXP4XX_PROCESSOR_ID_MASK) == \ IXP465_PROCESSOR_ID_VALUE) @@ -3743,10 +3739,10 @@ index d2523b3..2fa3d6b 100644 +} + #endif /* _ASM_ARCH_CPU_H */ -diff --git a/include/asm-arm/arch-ixp4xx/hardware.h b/include/asm-arm/arch-ixp4xx/hardware.h -index 297ceda..73e8dc3 100644 ---- a/include/asm-arm/arch-ixp4xx/hardware.h -+++ b/include/asm-arm/arch-ixp4xx/hardware.h +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/hardware.h +=================================================================== +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/hardware.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/hardware.h @@ -27,13 +27,13 @@ #define pcibios_assign_all_busses() 1 @@ -3764,10 +3760,10 @@ index 297ceda..73e8dc3 100644 /* Platform helper functions and definitions */ #include "platform.h" -diff --git a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h -index 5d949d7..c704fe8 100644 ---- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h -+++ b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +=================================================================== +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h @@ -15,10 +15,6 @@ * */ @@ -3816,11 +3812,10 @@ index 5d949d7..c704fe8 100644 + IXP4XX_FEATURE_XSCALE_MAX_FREQ) + #endif -diff --git a/include/asm-arm/arch-ixp4xx/npe.h b/include/asm-arm/arch-ixp4xx/npe.h -new file mode 100644 -index 0000000..37d0511 +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/npe.h +=================================================================== --- /dev/null -+++ b/include/asm-arm/arch-ixp4xx/npe.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/npe.h @@ -0,0 +1,39 @@ +#ifndef __IXP4XX_NPE_H +#define __IXP4XX_NPE_H @@ -3861,11 +3856,11 @@ index 0000000..37d0511 +void npe_release(struct npe *npe); + +#endif /* __IXP4XX_NPE_H */ -diff --git a/include/asm-arm/arch-ixp4xx/platform.h b/include/asm-arm/arch-ixp4xx/platform.h -index 2a44d3d..695b9c4 100644 ---- a/include/asm-arm/arch-ixp4xx/platform.h -+++ b/include/asm-arm/arch-ixp4xx/platform.h -@@ -77,8 +77,7 @@ extern unsigned long ixp4xx_exp_bus_size; +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/platform.h +=================================================================== +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/platform.h +@@ -77,8 +77,7 @@ extern unsigned long ixp4xx_exp_bus_size /* * The IXP4xx chips do not have an I2C unit, so GPIO lines are just @@ -3903,11 +3898,10 @@ index 2a44d3d..695b9c4 100644 /* * This structure provide a means for the board setup code * to give information to th pata_ixp4xx driver. It is -diff --git a/include/asm-arm/arch-ixp4xx/qmgr.h b/include/asm-arm/arch-ixp4xx/qmgr.h -new file mode 100644 -index 0000000..1e52b95 +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/qmgr.h +=================================================================== --- /dev/null -+++ b/include/asm-arm/arch-ixp4xx/qmgr.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/qmgr.h @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2007 Krzysztof Halasa <khc@pm.waw.pl> @@ -4035,10 +4029,10 @@ index 0000000..1e52b95 +} + +#endif -diff --git a/include/asm-arm/arch-ixp4xx/uncompress.h b/include/asm-arm/arch-ixp4xx/uncompress.h -index f7a35b7..34ef48f 100644 ---- a/include/asm-arm/arch-ixp4xx/uncompress.h -+++ b/include/asm-arm/arch-ixp4xx/uncompress.h +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/uncompress.h +=================================================================== +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/uncompress.h @@ -13,7 +13,7 @@ #ifndef _ARCH_UNCOMPRESS_H_ #define _ARCH_UNCOMPRESS_H_ diff --git a/target/linux/ixp4xx/patches-2.6.23/201-npe_driver_print_license_location.patch b/target/linux/ixp4xx/patches-2.6.23/201-npe_driver_print_license_location.patch index fad4033..c986227 100644 --- a/target/linux/ixp4xx/patches-2.6.23/201-npe_driver_print_license_location.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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.23.17/arch/arm/mach-ixp4xx/ixp4xx_npe.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/ixp4xx_npe.c +@@ -588,6 +588,8 @@ int npe_load_firmware(struct npe *npe, c npe_reset(npe); #endif diff --git a/target/linux/ixp4xx/patches-2.6.23/202-npe_driver_no_phy.patch b/target/linux/ixp4xx/patches-2.6.23/202-npe_driver_no_phy.patch index 7660315..b3c9ca0 100644 --- a/target/linux/ixp4xx/patches-2.6.23/202-npe_driver_no_phy.patch +++ b/target/linux/ixp4xx/patches-2.6.23/202-npe_driver_no_phy.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.23.16/drivers/net/arm/ixp4xx_eth.c linux-2.6.23.16-owrt/drivers/net/arm/ixp4xx_eth.c ---- linux-2.6.23.16/drivers/net/arm/ixp4xx_eth.c 2008-02-15 18:18:02.000000000 +0100 -+++ linux-2.6.23.16-owrt/drivers/net/arm/ixp4xx_eth.c 2008-02-18 12:14:42.000000000 +0100 -@@ -297,6 +297,27 @@ +Index: linux-2.6.23.17/drivers/net/arm/ixp4xx_eth.c +=================================================================== +--- linux-2.6.23.17.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.23.17/drivers/net/arm/ixp4xx_eth.c +@@ -297,6 +297,27 @@ static int mdio_read(struct net_device * unsigned long flags; u16 val; @@ -29,7 +30,7 @@ diff -Nur linux-2.6.23.16/drivers/net/arm/ixp4xx_eth.c linux-2.6.23.16-owrt/driv spin_lock_irqsave(&mdio_lock, flags); val = mdio_cmd(dev, phy_id, location, 0, 0); spin_unlock_irqrestore(&mdio_lock, flags); -@@ -308,6 +329,9 @@ +@@ -308,6 +329,9 @@ static void mdio_write(struct net_device { unsigned long flags; diff --git a/target/linux/ixp4xx/patches-2.6.23/294-eeprom_new_notifier.patch b/target/linux/ixp4xx/patches-2.6.23/294-eeprom_new_notifier.patch index 4aa7a98..f91e778 100644 --- a/target/linux/ixp4xx/patches-2.6.23/294-eeprom_new_notifier.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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.23.17/drivers/i2c/chips/eeprom.c +=================================================================== +--- linux-2.6.23.17.orig/drivers/i2c/chips/eeprom.c ++++ linux-2.6.23.17/drivers/i2c/chips/eeprom.c @@ -33,6 +33,8 @@ #include <linux/jiffies.h> #include <linux/i2c.h> @@ -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 +@@ -198,6 +181,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 +@@ -225,6 +209,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 +@@ -250,6 +237,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.23.17/include/linux/eeprom.h +=================================================================== +--- /dev/null ++++ linux-2.6.23.17/include/linux/eeprom.h @@ -0,0 +1,71 @@ +#ifndef _LINUX_EEPROM_H +#define _LINUX_EEPROM_H @@ -173,9 +175,10 @@ 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 +Index: linux-2.6.23.17/include/linux/notifier.h +=================================================================== +--- linux-2.6.23.17.orig/include/linux/notifier.h ++++ linux-2.6.23.17/include/linux/notifier.h @@ -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 */ diff --git a/target/linux/ixp4xx/patches-2.6.23/296-avila_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/296-avila_mac_plat_info.patch index e4813fe..dfaf7ff 100644 --- a/target/linux/ixp4xx/patches-2.6.23/296-avila_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.23/296-avila_mac_plat_info.patch @@ -1,8 +1,8 @@ -diff --git a/arch/arm/mach-ixp4xx/avila-setup.c b/arch/arm/mach-ixp4xx/avila-setup.c -index e38f45f..10ed5d6 100644 ---- a/arch/arm/mach-ixp4xx/avila-setup.c -+++ b/arch/arm/mach-ixp4xx/avila-setup.c -@@ -132,10 +132,37 @@ static struct platform_device avila_pata = { +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c +@@ -132,10 +132,37 @@ static struct platform_device avila_pata .resource = avila_pata_resources, }; diff --git a/target/linux/ixp4xx/patches-2.6.23/298-avila_rtc_fixup.patch b/target/linux/ixp4xx/patches-2.6.23/298-avila_rtc_fixup.patch index f706c10..4bee204 100644 --- a/target/linux/ixp4xx/patches-2.6.23/298-avila_rtc_fixup.patch +++ b/target/linux/ixp4xx/patches-2.6.23/298-avila_rtc_fixup.patch @@ -1,8 +1,9 @@ -diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/avila-setup.c linux-2.6.23/arch/arm/mach-ixp4xx/avila-setup.c ---- linux-2.6.23.orig/arch/arm/mach-ixp4xx/avila-setup.c 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/arch/arm/mach-ixp4xx/avila-setup.c 2007-10-11 01:08:21.000000000 -0500 -@@ -138,6 +138,35 @@ static struct platform_device *avila_dev - &avila_uart +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c +@@ -165,6 +165,35 @@ static struct platform_device *avila_dev + &avila_eth[1], }; +static char avila_rtc_probe[] __initdata = "rtc-ds1672.probe=0,0x68 "; @@ -37,7 +38,7 @@ diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/avila-setup.c linux-2.6.23/arc static void __init avila_init(void) { ixp4xx_sys_init(); -@@ -165,6 +194,7 @@ MACHINE_START(AVILA, "Gateworks Avila Ne +@@ -192,6 +221,7 @@ MACHINE_START(AVILA, "Gateworks Avila Ne /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, @@ -45,7 +46,7 @@ diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/avila-setup.c linux-2.6.23/arc .map_io = ixp4xx_map_io, .init_irq = ixp4xx_init_irq, .timer = &ixp4xx_timer, -@@ -182,6 +212,7 @@ MACHINE_START(LOFT, "Giant Shoulder Inc +@@ -209,6 +239,7 @@ MACHINE_START(LOFT, "Giant Shoulder Inc /* Maintainer: Tom Billman <kernel@giantshoulderinc.com> */ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, diff --git a/target/linux/ixp4xx/patches-2.6.23/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.23/300-avila_fetch_mac.patch index 463383f..7303399 100644 --- a/target/linux/ixp4xx/patches-2.6.23/300-avila_fetch_mac.patch +++ b/target/linux/ixp4xx/patches-2.6.23/300-avila_fetch_mac.patch @@ -1,6 +1,7 @@ -diff -r -u linux-2.6.23.12/arch/arm/mach-ixp4xx/avila-setup.c ../../../../trunk/build_dir/linux-ixp4xx_generic/linux-2.6.23.12/arch/arm/mach-ixp4xx/avila-setup.c ---- linux-2.6.23.12/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-04 01:28:24.134925761 +0100 -+++ ../../../../trunk/build_dir/linux-ixp4xx_generic/linux-2.6.23.12/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-04 01:23:27.874042817 +0100 +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c +=================================================================== +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c @@ -14,10 +14,18 @@ #include <linux/kernel.h> #include <linux/init.h> @@ -20,7 +21,7 @@ diff -r -u linux-2.6.23.12/arch/arm/mach-ixp4xx/avila-setup.c ../../../../trunk/ #include <linux/i2c-gpio.h> #include <asm/types.h> -@@ -194,9 +202,48 @@ +@@ -194,9 +202,48 @@ static void __init avila_fixup(struct ma t->hdr.size = 0; } @@ -69,4 +70,3 @@ diff -r -u linux-2.6.23.12/arch/arm/mach-ixp4xx/avila-setup.c ../../../../trunk/ avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); avila_flash_resource.end = - diff --git a/target/linux/ixp4xx/patches-2.6.23/301-avila_led.patch b/target/linux/ixp4xx/patches-2.6.23/301-avila_led.patch index b82ed7d..f4b56a0 100644 --- a/target/linux/ixp4xx/patches-2.6.23/301-avila_led.patch +++ b/target/linux/ixp4xx/patches-2.6.23/301-avila_led.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23.14/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c =================================================================== ---- linux-2.6.23.14.orig/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-25 18:26:06.000000000 +0100 -+++ linux-2.6.23.14/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-25 18:44:02.000000000 +0100 -@@ -165,12 +165,34 @@ +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c +@@ -165,12 +165,34 @@ static struct platform_device avila_eth[ } }; @@ -37,10 +37,10 @@ Index: linux-2.6.23.14/arch/arm/mach-ixp4xx/avila-setup.c }; static char avila_rtc_probe[] __initdata = "rtc-ds1672.probe=0,0x68 "; -Index: linux-2.6.23.14/include/asm-arm/arch-ixp4xx/avila.h +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/avila.h =================================================================== ---- linux-2.6.23.14.orig/include/asm-arm/arch-ixp4xx/avila.h 2008-01-25 18:26:02.000000000 +0100 -+++ linux-2.6.23.14/include/asm-arm/arch-ixp4xx/avila.h 2008-01-25 18:26:06.000000000 +0100 +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/avila.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/avila.h @@ -36,4 +36,5 @@ #define AVILA_PCI_INTC_PIN 9 #define AVILA_PCI_INTD_PIN 8 diff --git a/target/linux/ixp4xx/patches-2.6.23/302-gpio_device.patch b/target/linux/ixp4xx/patches-2.6.23/302-gpio_device.patch index 0a1831b..a1f0ee4 100644 --- a/target/linux/ixp4xx/patches-2.6.23/302-gpio_device.patch +++ b/target/linux/ixp4xx/patches-2.6.23/302-gpio_device.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23.14/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c =================================================================== ---- linux-2.6.23.14.orig/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-26 02:59:30.000000000 +0100 -+++ linux-2.6.23.14/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-26 03:03:07.000000000 +0100 -@@ -183,6 +183,23 @@ +--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c +@@ -183,6 +183,23 @@ static struct platform_device avila_leds }; #endif @@ -26,7 +26,7 @@ Index: linux-2.6.23.14/arch/arm/mach-ixp4xx/avila-setup.c static struct platform_device *avila_devices[] __initdata = { &avila_i2c_gpio, -@@ -193,6 +210,9 @@ +@@ -193,6 +210,9 @@ static struct platform_device *avila_dev #ifdef CONFIG_LEDS_IXP4XX &avila_leds, #endif @@ -36,10 +36,10 @@ Index: linux-2.6.23.14/arch/arm/mach-ixp4xx/avila-setup.c }; static char avila_rtc_probe[] __initdata = "rtc-ds1672.probe=0,0x68 "; -Index: linux-2.6.23.14/include/asm-arm/arch-ixp4xx/avila.h +Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/avila.h =================================================================== ---- linux-2.6.23.14.orig/include/asm-arm/arch-ixp4xx/avila.h 2008-01-26 03:03:27.000000000 +0100 -+++ linux-2.6.23.14/include/asm-arm/arch-ixp4xx/avila.h 2008-01-26 03:07:02.000000000 +0100 +--- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/avila.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/avila.h @@ -38,3 +38,6 @@ /* User LED */ diff --git a/target/linux/ixp4xx/patches-2.6.23/400-dmabounce.patch b/target/linux/ixp4xx/patches-2.6.23/400-dmabounce.patch index f491026..cd7b058 100644 --- a/target/linux/ixp4xx/patches-2.6.23/400-dmabounce.patch +++ b/target/linux/ixp4xx/patches-2.6.23/400-dmabounce.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23.14/arch/arm/common/dmabounce.c +Index: linux-2.6.23.17/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.23.17.orig/arch/arm/common/dmabounce.c ++++ linux-2.6.23.17/arch/arm/common/dmabounce.c +@@ -116,6 +116,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.23.17/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.23.17.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig +@@ -220,6 +220,11 @@ config DMABOUNCE default y depends on PCI diff --git a/target/linux/ixp4xx/patches-2.6.23/401-avila_pci_dev.patch b/target/linux/ixp4xx/patches-2.6.23/401-avila_pci_dev.patch index db76d15..8971bb2 100644 --- a/target/linux/ixp4xx/patches-2.6.23/401-avila_pci_dev.patch +++ b/target/linux/ixp4xx/patches-2.6.23/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.23.17/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.23.17.orig/include/asm-arm/arch-ixp4xx/avila.h ++++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/avila.h @@ -25,7 +25,7 @@ /* * AVILA PCI IRQs diff --git a/target/linux/ixp4xx/patches-2.6.24/010-rtc_new_style.patch b/target/linux/ixp4xx/patches-2.6.24/010-rtc_new_style.patch index 279abb1..2293b8b 100644 --- a/target/linux/ixp4xx/patches-2.6.24/010-rtc_new_style.patch +++ b/target/linux/ixp4xx/patches-2.6.24/010-rtc_new_style.patch @@ -2,10 +2,10 @@ drivers/rtc/rtc-isl1208.c | 357 +++++++++++++++++++++------------------------- 1 file changed, 170 insertions(+), 187 deletions(-) -Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c +Index: linux-2.6.24.7/drivers/rtc/rtc-isl1208.c =================================================================== ---- linux-2.6.24-arm.orig/drivers/rtc/rtc-isl1208.c 2008-02-01 13:33:11.000000000 +1030 -+++ linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c 2008-02-01 13:36:24.000000000 +1030 +--- linux-2.6.24.7.orig/drivers/rtc/rtc-isl1208.c ++++ linux-2.6.24.7/drivers/rtc/rtc-isl1208.c @@ -15,16 +15,15 @@ #include <linux/bcd.h> #include <linux/rtc.h> @@ -89,7 +89,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c }; int ret; -@@ -103,15 +85,14 @@ +@@ -103,15 +85,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[], @@ -107,7 +107,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c BUG_ON(reg > ISL1208_REG_USR2); BUG_ON(reg + len > ISL1208_REG_USR2 + 1); -@@ -125,7 +106,8 @@ +@@ -125,7 +106,8 @@ isl1208_i2c_set_regs(struct i2c_client * } /* simple check to see wether we have a isl1208 */ @@ -117,7 +117,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c { u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, }; u8 zero_mask[ISL1208_RTC_SECTION_LEN] = { -@@ -139,24 +121,29 @@ +@@ -139,24 +121,29 @@ static int isl1208_i2c_validate_client(s return ret; for (i = 0; i < ISL1208_RTC_SECTION_LEN; ++i) { @@ -153,7 +153,7 @@ Index: linux-2.6.24-arm/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 +156,54 @@ +@@ -169,51 +156,54 @@ static int isl1208_i2c_get_atr(struct i2 * */ @@ -221,7 +221,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c { struct i2c_client *const client = to_i2c_client(dev); int sr, dtr, atr, usr; -@@ -230,20 +220,19 @@ +@@ -230,20 +220,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" : "", @@ -245,7 +245,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c usr = isl1208_i2c_get_usr(client); if (usr >= 0) -@@ -252,9 +241,8 @@ +@@ -252,9 +241,8 @@ static int isl1208_rtc_proc(struct devic return 0; } @@ -257,7 +257,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c { int sr; u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, }; -@@ -274,27 +262,30 @@ +@@ -274,27 +262,30 @@ static int isl1208_i2c_read_time(struct tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SC]); tm->tm_min = BCD2BIN(regs[ISL1208_REG_MN]); @@ -295,7 +295,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c { struct rtc_time *const tm = &alarm->time; u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, }; -@@ -307,7 +298,7 @@ +@@ -307,7 +298,7 @@ static int isl1208_i2c_read_alarm(struct } sr = isl1208_i2c_read_regs(client, ISL1208_REG_SCA, regs, @@ -304,7 +304,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c if (sr < 0) { dev_err(&client->dev, "%s: reading alarm section failed\n", __func__); -@@ -315,23 +306,25 @@ +@@ -315,23 +306,25 @@ static int isl1208_i2c_read_alarm(struct } /* MSB of each alarm register is an enable bit */ @@ -339,7 +339,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c { int sr; u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, }; -@@ -353,7 +346,7 @@ +@@ -353,7 +346,7 @@ static int isl1208_i2c_set_time(struct i } /* set WRTC */ @@ -348,7 +348,7 @@ Index: linux-2.6.24-arm/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 +362,7 @@ +@@ -369,7 +362,7 @@ static int isl1208_i2c_set_time(struct i } /* clear WRTC again */ @@ -357,7 +357,7 @@ Index: linux-2.6.24-arm/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 +373,69 @@ +@@ -380,70 +373,69 @@ static int isl1208_i2c_set_time(struct i } @@ -456,7 +456,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c { int usr = -1; -@@ -460,124 +452,116 @@ +@@ -460,124 +452,116 @@ static ssize_t isl1208_sysfs_store_usr(s return isl1208_i2c_set_usr(to_i2c_client(dev), usr) ? -EIO : count; } @@ -648,14 +648,10 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c { i2c_del_driver(&isl1208_driver); } ---- - drivers/rtc/rtc-pcf8563.c | 109 +++++++++++++--------------------------------- - 1 file changed, 32 insertions(+), 77 deletions(-) - -Index: linux-2.6.24-armeb/drivers/rtc/rtc-pcf8563.c +Index: linux-2.6.24.7/drivers/rtc/rtc-pcf8563.c =================================================================== ---- linux-2.6.24-armeb.orig/drivers/rtc/rtc-pcf8563.c 2008-01-30 13:50:01.000000000 +1030 -+++ linux-2.6.24-armeb/drivers/rtc/rtc-pcf8563.c 2008-01-30 13:51:55.000000000 +1030 +--- linux-2.6.24.7.orig/drivers/rtc/rtc-pcf8563.c ++++ linux-2.6.24.7/drivers/rtc/rtc-pcf8563.c @@ -18,17 +18,7 @@ #include <linux/bcd.h> #include <linux/rtc.h> @@ -675,7 +671,7 @@ Index: linux-2.6.24-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 */ @@ -687,7 +683,7 @@ Index: linux-2.6.24-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 */ }; @@ -705,7 +701,7 @@ Index: linux-2.6.24-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) { @@ -714,7 +710,7 @@ Index: linux-2.6.24-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, }; @@ -841,14 +837,10 @@ Index: linux-2.6.24-armeb/drivers/rtc/rtc-pcf8563.c static int __init pcf8563_init(void) { return i2c_add_driver(&pcf8563_driver); ---- - drivers/rtc/rtc-x1205.c | 128 ++++++++++++++++-------------------------------- - 1 file changed, 43 insertions(+), 85 deletions(-) - -Index: linux-2.6.24-armeb/drivers/rtc/rtc-x1205.c +Index: linux-2.6.24.7/drivers/rtc/rtc-x1205.c =================================================================== ---- linux-2.6.24-armeb.orig/drivers/rtc/rtc-x1205.c 2008-01-30 13:50:44.000000000 +1030 -+++ linux-2.6.24-armeb/drivers/rtc/rtc-x1205.c 2008-01-30 13:51:35.000000000 +1030 +--- linux-2.6.24.7.orig/drivers/rtc/rtc-x1205.c ++++ linux-2.6.24.7/drivers/rtc/rtc-x1205.c @@ -22,20 +22,7 @@ #include <linux/rtc.h> #include <linux/delay.h> @@ -871,7 +863,7 @@ Index: linux-2.6.24-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 */ @@ -892,7 +884,7 @@ Index: linux-2.6.24-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); @@ -978,7 +970,7 @@ Index: linux-2.6.24-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.24/014_ixp4xx_i2c_gpio.patch b/target/linux/ixp4xx/patches-2.6.24/014_ixp4xx_i2c_gpio.patch index b1b5612..98eb72a 100644 --- a/target/linux/ixp4xx/patches-2.6.24/014_ixp4xx_i2c_gpio.patch +++ b/target/linux/ixp4xx/patches-2.6.24/014_ixp4xx_i2c_gpio.patch @@ -6,10 +6,10 @@ Tested by the nslu2-linux and openwrt projects in public firmware releases. Acked-by: Rod Whitby <rod@whitby.id.au> Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk> -Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c =================================================================== ---- linux-2.6.24-rc6-armeb.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2008-01-05 18:10:05.000000000 +1030 -+++ linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c 2008-01-05 18:10:10.000000000 +1030 +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c @@ -18,6 +18,7 @@ #include <linux/serial.h> #include <linux/serial_8250.h> @@ -18,7 +18,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c #include <asm/mach-types.h> #include <asm/mach/arch.h> -@@ -41,7 +42,7 @@ +@@ -41,7 +42,7 @@ static struct platform_device nslu2_flas .resource = &nslu2_flash_resource, }; @@ -27,7 +27,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c .sda_pin = NSLU2_SDA_PIN, .scl_pin = NSLU2_SCL_PIN, }; -@@ -82,11 +83,12 @@ +@@ -82,11 +83,12 @@ static struct platform_device nslu2_leds }; #endif @@ -44,7 +44,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c }; static struct platform_device nslu2_beeper = { -@@ -139,7 +141,7 @@ +@@ -139,7 +141,7 @@ static struct platform_device nslu2_uart }; static struct platform_device *nslu2_devices[] __initdata = { @@ -53,10 +53,10 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c &nslu2_flash, &nslu2_beeper, #ifdef CONFIG_LEDS_IXP4XX -Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c =================================================================== ---- linux-2.6.24-rc6-armeb.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-05 18:10:05.000000000 +1030 -+++ linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-05 18:10:10.000000000 +1030 +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c @@ -16,6 +16,7 @@ #include <linux/serial.h> #include <linux/serial_8250.h> @@ -65,7 +65,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c #include <asm/mach-types.h> #include <asm/mach/arch.h> -@@ -68,16 +69,17 @@ +@@ -68,16 +69,17 @@ static struct platform_device nas100d_le }; #endif @@ -88,7 +88,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c }; static struct resource nas100d_uart_resources[] = { -@@ -124,7 +126,7 @@ +@@ -124,7 +126,7 @@ static struct platform_device nas100d_ua }; static struct platform_device *nas100d_devices[] __initdata = { @@ -97,10 +97,10 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c &nas100d_flash, #ifdef CONFIG_LEDS_IXP4XX &nas100d_leds, -Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/avila-setup.c =================================================================== ---- linux-2.6.24-rc6-armeb.orig/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-05 18:10:05.000000000 +1030 -+++ linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-05 18:10:10.000000000 +1030 +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/avila-setup.c @@ -18,6 +18,7 @@ #include <linux/tty.h> #include <linux/serial_8250.h> @@ -109,7 +109,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/avila-setup.c #include <asm/types.h> #include <asm/setup.h> -@@ -47,18 +48,17 @@ +@@ -47,18 +48,17 @@ static struct platform_device avila_flas .resource = &avila_flash_resource, }; @@ -133,7 +133,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/avila-setup.c }; static struct resource avila_uart_resources[] = { -@@ -133,7 +133,7 @@ +@@ -133,7 +133,7 @@ static struct platform_device avila_pata }; static struct platform_device *avila_devices[] __initdata = { @@ -142,10 +142,10 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/avila-setup.c &avila_flash, &avila_uart }; -Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c =================================================================== ---- linux-2.6.24-rc6-armeb.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c 2008-01-05 18:10:05.000000000 +1030 -+++ linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c 2008-01-05 18:10:10.000000000 +1030 +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c @@ -14,6 +14,7 @@ #include <linux/kernel.h> #include <linux/serial.h> @@ -154,7 +154,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c #include <asm/mach-types.h> #include <asm/mach/arch.h> -@@ -37,15 +38,17 @@ +@@ -37,15 +38,17 @@ static struct platform_device dsmg600_fl .resource = &dsmg600_flash_resource, }; @@ -176,7 +176,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c }; #ifdef CONFIG_LEDS_CLASS -@@ -116,7 +119,7 @@ +@@ -116,7 +119,7 @@ static struct platform_device dsmg600_ua }; static struct platform_device *dsmg600_devices[] __initdata = { @@ -185,10 +185,10 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c &dsmg600_flash, }; -Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/ixdp425-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/ixdp425-setup.c =================================================================== ---- linux-2.6.24-rc6-armeb.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c 2008-01-05 18:10:05.000000000 +1030 -+++ linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/ixdp425-setup.c 2008-01-05 18:10:10.000000000 +1030 +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/ixdp425-setup.c @@ -15,6 +15,7 @@ #include <linux/tty.h> #include <linux/serial_8250.h> @@ -197,7 +197,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/ixdp425-setup.c #include <linux/io.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> -@@ -120,18 +121,17 @@ +@@ -120,18 +121,17 @@ static struct platform_device ixdp425_fl }; #endif /* CONFIG_MTD_NAND_PLATFORM */ @@ -221,7 +221,7 @@ Index: linux-2.6.24-rc6-armeb/arch/arm/mach-ixp4xx/ixdp425-setup.c }; static struct resource ixdp425_uart_resources[] = { -@@ -178,7 +178,7 @@ +@@ -178,7 +178,7 @@ static struct platform_device ixdp425_ua }; static struct platform_device *ixdp425_devices[] __initdata = { diff --git a/target/linux/ixp4xx/patches-2.6.24/015-ixp4xx_update_defconfig.patch b/target/linux/ixp4xx/patches-2.6.24/015-ixp4xx_update_defconfig.patch index c52c15c..21f6964 100644 --- a/target/linux/ixp4xx/patches-2.6.24/015-ixp4xx_update_defconfig.patch +++ b/target/linux/ixp4xx/patches-2.6.24/015-ixp4xx_update_defconfig.patch @@ -24,10 +24,10 @@ Acked-by: Lennert Buytenhek <buytenh@wantstofly.org> PATCH FOLLOWS KernelVersion: 2.6.24-git5 -diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig -index db850a5..2d5ae33 100644 ---- a/arch/arm/configs/ixp4xx_defconfig -+++ b/arch/arm/configs/ixp4xx_defconfig +Index: linux-2.6.24.7/arch/arm/configs/ixp4xx_defconfig +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/configs/ixp4xx_defconfig ++++ linux-2.6.24.7/arch/arm/configs/ixp4xx_defconfig @@ -1,69 +1,96 @@ # # Automatically generated make config: don't edit @@ -1005,7 +1005,8 @@ index db850a5..2d5ae33 100644 - -# -# Wireless 802.11b ISA/PCI cards support --# ++# Wireless LAN + # -# CONFIG_AIRO is not set -CONFIG_HERMES=y -# CONFIG_PLX_HERMES is not set @@ -1013,18 +1014,17 @@ index db850a5..2d5ae33 100644 -# CONFIG_NORTEL_HERMES is not set -CONFIG_PCI_HERMES=y -# CONFIG_ATMEL is not set -- --# --# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support -+# Wireless LAN - # --# CONFIG_PRISM54 is not set --# CONFIG_HOSTAP is not set --CONFIG_NET_WIRELESS=y +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set # +-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support +-# +-# CONFIG_PRISM54 is not set +-# CONFIG_HOSTAP is not set +-CONFIG_NET_WIRELESS=y +- +-# -# Wan interfaces +# USB Network Adapters # @@ -1313,12 +1313,10 @@ index db850a5..2d5ae33 100644 # -# CONFIG_VIDEO_DEV is not set +# CONFIG_USBPCWATCHDOG is not set - - # --# Digital Video Broadcasting Devices ++ ++# +# Sonics Silicon Backplane - # --# CONFIG_DVB is not set ++# +CONFIG_SSB_POSSIBLE=y +# CONFIG_SSB is not set + @@ -1326,10 +1324,12 @@ index db850a5..2d5ae33 100644 +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set -+ -+# + + # +-# Digital Video Broadcasting Devices +# Multimedia devices -+# + # +-# CONFIG_DVB is not set +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +CONFIG_DAB=y @@ -1360,8 +1360,9 @@ index db850a5..2d5ae33 100644 # -# USB support +-# +# USB Input Devices - # ++# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set @@ -1721,6 +1722,3 @@ index db850a5..2d5ae33 100644 +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y --- -1.5.2.5 - diff --git a/target/linux/ixp4xx/patches-2.6.24/016-dsmg600_auto_power_on.patch b/target/linux/ixp4xx/patches-2.6.24/016-dsmg600_auto_power_on.patch index 003fed9..a95da08 100644 --- a/target/linux/ixp4xx/patches-2.6.24/016-dsmg600_auto_power_on.patch +++ b/target/linux/ixp4xx/patches-2.6.24/016-dsmg600_auto_power_on.patch @@ -16,10 +16,10 @@ Acked-by: Lennert Buytenhek <buytenh@wantstofly.org> PATCH FOLLOWS KernelVersion: 2.6.24-git5 -diff --git a/arch/arm/mach-ixp4xx/dsmg600-power.c b/arch/arm/mach-ixp4xx/dsmg600-power.c -index 3471787..db63987 100644 ---- a/arch/arm/mach-ixp4xx/dsmg600-power.c -+++ b/arch/arm/mach-ixp4xx/dsmg600-power.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-power.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/dsmg600-power.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-power.c @@ -26,14 +26,13 @@ #include <linux/jiffies.h> #include <linux/timer.h> @@ -37,7 +37,7 @@ index 3471787..db63987 100644 /* Must hold the button down for at least this many counts to be processed */ #define PBUTTON_HOLDDOWN_COUNT 4 /* 2 secs */ -@@ -47,22 +46,27 @@ static void dsmg600_power_handler(unsigned long data) +@@ -47,22 +46,27 @@ static void dsmg600_power_handler(unsign * state of the power button. */ @@ -72,7 +72,7 @@ index 3471787..db63987 100644 } mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500)); -@@ -81,12 +85,12 @@ static int __init dsmg600_power_init(void) +@@ -81,12 +85,12 @@ static int __init dsmg600_power_init(voi if (!(machine_is_dsmg600())) return 0; @@ -87,7 +87,7 @@ index 3471787..db63987 100644 return -EIO; } -@@ -114,7 +118,7 @@ static void __exit dsmg600_power_exit(void) +@@ -114,7 +118,7 @@ static void __exit dsmg600_power_exit(vo del_timer_sync(&dsmg600_power_timer); @@ -96,10 +96,10 @@ index 3471787..db63987 100644 } module_init(dsmg600_power_init); -diff --git a/include/asm-arm/arch-ixp4xx/dsmg600.h b/include/asm-arm/arch-ixp4xx/dsmg600.h -index a19605a..b7673e1 100644 ---- a/include/asm-arm/arch-ixp4xx/dsmg600.h -+++ b/include/asm-arm/arch-ixp4xx/dsmg600.h +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/dsmg600.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/dsmg600.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/dsmg600.h @@ -40,18 +40,13 @@ /* Buttons */ @@ -120,6 +120,3 @@ index a19605a..b7673e1 100644 - #define DSMG600_LED_WLAN_GPIO 14 -#define DSMG600_LED_WLAN_BM (1L << DSMG600_LED_WLAN_GPIO) --- -1.5.2.5 - diff --git a/target/linux/ixp4xx/patches-2.6.24/017-nas100d_auto_power_on.patch b/target/linux/ixp4xx/patches-2.6.24/017-nas100d_auto_power_on.patch index 1be3bb7..3c66cb4 100644 --- a/target/linux/ixp4xx/patches-2.6.24/017-nas100d_auto_power_on.patch +++ b/target/linux/ixp4xx/patches-2.6.24/017-nas100d_auto_power_on.patch @@ -18,10 +18,10 @@ Acked-by: Lennert Buytenhek <buytenh@wantstofly.org> PATCH FOLLOWS KernelVersion: 2.6.24-git5 -diff --git a/arch/arm/mach-ixp4xx/nas100d-power.c b/arch/arm/mach-ixp4xx/nas100d-power.c -index 29aa98d..4c1c01b 100644 ---- a/arch/arm/mach-ixp4xx/nas100d-power.c -+++ b/arch/arm/mach-ixp4xx/nas100d-power.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-power.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-power.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-power.c @@ -21,15 +21,59 @@ #include <linux/irq.h> #include <linux/module.h> @@ -86,7 +86,7 @@ index 29aa98d..4c1c01b 100644 return IRQ_HANDLED; } -@@ -39,17 +83,30 @@ static int __init nas100d_power_init(void) +@@ -39,17 +83,30 @@ static int __init nas100d_power_init(voi if (!(machine_is_nas100d())) return 0; @@ -120,7 +120,7 @@ index 29aa98d..4c1c01b 100644 return 0; } -@@ -58,7 +115,9 @@ static void __exit nas100d_power_exit(void) +@@ -58,7 +115,9 @@ static void __exit nas100d_power_exit(vo if (!(machine_is_nas100d())) return; @@ -131,11 +131,11 @@ index 29aa98d..4c1c01b 100644 } module_init(nas100d_power_init); -diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c -index 54d884f..213a4ce 100644 ---- a/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c -@@ -43,20 +43,20 @@ static struct platform_device nas100d_flash = { +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c +@@ -43,20 +43,20 @@ static struct platform_device nas100d_fl static struct resource nas100d_led_resources[] = { { .name = "wlan", /* green led */ @@ -163,10 +163,10 @@ index 54d884f..213a4ce 100644 .flags = IXP4XX_GPIO_LOW, }, }; -diff --git a/include/asm-arm/arch-ixp4xx/nas100d.h b/include/asm-arm/arch-ixp4xx/nas100d.h -index 131e0a1..98d9378 100644 ---- a/include/asm-arm/arch-ixp4xx/nas100d.h -+++ b/include/asm-arm/arch-ixp4xx/nas100d.h +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/nas100d.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/nas100d.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/nas100d.h @@ -38,15 +38,15 @@ /* Buttons */ @@ -192,6 +192,3 @@ index 131e0a1..98d9378 100644 +#define NAS100D_LED_WLAN_GPIO 0 +#define NAS100D_LED_DISK_GPIO 3 +#define NAS100D_LED_PWR_GPIO 15 --- -1.5.2.5 - diff --git a/target/linux/ixp4xx/patches-2.6.24/020-ixp4xx_rtc_info.patch b/target/linux/ixp4xx/patches-2.6.24/020-ixp4xx_rtc_info.patch index fab383f..60a3c28 100644 --- a/target/linux/ixp4xx/patches-2.6.24/020-ixp4xx_rtc_info.patch +++ b/target/linux/ixp4xx/patches-2.6.24/020-ixp4xx_rtc_info.patch @@ -12,11 +12,11 @@ Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> PATCH FOLLOWS KernelVersion: 2.6.24-git5 -diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c -index 332a066..ebeb566 100644 ---- a/arch/arm/mach-ixp4xx/nslu2-setup.c -+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c -@@ -19,6 +19,7 @@ +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c +@@ -18,6 +18,7 @@ #include <linux/serial.h> #include <linux/serial_8250.h> #include <linux/leds.h> @@ -24,7 +24,7 @@ index 332a066..ebeb566 100644 #include <linux/i2c-gpio.h> #include <asm/mach-types.h> -@@ -49,6 +50,12 @@ static struct i2c_gpio_platform_data nslu2_i2c_gpio_data = { +@@ -47,6 +48,12 @@ static struct i2c_gpio_platform_data nsl .scl_pin = NSLU2_SCL_PIN, }; @@ -37,7 +37,7 @@ index 332a066..ebeb566 100644 #ifdef CONFIG_LEDS_IXP4XX static struct resource nslu2_led_resources[] = { { -@@ -207,6 +214,9 @@ static void __init nslu2_init(void) +@@ -183,6 +190,9 @@ static void __init nslu2_init(void) pm_power_off = nslu2_power_off; @@ -47,28 +47,11 @@ index 332a066..ebeb566 100644 /* * This is only useful on a modified machine, but it is valuable * to have it first in order to see debug messages, and so that --- -1.5.2.5 - -From d4ef1ee0daf96e42bf93421960eaded71e189712 Mon Sep 17 00:00:00 2001 -From: Rod Whitby <rod@whitby.id.au> -Date: Tue, 29 Jan 2008 10:07:29 +1030 -Subject: ixp4xx: Register nas100d rtc i2c_board_info (Patch #4773) - -Register the i2c board info related to the RTC chip on the nas100d -board to allow it to be found automatically on boot. - -Signed-off-by: Rod Whitby <rod@whitby.id.au> -Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> - -PATCH FOLLOWS -KernelVersion: 2.6.24-git5 - -diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c -index b0884c2..09f75b9 100644 ---- a/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c -@@ -17,6 +17,7 @@ +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c +@@ -16,6 +16,7 @@ #include <linux/serial.h> #include <linux/serial_8250.h> #include <linux/leds.h> @@ -76,7 +59,7 @@ index b0884c2..09f75b9 100644 #include <linux/i2c-gpio.h> #include <asm/mach-types.h> -@@ -41,6 +42,12 @@ static struct platform_device nas100d_flash = { +@@ -39,6 +40,12 @@ static struct platform_device nas100d_fl .resource = &nas100d_flash_resource, }; @@ -89,7 +72,7 @@ index b0884c2..09f75b9 100644 #ifdef CONFIG_LEDS_IXP4XX static struct resource nas100d_led_resources[] = { { -@@ -181,6 +188,9 @@ static void __init nas100d_init(void) +@@ -157,6 +164,9 @@ static void __init nas100d_init(void) pm_power_off = nas100d_power_off; @@ -99,27 +82,10 @@ index b0884c2..09f75b9 100644 /* * This is only useful on a modified machine, but it is valuable * to have it first in order to see debug messages, and so that --- -1.5.2.5 - -From aa9d35dae397402f57f1baa8d53fed75d76aed8d Mon Sep 17 00:00:00 2001 -From: Rod Whitby <rod@whitby.id.au> -Date: Tue, 29 Jan 2008 10:09:41 +1030 -Subject: ixp4xx: Register dsmg600 rtc i2c_board_info (Patch #4774) - -Register the i2c board info related to the RTC chip on the dsmg600 -board to allow it to be found automatically on boot. - -Signed-off-by: Rod Whitby <rod@whitby.id.au> -Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> - -PATCH FOLLOWS -KernelVersion: 2.6.24-git5 - -diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c -index c473d40..a1c44ef 100644 ---- a/arch/arm/mach-ixp4xx/dsmg600-setup.c -+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c @@ -14,6 +14,7 @@ #include <linux/kernel.h> #include <linux/serial.h> @@ -128,7 +94,7 @@ index c473d40..a1c44ef 100644 #include <linux/i2c-gpio.h> #include <asm/mach-types.h> -@@ -51,6 +52,12 @@ static struct platform_device dsmg600_i2c_gpio = { +@@ -51,6 +52,12 @@ static struct platform_device dsmg600_i2 }, }; @@ -151,6 +117,3 @@ index c473d40..a1c44ef 100644 /* The UART is required on the DSM-G600 (Redboot cannot use the * NIC) -- do it here so that it does *not* get removed if * platform_add_devices fails! --- -1.5.2.5 - diff --git a/target/linux/ixp4xx/patches-2.6.24/021-ixp4xx_use_leds_gpio.patch b/target/linux/ixp4xx/patches-2.6.24/021-ixp4xx_use_leds_gpio.patch index 9ec7a4f..58c6ad9 100644 --- a/target/linux/ixp4xx/patches-2.6.24/021-ixp4xx_use_leds_gpio.patch +++ b/target/linux/ixp4xx/patches-2.6.24/021-ixp4xx_use_leds_gpio.patch @@ -12,10 +12,10 @@ Signed-off-by: Rod Whitby <rod@whitby.id.au> PATCH FOLLOWS KernelVersion: v2.6.24-1915-gc9b12e6 -diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig -index 2d5ae33..77fe3b0 100644 ---- a/arch/arm/configs/ixp4xx_defconfig -+++ b/arch/arm/configs/ixp4xx_defconfig +Index: linux-2.6.24.7/arch/arm/configs/ixp4xx_defconfig +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/configs/ixp4xx_defconfig ++++ linux-2.6.24.7/arch/arm/configs/ixp4xx_defconfig @@ -1330,8 +1330,8 @@ CONFIG_LEDS_CLASS=y # # LED drivers @@ -27,10 +27,10 @@ index 2d5ae33..77fe3b0 100644 # # LED Triggers -diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c -index a1c44ef..d0e1295 100644 ---- a/arch/arm/mach-ixp4xx/dsmg600-setup.c -+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c @@ -14,6 +14,7 @@ #include <linux/kernel.h> #include <linux/serial.h> @@ -39,7 +39,7 @@ index a1c44ef..d0e1295 100644 #include <linux/i2c.h> #include <linux/i2c-gpio.h> -@@ -58,29 +59,28 @@ static struct i2c_board_info __initdata dsmg600_i2c_board_info [] = { +@@ -58,29 +59,28 @@ static struct i2c_board_info __initdata }, }; @@ -83,7 +83,7 @@ index a1c44ef..d0e1295 100644 static struct resource dsmg600_uart_resources[] = { { -@@ -128,6 +128,7 @@ static struct platform_device dsmg600_uart = { +@@ -128,6 +128,7 @@ static struct platform_device dsmg600_ua static struct platform_device *dsmg600_devices[] __initdata = { &dsmg600_i2c_gpio, &dsmg600_flash, @@ -103,11 +103,11 @@ index a1c44ef..d0e1295 100644 } MACHINE_START(DSMG600, "D-Link DSM-G600 RevA") -diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c -index dc782d0..5801579 100644 ---- a/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c -@@ -46,35 +46,34 @@ static struct i2c_board_info __initdata nas100d_i2c_board_info [] = { +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c +@@ -46,35 +46,34 @@ static struct i2c_board_info __initdata }, }; @@ -157,7 +157,7 @@ index dc782d0..5801579 100644 static struct i2c_gpio_platform_data nas100d_i2c_gpio_data = { .sda_pin = NAS100D_SDA_PIN, -@@ -135,9 +134,7 @@ static struct platform_device nas100d_uart = { +@@ -135,9 +134,7 @@ static struct platform_device nas100d_ua static struct platform_device *nas100d_devices[] __initdata = { &nas100d_i2c_gpio, &nas100d_flash, @@ -167,11 +167,11 @@ index dc782d0..5801579 100644 }; static void nas100d_power_off(void) -diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c -index 16d091c..41d55c8 100644 ---- a/arch/arm/mach-ixp4xx/nslu2-setup.c -+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c -@@ -54,41 +54,37 @@ static struct i2c_board_info __initdata nslu2_i2c_board_info [] = { +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c +@@ -54,41 +54,37 @@ static struct i2c_board_info __initdata }, }; @@ -227,7 +227,7 @@ index 16d091c..41d55c8 100644 static struct platform_device nslu2_i2c_gpio = { .name = "i2c-gpio", -@@ -151,9 +147,7 @@ static struct platform_device *nslu2_devices[] __initdata = { +@@ -151,9 +147,7 @@ static struct platform_device *nslu2_dev &nslu2_i2c_gpio, &nslu2_flash, &nslu2_beeper, @@ -237,6 +237,3 @@ index 16d091c..41d55c8 100644 }; static void nslu2_power_off(void) --- -1.5.2.5 - diff --git a/target/linux/ixp4xx/patches-2.6.24/030-ixp4xx_fsg_board_support.patch b/target/linux/ixp4xx/patches-2.6.24/030-ixp4xx_fsg_board_support.patch index be72505..bf77df7 100644 --- a/target/linux/ixp4xx/patches-2.6.24/030-ixp4xx_fsg_board_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/030-ixp4xx_fsg_board_support.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig =================================================================== ---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-20 21:07:50.000000000 +1030 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-20 21:09:12.000000000 +1030 -@@ -125,6 +125,15 @@ +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig +@@ -125,6 +125,15 @@ config ARCH_IXDP4XX depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435 default y @@ -18,11 +18,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig # # Certain registers and IRQs are only enabled if supporting IXP465 CPUs # -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile =================================================================== ---- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-20 21:07:50.000000000 +1030 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-20 21:09:12.000000000 +1030 -@@ -15,6 +15,7 @@ +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.24.7/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 @@ -30,17 +30,17 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile obj-y += common.o -@@ -28,5 +29,6 @@ +@@ -28,5 +29,6 @@ obj-$(CONFIG_MACH_NAS100D) += nas100d-se obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o +obj-$(CONFIG_MACH_FSG) += fsg-setup.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o -Index: linux-2.6.24/arch/arm/mach-ixp4xx/fsg-pci.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/fsg-pci.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/fsg-pci.c 2008-03-20 21:09:12.000000000 +1030 +--- /dev/null ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/fsg-pci.c @@ -0,0 +1,71 @@ +/* + * arch/arch/mach-ixp4xx/fsg-pci.c @@ -113,10 +113,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/fsg-pci.c +} + +subsys_initcall(fsg_pci_init); -Index: linux-2.6.24/arch/arm/mach-ixp4xx/fsg-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/fsg-setup.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.24/arch/arm/mach-ixp4xx/fsg-setup.c 2008-03-20 21:09:12.000000000 +1030 +--- /dev/null ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/fsg-setup.c @@ -0,0 +1,275 @@ +/* + * arch/arm/mach-ixp4xx/fsg-setup.c @@ -393,10 +393,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/fsg-setup.c + .init_machine = fsg_init, +MACHINE_END + -Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/fsg.h +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/fsg.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/fsg.h 2008-03-20 21:09:12.000000000 +1030 +--- /dev/null ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/fsg.h @@ -0,0 +1,50 @@ +/* + * include/asm-arm/arch-ixp4xx/fsg.h @@ -448,10 +448,10 @@ Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/fsg.h +#define FSG_LED_USB_BIT 4 +#define FSG_LED_RING_BIT 5 +#define FSG_LED_SYNC_BIT 7 -Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/hardware.h +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/hardware.h =================================================================== ---- linux-2.6.24.orig/include/asm-arm/arch-ixp4xx/hardware.h 2008-03-20 21:07:50.000000000 +1030 -+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/hardware.h 2008-03-20 21:09:12.000000000 +1030 +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/hardware.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/hardware.h @@ -45,5 +45,6 @@ #include "nslu2.h" #include "nas100d.h" @@ -459,10 +459,10 @@ Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/hardware.h +#include "fsg.h" #endif /* _ASM_ARCH_HARDWARE_H */ -Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/irqs.h +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/irqs.h =================================================================== ---- linux-2.6.24.orig/include/asm-arm/arch-ixp4xx/irqs.h 2008-03-20 21:07:50.000000000 +1030 -+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/irqs.h 2008-03-20 21:09:12.000000000 +1030 +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/irqs.h ++++ linux-2.6.24.7/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 @@ -475,11 +475,11 @@ Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/irqs.h +#define IRQ_FSG_PCI_INTC IRQ_IXP4XX_GPIO5 + #endif -Index: linux-2.6.24/drivers/leds/Kconfig +Index: linux-2.6.24.7/drivers/leds/Kconfig =================================================================== ---- linux-2.6.24.orig/drivers/leds/Kconfig 2008-03-20 21:07:50.000000000 +1030 -+++ linux-2.6.24/drivers/leds/Kconfig 2008-03-20 21:09:12.000000000 +1030 -@@ -48,6 +48,12 @@ +--- linux-2.6.24.7.orig/drivers/leds/Kconfig ++++ linux-2.6.24.7/drivers/leds/Kconfig +@@ -48,6 +48,12 @@ config LEDS_IXP4XX particular board must have LEDs and they must be connected to the GPIO lines. If unsure, say Y. @@ -492,11 +492,11 @@ Index: linux-2.6.24/drivers/leds/Kconfig config LEDS_TOSA tristate "LED Support for the Sharp SL-6000 series" depends on LEDS_CLASS && PXA_SHARPSL -Index: linux-2.6.24/drivers/leds/Makefile +Index: linux-2.6.24.7/drivers/leds/Makefile =================================================================== ---- linux-2.6.24.orig/drivers/leds/Makefile 2008-03-20 21:07:50.000000000 +1030 -+++ linux-2.6.24/drivers/leds/Makefile 2008-03-20 21:09:56.000000000 +1030 -@@ -20,6 +20,7 @@ +--- linux-2.6.24.7.orig/drivers/leds/Makefile ++++ linux-2.6.24.7/drivers/leds/Makefile +@@ -20,6 +20,7 @@ obj-$(CONFIG_LEDS_COBALT_QUBE) += leds- obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o @@ -504,10 +504,10 @@ Index: linux-2.6.24/drivers/leds/Makefile # LED Triggers obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o -Index: linux-2.6.24/drivers/leds/leds-fsg.c +Index: linux-2.6.24.7/drivers/leds/leds-fsg.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.24/drivers/leds/leds-fsg.c 2008-03-20 21:09:12.000000000 +1030 +--- /dev/null ++++ linux-2.6.24.7/drivers/leds/leds-fsg.c @@ -0,0 +1,261 @@ +/* + * LED Driver for the Freecom FSG-3 diff --git a/target/linux/ixp4xx/patches-2.6.24/031-nslu2_nas100d_ethernet_support.patch b/target/linux/ixp4xx/patches-2.6.24/031-nslu2_nas100d_ethernet_support.patch index 001c73b..f9e74c4 100644 --- a/target/linux/ixp4xx/patches-2.6.24/031-nslu2_nas100d_ethernet_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/031-nslu2_nas100d_ethernet_support.patch @@ -17,10 +17,10 @@ Tested-by: Tom King <tom@websb.net> PATCH FOLLOWS KernelVersion: v2.6.24-1916-g3832564 -diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig -index 77fe3b0..efa0485 100644 ---- a/arch/arm/configs/ixp4xx_defconfig -+++ b/arch/arm/configs/ixp4xx_defconfig +Index: linux-2.6.24.7/arch/arm/configs/ixp4xx_defconfig +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/configs/ixp4xx_defconfig ++++ linux-2.6.24.7/arch/arm/configs/ixp4xx_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -56,10 +56,10 @@ index 77fe3b0..efa0485 100644 CONFIG_DLCI=m CONFIG_DLCI_MAX=8 CONFIG_WAN_ROUTER_DRIVERS=m -diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c -index 5801579..a432226 100644 ---- a/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c @@ -12,6 +12,7 @@ * */ @@ -76,7 +76,7 @@ index 5801579..a432226 100644 static struct flash_platform_data nas100d_flash_data = { .map_name = "cfi_probe", -@@ -131,10 +133,28 @@ static struct platform_device nas100d_uart = { +@@ -131,10 +133,28 @@ static struct platform_device nas100d_ua .resource = nas100d_uart_resources, }; @@ -142,10 +142,10 @@ index 5801579..a432226 100644 } MACHINE_START(NAS100D, "Iomega NAS 100d") -diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c -index 41d55c8..fd9ec17 100644 ---- a/arch/arm/mach-ixp4xx/nslu2-setup.c -+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c @@ -14,6 +14,7 @@ * Changed to conform to new style __init ixdp425 kas11 10/22/04 */ @@ -162,7 +162,7 @@ index 41d55c8..fd9ec17 100644 static struct flash_platform_data nslu2_flash_data = { .map_name = "cfi_probe", -@@ -143,11 +145,29 @@ static struct platform_device nslu2_uart = { +@@ -143,11 +145,29 @@ static struct platform_device nslu2_uart .resource = nslu2_uart_resources, }; @@ -230,6 +230,3 @@ index 41d55c8..fd9ec17 100644 } MACHINE_START(NSLU2, "Linksys NSLU2") --- -1.5.2.5 - diff --git a/target/linux/ixp4xx/patches-2.6.24/032-subsume_power_files.patch b/target/linux/ixp4xx/patches-2.6.24/032-subsume_power_files.patch index fa4070b..3ab265e 100644 --- a/target/linux/ixp4xx/patches-2.6.24/032-subsume_power_files.patch +++ b/target/linux/ixp4xx/patches-2.6.24/032-subsume_power_files.patch @@ -11,23 +11,23 @@ Signed-off-by: Rod Whitby <rod@whitby.id.au> PATCH FOLLOWS KernelVersion: v2.6.24-1917-gaf66bd3 -Index: linux-2.6.24-armeb/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile =================================================================== ---- linux-2.6.24-armeb.orig/arch/arm/mach-ixp4xx/Makefile 2008-02-03 22:45:22.000000000 +1030 -+++ linux-2.6.24-armeb/arch/arm/mach-ixp4xx/Makefile 2008-02-03 22:45:44.000000000 +1030 -@@ -23,7 +23,7 @@ - obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o - obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile +@@ -26,7 +26,7 @@ obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote- obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o --obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o -+obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o - obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o - obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o + obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o + obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o +-obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o ++obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o -Index: linux-2.6.24-armeb/arch/arm/mach-ixp4xx/nslu2-power.c + obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o + obj-$(CONFIG_MACH_FSG) += fsg-setup.o +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-power.c =================================================================== ---- linux-2.6.24-armeb.orig/arch/arm/mach-ixp4xx/nslu2-power.c 2008-02-03 22:45:10.000000000 +1030 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nslu2-power.c ++++ /dev/null @@ -1,92 +0,0 @@ -/* - * arch/arm/mach-ixp4xx/nslu2-power.c @@ -121,10 +121,10 @@ Index: linux-2.6.24-armeb/arch/arm/mach-ixp4xx/nslu2-power.c -MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -MODULE_DESCRIPTION("NSLU2 Power/Reset driver"); -MODULE_LICENSE("GPL"); -Index: linux-2.6.24-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c =================================================================== ---- linux-2.6.24-armeb.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2008-02-03 22:45:22.000000000 +1030 -+++ linux-2.6.24-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c 2008-02-03 22:45:44.000000000 +1030 +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c @@ -3,22 +3,26 @@ * * NSLU2 board-setup @@ -164,7 +164,7 @@ Index: linux-2.6.24-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c static struct flash_platform_data nslu2_flash_data = { .map_name = "cfi_probe", -@@ -181,6 +186,25 @@ +@@ -181,6 +186,25 @@ static void nslu2_power_off(void) gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH); } @@ -190,7 +190,7 @@ Index: linux-2.6.24-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c static void __init nslu2_timer_init(void) { /* The xtal on this machine is non-standard. */ -@@ -206,8 +230,6 @@ +@@ -206,8 +230,6 @@ static void __init nslu2_init(void) nslu2_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; @@ -199,7 +199,7 @@ Index: linux-2.6.24-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c i2c_register_board_info(0, nslu2_i2c_board_info, ARRAY_SIZE(nslu2_i2c_board_info)); -@@ -220,6 +242,23 @@ +@@ -220,6 +242,23 @@ static void __init nslu2_init(void) platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); @@ -223,10 +223,10 @@ Index: linux-2.6.24-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c /* * Map in a portion of the flash and read the MAC address. -Index: linux-2.6.24-armeb/include/asm-arm/arch-ixp4xx/nslu2.h +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/nslu2.h =================================================================== ---- linux-2.6.24-armeb.orig/include/asm-arm/arch-ixp4xx/nslu2.h 2008-02-03 22:45:11.000000000 +1030 -+++ linux-2.6.24-armeb/include/asm-arm/arch-ixp4xx/nslu2.h 2008-02-03 22:45:44.000000000 +1030 +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/nslu2.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/nslu2.h @@ -39,34 +39,17 @@ /* Buttons */ @@ -264,35 +264,9 @@ Index: linux-2.6.24-armeb/include/asm-arm/arch-ixp4xx/nslu2.h -#define NSLU2_LED_DISK2_BM (1L << NSLU2_LED_DISK2_GPIO) - - -From: Rod Whitby <rod@whitby.id.au> -Subject: ixp4xx: Merge nas100d-power.c into nas100d-setup.c (Patch #4808) - -There is no reason to have power control in a separate file from the -board setup code. Merge it back into the board setup file and remove -superfluous header includes. - -Signed-off-by: Rod Whitby <rod@whitby.id.au> --- -PATCH FOLLOWS -KernelVersion: 2.6.24-git9 - -diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile -index 4fc7316..a7880ab 100644 ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -24,7 +24,7 @@ obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o - obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o - obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o - obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o --obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o -+obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o - obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o - obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o - obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o -diff --git a/arch/arm/mach-ixp4xx/nas100d-power.c b/arch/arm/mach-ixp4xx/nas100d-power.c -deleted file mode 100644 -index 4c1c01b..0000000 ---- a/arch/arm/mach-ixp4xx/nas100d-power.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-power.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-power.c +++ /dev/null @@ -1,128 +0,0 @@ -/* @@ -423,10 +397,10 @@ index 4c1c01b..0000000 -MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -MODULE_DESCRIPTION("NAS100D Power/Reset driver"); -MODULE_LICENSE("GPL"); -diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c -index a432226..4cecae8 100644 ---- a/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c @@ -3,8 +3,14 @@ * * NAS 100d board-setup @@ -563,38 +537,9 @@ index a432226..4cecae8 100644 /* * Map in a portion of the flash and read the MAC address. * Since it is stored in BE in the flash itself, we need to --- -1.5.2.5 - -From: Rod Whitby <rod@whitby.id.au> -Subject: ixp4xx: Merge dsmg600-power.c into dsmg600-setup.c (Patch #4809) - -There is no reason to have power control in a separate file from the -board setup code. Merge it back into the board setup file and remove -superfluous header includes. - -Signed-off-by: Rod Whitby <rod@whitby.id.au> --- -PATCH FOLLOWS -KernelVersion: 2.6.24-git9 - -diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile -index a7880ab..c195688 100644 ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -25,7 +25,7 @@ obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o - obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o - obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o - obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o --obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o -+obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o - obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o - obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o - -diff --git a/arch/arm/mach-ixp4xx/dsmg600-power.c b/arch/arm/mach-ixp4xx/dsmg600-power.c -deleted file mode 100644 -index db63987..0000000 ---- a/arch/arm/mach-ixp4xx/dsmg600-power.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-power.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/dsmg600-power.c +++ /dev/null @@ -1,129 +0,0 @@ -/* @@ -726,10 +671,10 @@ index db63987..0000000 -MODULE_AUTHOR("Michael Westerhof <mwester@dls.net>"); -MODULE_DESCRIPTION("DSM-G600 Power/Reset driver"); -MODULE_LICENSE("GPL"); -diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c -index d0e1295..6886596 100644 ---- a/arch/arm/mach-ixp4xx/dsmg600-setup.c -+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c @@ -1,20 +1,29 @@ /* * DSM-G600 board-setup @@ -868,6 +813,3 @@ index d0e1295..6886596 100644 } MACHINE_START(DSMG600, "D-Link DSM-G600 RevA") --- -1.5.2.5 - diff --git a/target/linux/ixp4xx/patches-2.6.24/033-velocity_be.patch b/target/linux/ixp4xx/patches-2.6.24/033-velocity_be.patch index e1d212d..854de9e 100644 --- a/target/linux/ixp4xx/patches-2.6.24/033-velocity_be.patch +++ b/target/linux/ixp4xx/patches-2.6.24/033-velocity_be.patch @@ -1,7 +1,8 @@ -diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net/via-velocity.c ---- linux-2.6.24.orig/drivers/net/via-velocity.c 2008-01-31 23:11:26.000000000 -0600 -+++ linux-2.6.24/drivers/net/via-velocity.c 2008-02-01 01:12:15.000000000 -0600 -@@ -254,11 +254,31 @@ +Index: linux-2.6.24.7/drivers/net/via-velocity.c +=================================================================== +--- linux-2.6.24.7.orig/drivers/net/via-velocity.c ++++ linux-2.6.24.7/drivers/net/via-velocity.c +@@ -254,11 +254,31 @@ MODULE_AUTHOR("VIA Networking Technologi MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("VIA Networking Velocity Family Gigabit Ethernet Adapter Driver"); @@ -33,7 +34,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net #define RX_DESC_MIN 64 #define RX_DESC_MAX 255 #define RX_DESC_DEF 64 -@@ -557,12 +577,12 @@ +@@ -557,12 +577,12 @@ static void __devinit velocity_set_bool_ if (val == -1) *opt |= (def ? flag : 0); else if (val < 0 || val > 1) { @@ -50,7 +51,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net *opt |= (val ? flag : 0); } } -@@ -580,6 +600,7 @@ +@@ -580,6 +600,7 @@ static void __devinit velocity_set_bool_ static void __devinit velocity_get_options(struct velocity_opt *opts, int index, char *devname) { @@ -58,7 +59,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net velocity_set_int_opt(&opts->rx_thresh, rx_thresh[index], RX_THRESH_MIN, RX_THRESH_MAX, RX_THRESH_DEF, "rx_thresh", devname); velocity_set_int_opt(&opts->DMA_length, DMA_length[index], DMA_LENGTH_MIN, DMA_LENGTH_MAX, DMA_LENGTH_DEF, "DMA_length", devname); velocity_set_int_opt(&opts->numrx, RxDescriptors[index], RX_DESC_MIN, RX_DESC_MAX, RX_DESC_DEF, "RxDescriptors", devname); -@@ -593,6 +614,7 @@ +@@ -593,6 +614,7 @@ static void __devinit velocity_get_optio velocity_set_int_opt((int *) &opts->wol_opts, wol_opts[index], WOL_OPT_MIN, WOL_OPT_MAX, WOL_OPT_DEF, "Wake On Lan options", devname); velocity_set_int_opt((int *) &opts->int_works, int_works[index], INT_WORKS_MIN, INT_WORKS_MAX, INT_WORKS_DEF, "Interrupt service works", devname); opts->numrx = (opts->numrx & ~3); @@ -66,7 +67,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net } /** -@@ -608,6 +630,8 @@ +@@ -608,6 +630,8 @@ static void velocity_init_cam_filter(str struct mac_regs __iomem * regs = vptr->mac_regs; unsigned short vid; @@ -75,7 +76,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net /* Turn on MCFG_PQEN, turn off MCFG_RTGOPT */ WORD_REG_BITS_SET(MCFG_PQEN, MCFG_RTGOPT, ®s->MCFG); WORD_REG_BITS_ON(MCFG_VIDFR, ®s->MCFG); -@@ -636,8 +660,10 @@ +@@ -636,8 +660,10 @@ static void velocity_init_cam_filter(str } else { u16 temp = 0; mac_set_vlan_cam(regs, 0, (u8 *) &temp); @@ -88,7 +89,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net } } -@@ -675,13 +701,15 @@ +@@ -675,13 +701,15 @@ static void velocity_rx_reset(struct vel struct mac_regs __iomem * regs = vptr->mac_regs; int i; @@ -105,7 +106,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net writew(vptr->options.numrx, ®s->RBRDU); writel(vptr->rd_pool_dma, ®s->RDBaseLo); -@@ -704,12 +732,15 @@ +@@ -704,12 +732,15 @@ static void velocity_init_registers(stru struct mac_regs __iomem * regs = vptr->mac_regs; int i, mii_status; @@ -121,7 +122,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net netif_stop_queue(vptr->dev); /* -@@ -737,12 +768,13 @@ +@@ -737,12 +768,13 @@ static void velocity_init_registers(stru case VELOCITY_INIT_COLD: default: @@ -136,7 +137,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net mac_eeprom_reload(regs); for (i = 0; i < 6; i++) { writeb(vptr->dev->dev_addr[i], &(regs->PAR[i])); -@@ -760,11 +792,16 @@ +@@ -760,11 +792,16 @@ static void velocity_init_registers(stru */ BYTE_REG_BITS_SET(CFGB_OFSET, (CFGB_CRANDOM | CFGB_CAP | CFGB_MBA | CFGB_BAKOPT), ®s->CFGB); @@ -153,7 +154,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net /* * Set packet filter: Receive directed and broadcast address */ -@@ -774,10 +811,12 @@ +@@ -774,10 +811,12 @@ static void velocity_init_registers(stru * Enable MII auto-polling */ enable_mii_autopoll(regs); @@ -167,7 +168,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net writew(vptr->options.numrx - 1, ®s->RDCSize); mac_rx_queue_run(regs); mac_rx_queue_wake(regs); -@@ -785,10 +824,13 @@ +@@ -785,10 +824,13 @@ static void velocity_init_registers(stru writew(vptr->options.numtx - 1, ®s->TDCSize); for (i = 0; i < vptr->num_txq; i++) { @@ -182,7 +183,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net init_flow_control_register(vptr); writel(CR0_STOP, ®s->CR0Clr); -@@ -807,8 +849,10 @@ +@@ -807,8 +849,10 @@ static void velocity_init_registers(stru enable_flow_control_ability(vptr); mac_hw_mibs_init(regs); @@ -193,7 +194,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net } } -@@ -826,6 +870,7 @@ +@@ -826,6 +870,7 @@ static int velocity_soft_reset(struct ve struct mac_regs __iomem * regs = vptr->mac_regs; int i = 0; @@ -201,7 +202,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net writel(CR0_SFRST, ®s->CR0Set); for (i = 0; i < W_MAX_TIMEOUT; i++) { -@@ -888,6 +933,7 @@ +@@ -888,6 +933,7 @@ static int __devinit velocity_found1(str VELOCITY_FULL_DRV_NAM, VELOCITY_VERSION); printk(KERN_INFO "Copyright (c) 2002, 2003 VIA Networking Technologies, Inc.\n"); printk(KERN_INFO "Copyright (c) 2004 Red Hat Inc.\n"); @@ -209,7 +210,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net first = 0; } -@@ -1104,6 +1150,7 @@ +@@ -1104,6 +1150,7 @@ static int velocity_init_rings(struct ve dma_addr_t pool_dma; u8 *pool; @@ -217,7 +218,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net /* * Allocate all RD/TD rings a single pool */ -@@ -1166,6 +1213,7 @@ +@@ -1166,6 +1213,7 @@ static int velocity_init_rings(struct ve static void velocity_free_rings(struct velocity_info *vptr) { int size; @@ -225,7 +226,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net size = vptr->options.numrx * sizeof(struct rx_desc) + vptr->options.numtx * sizeof(struct tx_desc) * vptr->num_txq; -@@ -1182,6 +1230,7 @@ +@@ -1182,6 +1230,7 @@ static inline void velocity_give_many_rx struct mac_regs __iomem *regs = vptr->mac_regs; int avail, dirty, unusable; @@ -233,7 +234,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net /* * RD number must be equal to 4X per hardware spec * (programming guide rev 1.20, p.13) -@@ -1195,7 +1244,8 @@ +@@ -1195,7 +1244,8 @@ static inline void velocity_give_many_rx dirty = vptr->rd_dirty - unusable; for (avail = vptr->rd_filled & 0xfffc; avail; avail--) { dirty = (dirty > 0) ? dirty - 1 : vptr->options.numrx - 1; @@ -243,7 +244,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net } writew(vptr->rd_filled & 0xfffc, ®s->RBRDU); -@@ -1205,12 +1255,14 @@ +@@ -1205,12 +1255,14 @@ static inline void velocity_give_many_rx static int velocity_rx_refill(struct velocity_info *vptr) { int dirty = vptr->rd_dirty, done = 0, ret = 0; @@ -259,7 +260,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net break; if (!vptr->rd_info[dirty].skb) { -@@ -1244,6 +1296,7 @@ +@@ -1244,6 +1296,7 @@ static int velocity_init_rd_ring(struct int ret; int mtu = vptr->dev->mtu; @@ -267,7 +268,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net vptr->rx_buf_sz = (mtu <= ETH_DATA_LEN) ? PKT_BUF_SZ : mtu + 32; vptr->rd_info = kcalloc(vptr->options.numrx, -@@ -1275,6 +1328,7 @@ +@@ -1275,6 +1328,7 @@ static void velocity_free_rd_ring(struct { int i; @@ -275,7 +276,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net if (vptr->rd_info == NULL) return; -@@ -1314,6 +1368,7 @@ +@@ -1314,6 +1368,7 @@ static int velocity_init_td_ring(struct struct tx_desc *td; struct velocity_td_info *td_info; @@ -283,7 +284,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net /* Init the TD ring entries */ for (j = 0; j < vptr->num_txq; j++) { curr = vptr->td_pool_dma[j]; -@@ -1350,6 +1405,7 @@ +@@ -1350,6 +1405,7 @@ static void velocity_free_td_ring_entry( struct velocity_td_info * td_info = &(vptr->td_infos[q][n]); int i; @@ -291,7 +292,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net if (td_info == NULL) return; -@@ -1379,6 +1435,7 @@ +@@ -1379,6 +1435,7 @@ static void velocity_free_td_ring(struct { int i, j; @@ -299,7 +300,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net for (j = 0; j < vptr->num_txq; j++) { if (vptr->td_infos[j] == NULL) continue; -@@ -1406,34 +1463,42 @@ +@@ -1406,34 +1463,42 @@ static int velocity_rx_srv(struct veloci struct net_device_stats *stats = &vptr->stats; int rd_curr = vptr->rd_curr; int works = 0; @@ -347,7 +348,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net vptr->dev->last_rx = jiffies; -@@ -1464,13 +1529,21 @@ +@@ -1464,13 +1529,21 @@ static int velocity_rx_srv(struct veloci static inline void velocity_rx_csum(struct rx_desc *rd, struct sk_buff *skb) { @@ -374,7 +375,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net return; } } -@@ -1496,9 +1569,11 @@ +@@ -1496,9 +1569,11 @@ static inline int velocity_rx_copy(struc { int ret = -1; @@ -386,7 +387,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net new_skb = dev_alloc_skb(pkt_size + 2); if (new_skb) { new_skb->dev = vptr->dev; -@@ -1529,10 +1604,12 @@ +@@ -1529,10 +1604,12 @@ static inline int velocity_rx_copy(struc static inline void velocity_iph_realign(struct velocity_info *vptr, struct sk_buff *skb, int pkt_size) { @@ -399,7 +400,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net for (i = pkt_size; i >= 0; i--) *(skb->data + i + 2) = *(skb->data + i); skb_reserve(skb, 2); -@@ -1551,19 +1628,27 @@ +@@ -1551,19 +1628,27 @@ static inline void velocity_iph_realign( static int velocity_receive_frame(struct velocity_info *vptr, int idx) { void (*pci_action)(struct pci_dev *, dma_addr_t, size_t, int); @@ -431,7 +432,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net vptr->stats.multicast++; skb = rd_info->skb; -@@ -1576,7 +1661,8 @@ +@@ -1576,7 +1661,8 @@ static int velocity_receive_frame(struct */ if (vptr->flags & VELOCITY_FLAGS_VAL_PKT_LEN) { @@ -441,7 +442,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net stats->rx_length_errors++; return -EINVAL; } -@@ -1620,6 +1706,7 @@ +@@ -1620,6 +1706,7 @@ static int velocity_alloc_rx_buf(struct struct rx_desc *rd = &(vptr->rd_ring[idx]); struct velocity_rd_info *rd_info = &(vptr->rd_info[idx]); @@ -449,7 +450,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net rd_info->skb = dev_alloc_skb(vptr->rx_buf_sz + 64); if (rd_info->skb == NULL) return -ENOMEM; -@@ -1637,10 +1724,14 @@ +@@ -1637,10 +1724,14 @@ static int velocity_alloc_rx_buf(struct */ *((u32 *) & (rd->rdesc0)) = 0; @@ -467,7 +468,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net return 0; } -@@ -1661,9 +1752,11 @@ +@@ -1661,9 +1752,11 @@ static int velocity_tx_srv(struct veloci int full = 0; int idx; int works = 0; @@ -479,7 +480,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net for (qnum = 0; qnum < vptr->num_txq; qnum++) { for (idx = vptr->td_tail[qnum]; vptr->td_used[qnum] > 0; idx = (idx + 1) % vptr->options.numtx) { -@@ -1674,22 +1767,29 @@ +@@ -1674,22 +1767,29 @@ static int velocity_tx_srv(struct veloci td = &(vptr->td_rings[qnum][idx]); tdinfo = &(vptr->td_infos[qnum][idx]); @@ -515,7 +516,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net stats->tx_window_errors++; } else { stats->tx_packets++; -@@ -1778,6 +1878,7 @@ +@@ -1778,6 +1878,7 @@ static void velocity_print_link_status(s static void velocity_error(struct velocity_info *vptr, int status) { @@ -523,7 +524,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net if (status & ISR_TXSTLI) { struct mac_regs __iomem * regs = vptr->mac_regs; -@@ -1867,6 +1968,7 @@ +@@ -1867,6 +1968,7 @@ static void velocity_free_tx_buf(struct struct sk_buff *skb = tdinfo->skb; int i; @@ -531,7 +532,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net /* * Don't unmap the pre-allocated tx_bufs */ -@@ -2067,6 +2169,7 @@ +@@ -2067,6 +2169,7 @@ static int velocity_xmit(struct sk_buff struct velocity_td_info *tdinfo; unsigned long flags; int index; @@ -539,7 +540,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net int pktlen = skb->len; -@@ -2083,9 +2186,18 @@ +@@ -2083,9 +2186,18 @@ static int velocity_xmit(struct sk_buff td_ptr = &(vptr->td_rings[qnum][index]); tdinfo = &(vptr->td_infos[qnum][index]); @@ -561,7 +562,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net /* * Pad short frames. -@@ -2097,20 +2209,36 @@ +@@ -2097,20 +2209,36 @@ static int velocity_xmit(struct sk_buff memset(tdinfo->buf + skb->len, 0, ETH_ZLEN - skb->len); tdinfo->skb = skb; tdinfo->skb_dma[0] = tdinfo->buf_dma; @@ -602,7 +603,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net td_ptr->tdesc0.pktsize = td_ptr->td_buf[0].pa_low = cpu_to_le32(tdinfo->skb_dma[0]); td_ptr->td_buf[0].pa_high = 0; -@@ -2127,6 +2255,7 @@ +@@ -2127,6 +2255,7 @@ static int velocity_xmit(struct sk_buff /* FIXME: support 48bit DMA later */ td_ptr->td_buf[i].pa_low = cpu_to_le32(tdinfo->skb_dma); td_ptr->td_buf[i].pa_high = 0; @@ -610,7 +611,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net td_ptr->td_buf[i].bufsize = skb->len->skb->data_len; for (i = 0; i < nfrags; i++) { -@@ -2144,7 +2273,7 @@ +@@ -2144,7 +2273,7 @@ static int velocity_xmit(struct sk_buff } } else @@ -619,7 +620,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net { /* * Map the linear network buffer into PCI space and -@@ -2152,19 +2281,29 @@ +@@ -2152,19 +2281,29 @@ static int velocity_xmit(struct sk_buff */ tdinfo->skb = skb; tdinfo->skb_dma[0] = pci_map_single(vptr->pdev, skb->data, pktlen, PCI_DMA_TODEVICE); @@ -657,7 +658,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net } /* -@@ -2174,26 +2313,34 @@ +@@ -2174,26 +2313,34 @@ static int velocity_xmit(struct sk_buff && (skb->ip_summed == CHECKSUM_PARTIAL)) { const struct iphdr *ip = ip_hdr(skb); if (ip->protocol == IPPROTO_TCP) @@ -699,7 +700,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net mac_tx_queue_wake(vptr->mac_regs, qnum); } dev->trans_start = jiffies; -@@ -2219,7 +2366,7 @@ +@@ -2219,7 +2366,7 @@ static int velocity_intr(int irq, void * u32 isr_status; int max_count = 0; @@ -708,7 +709,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net spin_lock(&vptr->lock); isr_status = mac_read_isr(vptr->mac_regs); -@@ -2238,7 +2385,10 @@ +@@ -2238,7 +2385,10 @@ static int velocity_intr(int irq, void * while (isr_status != 0) { mac_write_isr(vptr->mac_regs, isr_status); @@ -720,7 +721,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net velocity_error(vptr, isr_status); if (isr_status & (ISR_PRXI | ISR_PPRXI)) max_count += velocity_rx_srv(vptr, isr_status); -@@ -2276,6 +2426,7 @@ +@@ -2276,6 +2426,7 @@ static void velocity_set_multi(struct ne int i; struct dev_mc_list *mclist; @@ -728,7 +729,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ writel(0xffffffff, ®s->MARCAM[0]); writel(0xffffffff, ®s->MARCAM[4]); -@@ -2319,6 +2470,7 @@ +@@ -2319,6 +2470,7 @@ static struct net_device_stats *velocity { struct velocity_info *vptr = netdev_priv(dev); @@ -736,7 +737,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net /* If the hardware is down, don't touch MII */ if(!netif_running(dev)) return &vptr->stats; -@@ -2363,6 +2515,7 @@ +@@ -2363,6 +2515,7 @@ static int velocity_ioctl(struct net_dev struct velocity_info *vptr = netdev_priv(dev); int ret; @@ -744,7 +745,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net /* If we are asked for information and the device is power saving then we need to bring the device back up to talk to it */ -@@ -2581,6 +2734,8 @@ +@@ -2581,6 +2734,8 @@ static int velocity_mii_read(struct mac_ { u16 ww; @@ -753,9 +754,10 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.c linux-2.6.24/drivers/net /* * Disable MIICR_MAUTO, so that mii addr can be set normally */ -diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.h linux-2.6.24/drivers/net/via-velocity.h ---- linux-2.6.24.orig/drivers/net/via-velocity.h 2008-01-31 23:11:26.000000000 -0600 -+++ linux-2.6.24/drivers/net/via-velocity.h 2008-02-01 01:12:15.000000000 -0600 +Index: linux-2.6.24.7/drivers/net/via-velocity.h +=================================================================== +--- linux-2.6.24.7.orig/drivers/net/via-velocity.h ++++ linux-2.6.24.7/drivers/net/via-velocity.h @@ -196,64 +196,70 @@ * Receive descriptor */ @@ -870,7 +872,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.h linux-2.6.24/drivers/net struct td_buf td_buf[7]; }; -@@ -279,6 +285,16 @@ +@@ -279,6 +285,16 @@ enum velocity_owner { OWNED_BY_NIC = 1 }; @@ -887,7 +889,7 @@ diff -Naur linux-2.6.24.orig/drivers/net/via-velocity.h linux-2.6.24/drivers/net /* * MAC registers and macros. -@@ -1512,6 +1528,7 @@ +@@ -1512,6 +1528,7 @@ enum velocity_flow_cntl_type { }; struct velocity_opt { diff --git a/target/linux/ixp4xx/patches-2.6.24/090-increase_entropy_pools.patch b/target/linux/ixp4xx/patches-2.6.24/090-increase_entropy_pools.patch index 9a322a7..4c8e553 100644 --- a/target/linux/ixp4xx/patches-2.6.24/090-increase_entropy_pools.patch +++ b/target/linux/ixp4xx/patches-2.6.24/090-increase_entropy_pools.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.19/drivers/char/random.c +Index: linux-2.6.24.7/drivers/char/random.c =================================================================== ---- linux-2.6.19.orig/drivers/char/random.c -+++ linux-2.6.19/drivers/char/random.c +--- linux-2.6.24.7.orig/drivers/char/random.c ++++ linux-2.6.24.7/drivers/char/random.c @@ -248,9 +248,9 @@ /* * Configuration information diff --git a/target/linux/ixp4xx/patches-2.6.24/100-gateway7001_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.24/100-gateway7001_mac_plat_info.patch index c7169ce..7709239 100644 --- a/target/linux/ixp4xx/patches-2.6.24/100-gateway7001_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/gateway7001-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c ++++ linux-2.6.24.7/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.24/101-wg302_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.24/101-wg302_mac_plat_info.patch index 5209e72..971ac35 100644 --- a/target/linux/ixp4xx/patches-2.6.24/101-wg302_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/wg302v2-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c ++++ linux-2.6.24.7/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.24/110-pronghorn_metro_support.patch b/target/linux/ixp4xx/patches-2.6.24/110-pronghorn_metro_support.patch index fb895e0..7b49a76 100644 --- a/target/linux/ixp4xx/patches-2.6.24/110-pronghorn_metro_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/110-pronghorn_metro_support.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.24.7/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.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.24.7/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,17 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile obj-y += common.o -@@ -30,5 +31,6 @@ +@@ -30,5 +31,6 @@ 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 +Index: linux-2.6.24.7/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.24.7/arch/arm/mach-ixp4xx/pronghornmetro-pci.c @@ -0,0 +1,74 @@ +/* + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c @@ -115,10 +115,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.24.7/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.24.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c @@ -0,0 +1,147 @@ +/* + * arch/arm/mach-ixp4xx/pronghornmetro-setup.c @@ -267,11 +267,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.24.7/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.24.7.orig/Documentation/arm/IXP4xx ++++ linux-2.6.24.7/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 +281,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.24.7/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.24.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.24.7/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.24/111-pronghorn_metro_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.24/111-pronghorn_metro_mac_plat_info.patch index 2fb3769..2a82c92 100644 --- a/target/linux/ixp4xx/patches-2.6.24/111-pronghorn_metro_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ++++ linux-2.6.24.7/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.24/120-compex_support.patch b/target/linux/ixp4xx/patches-2.6.24/120-compex_support.patch index c029ced..9dd5fe7 100644 --- a/target/linux/ixp4xx/patches-2.6.24/120-compex_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/120-compex_support.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.24.7/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.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.24.7/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,17 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile obj-y += common.o -@@ -32,5 +33,6 @@ +@@ -32,5 +33,6 @@ 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 +Index: linux-2.6.24.7/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.24.7/arch/arm/mach-ixp4xx/compex-setup.c @@ -0,0 +1,120 @@ +/* + * arch/arm/mach-ixp4xx/compex-setup.c @@ -161,11 +161,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.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c ++++ linux-2.6.24.7/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 +174,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.24.7/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.24.7.orig/arch/arm/tools/mach-types ++++ linux-2.6.24.7/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.24/121-compex_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.24/121-compex_mac_plat_info.patch index 081349a..915fdcc 100644 --- a/target/linux/ixp4xx/patches-2.6.24/121-compex_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/compex-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/compex-setup.c ++++ linux-2.6.24.7/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.24/130-wrt300nv2_support.patch b/target/linux/ixp4xx/patches-2.6.24/130-wrt300nv2_support.patch index 30a7c55..59d94dc 100644 --- a/target/linux/ixp4xx/patches-2.6.24/130-wrt300nv2_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/130-wrt300nv2_support.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.24.7/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.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.24.7/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,17 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile obj-y += common.o -@@ -34,5 +35,6 @@ +@@ -34,5 +35,6 @@ 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 +Index: linux-2.6.24.7/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.24.7/arch/arm/mach-ixp4xx/wrt300nv2-pci.c @@ -0,0 +1,65 @@ +/* + * arch/arch/mach-ixp4xx/wrt300nv2-pci.c @@ -106,10 +106,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.24.7/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.24.7/arch/arm/mach-ixp4xx/wrt300nv2-setup.c @@ -0,0 +1,108 @@ +/* + * arch/arm/mach-ixp4xx/wrt300nv2-setup.c @@ -219,11 +219,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.24.7/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.24.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.24.7/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.24/131-wrt300nv2_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.24/131-wrt300nv2_mac_plat_info.patch index 24dad0a..8fb2b61 100644 --- a/target/linux/ixp4xx/patches-2.6.24/131-wrt300nv2_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c ++++ linux-2.6.24.7/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.24/140-sidewinder_support.patch b/target/linux/ixp4xx/patches-2.6.24/140-sidewinder_support.patch index a83c421..ed86422 100644 --- a/target/linux/ixp4xx/patches-2.6.24/140-sidewinder_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.24.7/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.24.7/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.24.7/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,17 +38,17 @@ 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,5 +37,6 @@ 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_MACH_SIDEWINDER) += sidewinder-setup.o 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.24.7/arch/arm/mach-ixp4xx/sidewinder-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/sidewinder-pci.c @@ -0,0 +1,71 @@ +/* + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c @@ -119,9 +121,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.24.7/arch/arm/mach-ixp4xx/sidewinder-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.24.7/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.24/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-2.6.24/150-lanready_ap1000_support.patch index 953ce3c..aae2669 100644 --- a/target/linux/ixp4xx/patches-2.6.24/150-lanready_ap1000_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/ap1000-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.24.7/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.24.7/arch/arm/mach-ixp4xx/ixdp425-pci.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c ++++ linux-2.6.24.7/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.24.7/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.24.7/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.24.7/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.24.7/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,7 +199,7 @@ 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,5 +39,6 @@ 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 diff --git a/target/linux/ixp4xx/patches-2.6.24/151-lanready_ap1000_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.24/151-lanready_ap1000_mac_plat_info.patch index 2ab59ff..6178b5f 100644 --- a/target/linux/ixp4xx/patches-2.6.24/151-lanready_ap1000_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/ap1000-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ap1000-setup.c ++++ linux-2.6.24.7/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.24/160-wg302v1_support.patch b/target/linux/ixp4xx/patches-2.6.24/160-wg302v1_support.patch index 379b5aa..72bea00 100644 --- a/target/linux/ixp4xx/patches-2.6.24/160-wg302v1_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/160-wg302v1_support.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.24.7/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.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.24.7/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.24.7/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.24.7/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.24.7/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.24.7/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.24/161-wg302v1_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.24/161-wg302v1_mac_plat_info.patch index 250d85e..2d56cc8 100644 --- a/target/linux/ixp4xx/patches-2.6.24/161-wg302v1_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/wg302v1-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c ++++ linux-2.6.24.7/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.24/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-2.6.24/162-wg302v1_mem_fixup.patch index b370088..5c8024a 100644 --- a/target/linux/ixp4xx/patches-2.6.24/162-wg302v1_mem_fixup.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/wg302v1-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c ++++ linux-2.6.24.7/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.24/170-ixdpg425_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.24/170-ixdpg425_mac_plat_info.patch index cb65516..9026870 100644 --- a/target/linux/ixp4xx/patches-2.6.24/170-ixdpg425_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/coyote-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/coyote-setup.c ++++ linux-2.6.24.7/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.24/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.24/180-tw5334_support.patch index c02866b..a8c24f4 100644 --- a/target/linux/ixp4xx/patches-2.6.24/180-tw5334_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.24.7/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.24.7/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.24.7/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,17 +29,17 @@ 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,5 +43,6 @@ 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 +obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o 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.24.7/arch/arm/mach-ixp4xx/tw5334-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/tw5334-setup.c @@ -0,0 +1,162 @@ +/* + * arch/arm/mach-ixp4xx/tw5334-setup.c @@ -201,9 +203,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.24.7/arch/arm/mach-ixp4xx/tw5334-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/tw5334-pci.c @@ -0,0 +1,69 @@ +/* + * arch/arch/mach-ixp4xx/tw5334-pci.c @@ -274,9 +277,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.24.7/include/asm-arm/arch-ixp4xx/uncompress.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.24.7/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.24/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.24/190-cambria_support.patch index 4fbc1de..9c8d0e0 100644 --- a/target/linux/ixp4xx/patches-2.6.24/190-cambria_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.24.7/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.24.7/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.24.7/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.24.7/arch/arm/mach-ixp4xx/cambria-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.24.7/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.24.7/arch/arm/mach-ixp4xx/cambria-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.24.7/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.24.7/include/asm-arm/arch-ixp4xx/hardware.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/hardware.h ++++ linux-2.6.24.7/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.24/200-npe_driver.patch b/target/linux/ixp4xx/patches-2.6.24/200-npe_driver.patch index 5ec0b99..97ff757 100644 --- a/target/linux/ixp4xx/patches-2.6.24/200-npe_driver.patch +++ b/target/linux/ixp4xx/patches-2.6.24/200-npe_driver.patch @@ -1,7 +1,7 @@ -diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig -index f9cc2b6..9274d3f 100644 ---- a/drivers/net/arm/Kconfig -+++ b/drivers/net/arm/Kconfig +Index: linux-2.6.24.7/drivers/net/arm/Kconfig +=================================================================== +--- linux-2.6.24.7.orig/drivers/net/arm/Kconfig ++++ linux-2.6.24.7/drivers/net/arm/Kconfig @@ -47,3 +47,13 @@ config EP93XX_ETH help This is a driver for the ethernet hardware included in EP93xx CPUs. @@ -16,20 +16,19 @@ index f9cc2b6..9274d3f 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.24.7/drivers/net/arm/Makefile +=================================================================== +--- linux-2.6.24.7.orig/drivers/net/arm/Makefile ++++ linux-2.6.24.7/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..98131a7 +Index: linux-2.6.24.7/drivers/net/arm/ixp4xx_eth.c +=================================================================== --- /dev/null -+++ b/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.24.7/drivers/net/arm/ixp4xx_eth.c @@ -0,0 +1,1261 @@ +/* + * Intel IXP4xx Ethernet driver for Linux @@ -1292,10 +1291,10 @@ index 0000000..98131a7 +MODULE_LICENSE("GPL v2"); +module_init(eth_init_module); +module_exit(eth_cleanup_module); -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 +Index: linux-2.6.24.7/drivers/net/wan/Kconfig +=================================================================== +--- linux-2.6.24.7.orig/drivers/net/wan/Kconfig ++++ linux-2.6.24.7/drivers/net/wan/Kconfig @@ -334,6 +334,15 @@ config DSCC4_PCI_RST Say Y if your card supports this feature. @@ -1312,10 +1311,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.24.7/drivers/net/wan/Makefile +=================================================================== +--- linux-2.6.24.7.orig/drivers/net/wan/Makefile ++++ linux-2.6.24.7/drivers/net/wan/Makefile @@ -42,6 +42,7 @@ obj-$(CONFIG_C101) += c101.o obj-$(CONFIG_WANXL) += wanxl.o obj-$(CONFIG_PCI200SYN) += pci200syn.o @@ -1324,11 +1323,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..c4cdace +Index: linux-2.6.24.7/drivers/net/wan/ixp4xx_hss.c +=================================================================== --- /dev/null -+++ b/drivers/net/wan/ixp4xx_hss.c ++++ linux-2.6.24.7/drivers/net/wan/ixp4xx_hss.c @@ -0,0 +1,1270 @@ +/* + * Intel IXP4xx HSS (synchronous serial port) driver for Linux @@ -2600,26 +2598,10 @@ index 0000000..c4cdace +MODULE_LICENSE("GPL v2"); +module_init(hss_init_module); +module_exit(hss_cleanup_module); -From: Krzysztof Halasa <khc@pm.waw.pl> -Subject: Adds functions to read and write IXP4xx "feature" bits - -Adds functions to read and write IXP4xx "feature" (aka "fuse") -bits, containing information about available/enabled CPU features. - -The uncompress.h included by boot/compressed/misc.c resides in -a different space than rest of the kernel and thus can't use -asm/hardware.h (including asm/arch/cpu.h - which, in turn, may use -EXPORTed symbol "processor_id"). - -Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl> --- -PATCH FOLLOWS -KernelVersion: 2.6.23 - -diff --git a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h -index 5d949d7..c704fe8 100644 ---- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h -+++ b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h @@ -15,10 +15,6 @@ * */ @@ -2668,10 +2650,10 @@ index 5d949d7..c704fe8 100644 + IXP4XX_FEATURE_XSCALE_MAX_FREQ) + #endif -diff --git a/include/asm-arm/arch-ixp4xx/cpu.h b/include/asm-arm/arch-ixp4xx/cpu.h -index d2523b3..2fa3d6b 100644 ---- a/include/asm-arm/arch-ixp4xx/cpu.h -+++ b/include/asm-arm/arch-ixp4xx/cpu.h +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/cpu.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/cpu.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/cpu.h @@ -28,4 +28,19 @@ extern unsigned int processor_id; #define cpu_is_ixp46x() ((processor_id & IXP4XX_PROCESSOR_ID_MASK) == \ IXP465_PROCESSOR_ID_VALUE) @@ -2692,10 +2674,10 @@ index d2523b3..2fa3d6b 100644 +} + #endif /* _ASM_ARCH_CPU_H */ -diff --git a/include/asm-arm/arch-ixp4xx/hardware.h b/include/asm-arm/arch-ixp4xx/hardware.h -index 297ceda..73e8dc3 100644 ---- a/include/asm-arm/arch-ixp4xx/hardware.h -+++ b/include/asm-arm/arch-ixp4xx/hardware.h +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/hardware.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/hardware.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/hardware.h @@ -27,13 +27,13 @@ #define pcibios_assign_all_busses() 1 @@ -2713,10 +2695,10 @@ index 297ceda..73e8dc3 100644 /* Platform helper functions and definitions */ #include "platform.h" -diff --git a/include/asm-arm/arch-ixp4xx/uncompress.h b/include/asm-arm/arch-ixp4xx/uncompress.h -index f7a35b7..34ef48f 100644 ---- a/include/asm-arm/arch-ixp4xx/uncompress.h -+++ b/include/asm-arm/arch-ixp4xx/uncompress.h +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/uncompress.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/uncompress.h @@ -13,7 +13,7 @@ #ifndef _ARCH_UNCOMPRESS_H_ #define _ARCH_UNCOMPRESS_H_ @@ -2726,11 +2708,11 @@ index f7a35b7..34ef48f 100644 #include <asm/mach-types.h> #include <linux/serial_reg.h> -diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c -index 4de432e..c4c810b 100644 ---- a/arch/arm/kernel/setup.c -+++ b/arch/arm/kernel/setup.c -@@ -61,6 +61,7 @@ extern int root_mountflags; +Index: linux-2.6.24.7/arch/arm/kernel/setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/kernel/setup.c ++++ linux-2.6.24.7/arch/arm/kernel/setup.c +@@ -62,6 +62,7 @@ extern int root_mountflags; extern void _stext, _text, _etext, __data_start, _edata, _end; unsigned int processor_id; @@ -2738,25 +2720,11 @@ index 4de432e..c4c810b 100644 unsigned int __machine_arch_type; EXPORT_SYMBOL(__machine_arch_type); - - -From: Krzysztof Halasa <khc@pm.waw.pl> -Subject: Adds drivers for IXP4xx QMgr and NPE features - -This patch adds drivers for IXP4xx hardware Queue Manager and for -Network Processor Engines. Requires patch #4712 (reading/writing -CPU feature (aka fuse) bits). - -Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl> --- -PATCH FOLLOWS -KernelVersion: 2.6.23 - -diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig -index 61b2dfc..e774447 100644 ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -189,6 +189,20 @@ config IXP4XX_INDIRECT_PCI +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig +@@ -262,6 +262,20 @@ config IXP4XX_INDIRECT_PCI need to use the indirect method instead. If you don't know what you need, leave this option unselected. @@ -2777,21 +2745,20 @@ index 61b2dfc..e774447 100644 endmenu endif -diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile -index 77e00ad..4bb97e1 100644 ---- a/arch/arm/mach-ixp4xx/Makefile -+++ b/arch/arm/mach-ixp4xx/Makefile -@@ -30,3 +30,5 @@ obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o - obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile +@@ -48,3 +48,5 @@ obj-$(CONFIG_MACH_AP1000) += ap1000-setu + obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o +obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o +obj-$(CONFIG_IXP4XX_NPE) += ixp4xx_npe.o -diff --git a/include/asm-arm/arch-ixp4xx/qmgr.h b/include/asm-arm/arch-ixp4xx/qmgr.h -new file mode 100644 -index 0000000..1e52b95 +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/qmgr.h +=================================================================== --- /dev/null -+++ b/include/asm-arm/arch-ixp4xx/qmgr.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/qmgr.h @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2007 Krzysztof Halasa <khc@pm.waw.pl> @@ -2919,11 +2886,10 @@ index 0000000..1e52b95 +} + +#endif -diff --git a/include/asm-arm/arch-ixp4xx/npe.h b/include/asm-arm/arch-ixp4xx/npe.h -new file mode 100644 -index 0000000..37d0511 +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/npe.h +=================================================================== --- /dev/null -+++ b/include/asm-arm/arch-ixp4xx/npe.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/npe.h @@ -0,0 +1,39 @@ +#ifndef __IXP4XX_NPE_H +#define __IXP4XX_NPE_H @@ -2964,11 +2930,10 @@ index 0000000..37d0511 +void npe_release(struct npe *npe); + +#endif /* __IXP4XX_NPE_H */ -diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c -new file mode 100644 -index 0000000..e833013 +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c +=================================================================== --- /dev/null -+++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c @@ -0,0 +1,274 @@ +/* + * Intel IXP4xx Queue Manager driver for Linux @@ -3244,11 +3209,10 @@ index 0000000..e833013 +EXPORT_SYMBOL(qmgr_disable_irq); +EXPORT_SYMBOL(qmgr_request_queue); +EXPORT_SYMBOL(qmgr_release_queue); -diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c -new file mode 100644 -index 0000000..83c137e +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/ixp4xx_npe.c +=================================================================== --- /dev/null -+++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/ixp4xx_npe.c @@ -0,0 +1,741 @@ +/* + * Intel IXP4xx Network Processor Engine driver for Linux @@ -3991,30 +3955,11 @@ index 0000000..83c137e +EXPORT_SYMBOL(npe_send_message); +EXPORT_SYMBOL(npe_recv_message); +EXPORT_SYMBOL(npe_send_recv_message); - - -From 35acb53f356e80efad803b9460986d9786dc9b96 Mon Sep 17 00:00:00 2001 -From: Krzysztof Halasa <khc@pm.waw.pl> -Date: Tue, 29 Jan 2008 10:25:57 +1030 -Subject: Headers for IXP4xx built-in Ethernet and WAN drivers (Patch #4714) - -Adds platform structs and #defines required by drivers for -IXP4xx built-in Ethernet and WAN (sync serial) ports. - -The actual drivers will reside in drivers/net/arm and -drivers/net/wan and will be submitted separately. - -Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl> -Signed-off-by: Rod Whitby <rod@whitby.id.au> - -PATCH FOLLOWS -KernelVersion: 2.6.24-git5 - -diff --git a/include/asm-arm/arch-ixp4xx/platform.h b/include/asm-arm/arch-ixp4xx/platform.h -index 2ce28e3..a1f2b54 100644 ---- a/include/asm-arm/arch-ixp4xx/platform.h -+++ b/include/asm-arm/arch-ixp4xx/platform.h -@@ -91,6 +91,27 @@ struct ixp4xx_pata_data { +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/platform.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/platform.h +@@ -102,6 +102,27 @@ struct ixp4xx_pata_data { struct sys_timer; @@ -4042,29 +3987,11 @@ index 2ce28e3..a1f2b54 100644 /* * Frequency of clock used for primary clocksource */ --- -1.5.2.5 - -From 5a5be39c6411f2d6d8cead614f3f71af9fa4b4b4 Mon Sep 17 00:00:00 2001 -From: Krzysztof Halasa <khc@pm.waw.pl> -Date: Fri, 1 Feb 2008 11:37:47 +1030 -Subject: Ethernet support for IXDP425 boards (Patch #4715) - -Adds IXDP425 platform support for two built-in 10/100 Ethernet ports. - -This patch will do nothing until the actual Ethernet driver is -also included. - -Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl> --- -PATCH FOLLOWS -KernelVersion: 2.6.23 - -diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c -index e89070d..44584af 100644 ---- a/arch/arm/mach-ixp4xx/ixdp425-setup.c -+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c -@@ -177,6 +177,31 @@ static struct platform_device ixdp425_uart = { +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/ixdp425-setup.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/ixdp425-setup.c +@@ -177,6 +177,31 @@ static struct platform_device ixdp425_ua .resource = ixdp425_uart_resources }; @@ -4096,7 +4023,7 @@ index e89070d..44584af 100644 static struct platform_device *ixdp425_devices[] __initdata = { &ixdp425_i2c_gpio, &ixdp425_flash, -@@ -184,7 +209,9 @@ static struct platform_device *ixdp425_devices[] __initdata = { +@@ -184,7 +209,9 @@ static struct platform_device *ixdp425_d defined(CONFIG_MTD_NAND_PLATFORM_MODULE) &ixdp425_flash_nand, #endif @@ -4107,6 +4034,3 @@ index e89070d..44584af 100644 }; static void __init ixdp425_init(void) --- -1.5.2.5 - diff --git a/target/linux/ixp4xx/patches-2.6.24/201-npe_driver_print_license_location.patch b/target/linux/ixp4xx/patches-2.6.24/201-npe_driver_print_license_location.patch index fad4033..53cad0d 100644 --- a/target/linux/ixp4xx/patches-2.6.24/201-npe_driver_print_license_location.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/ixp4xx_npe.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/ixp4xx_npe.c +@@ -588,6 +588,8 @@ int npe_load_firmware(struct npe *npe, c npe_reset(npe); #endif diff --git a/target/linux/ixp4xx/patches-2.6.24/202-npe_driver_switch_support.patch b/target/linux/ixp4xx/patches-2.6.24/202-npe_driver_switch_support.patch index 0163829..1604743 100644 --- a/target/linux/ixp4xx/patches-2.6.24/202-npe_driver_switch_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/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.24.7.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.24.7/drivers/net/arm/ixp4xx_eth.c @@ -165,14 +165,15 @@ struct port { struct net_device *netdev; struct napi_struct napi; @@ -230,10 +230,10 @@ 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.24.7/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 +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/platform.h @@ -106,12 +106,15 @@ struct sys_timer; #define IXP4XX_ETH_NPEB 0x10 #define IXP4XX_ETH_NPEC 0x20 diff --git a/target/linux/ixp4xx/patches-2.6.24/203-npe_driver_phy_reset_autoneg.patch b/target/linux/ixp4xx/patches-2.6.24/203-npe_driver_phy_reset_autoneg.patch index 6e1056e..0788ce3 100644 --- a/target/linux/ixp4xx/patches-2.6.24/203-npe_driver_phy_reset_autoneg.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/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.24.7.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.24.7/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.24/204-npe_driver_ixp43x_support.patch b/target/linux/ixp4xx/patches-2.6.24/204-npe_driver_ixp43x_support.patch index c0b55aa..1bd576d 100644 --- a/target/linux/ixp4xx/patches-2.6.24/204-npe_driver_ixp43x_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/arch/arm/mach-ixp4xx/ixp4xx_npe.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/ixp4xx_npe.c +@@ -571,8 +571,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 @@ +@@ -594,7 +594,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.24.7/drivers/net/arm/ixp4xx_eth.c +=================================================================== +--- linux-2.6.24.7.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.24.7/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 @@ +@@ -1335,12 +1336,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.24.7/include/asm-arm/arch-ixp4xx/cpu.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/cpu.h ++++ linux-2.6.24.7/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.24.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h ++++ linux-2.6.24.7/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.24/250-compex_switch_support.patch b/target/linux/ixp4xx/patches-2.6.24/250-compex_switch_support.patch index f887b41..2fb31c4 100644 --- a/target/linux/ixp4xx/patches-2.6.24/250-compex_switch_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/250-compex_switch_support.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/compex-setup.c +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/compex-setup.c =================================================================== ---- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/compex-setup.c -+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/compex-setup.c +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/compex-setup.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/compex-setup.c @@ -93,7 +93,8 @@ static struct platform_device compex_uar /* Built-in 10/100 Ethernet MAC interfaces */ static struct eth_plat_info compex_plat_eth[] = { diff --git a/target/linux/ixp4xx/patches-2.6.24/294-eeprom_new_notifier.patch b/target/linux/ixp4xx/patches-2.6.24/294-eeprom_new_notifier.patch index 4aa7a98..d95c94d 100644 --- a/target/linux/ixp4xx/patches-2.6.24/294-eeprom_new_notifier.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/drivers/i2c/chips/eeprom.c +=================================================================== +--- linux-2.6.24.7.orig/drivers/i2c/chips/eeprom.c ++++ linux-2.6.24.7/drivers/i2c/chips/eeprom.c @@ -33,6 +33,8 @@ #include <linux/jiffies.h> #include <linux/i2c.h> @@ -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 +@@ -198,6 +181,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 +@@ -225,6 +209,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 +@@ -250,6 +237,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.24.7/include/linux/eeprom.h +=================================================================== +--- /dev/null ++++ linux-2.6.24.7/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.24.7/include/linux/notifier.h +=================================================================== +--- linux-2.6.24.7.orig/include/linux/notifier.h ++++ linux-2.6.24.7/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.24/296-avila_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.24/296-avila_mac_plat_info.patch index 0c18956..3fdb52f 100644 --- a/target/linux/ixp4xx/patches-2.6.24/296-avila_mac_plat_info.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.24.7/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.24/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.24/300-avila_fetch_mac.patch index e35ddbe..a266cce 100644 --- a/target/linux/ixp4xx/patches-2.6.24/300-avila_fetch_mac.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.24.7/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.24/301-avila_led.patch b/target/linux/ixp4xx/patches-2.6.24/301-avila_led.patch index 8257739..81282fa 100644 --- a/target/linux/ixp4xx/patches-2.6.24/301-avila_led.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/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.24.7.orig/include/asm-arm/arch-ixp4xx/avila.h ++++ linux-2.6.24.7/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.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.24.7/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.24/302-avila_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.24/302-avila_gpio_device.patch index aee0eee..eb14f7d 100644 --- a/target/linux/ixp4xx/patches-2.6.24/302-avila_gpio_device.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.24.7/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.24.7/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.24.7.orig/include/asm-arm/arch-ixp4xx/avila.h ++++ linux-2.6.24.7/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.24/303-avila_gw23x7_phy_quirk.patch b/target/linux/ixp4xx/patches-2.6.24/303-avila_gw23x7_phy_quirk.patch index ffba2bb..089cff9 100644 --- a/target/linux/ixp4xx/patches-2.6.24/303-avila_gw23x7_phy_quirk.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.24.7/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.24.7/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.24.7.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.24.7/drivers/net/arm/ixp4xx_eth.c +@@ -348,6 +348,14 @@ static void phy_reset(struct net_device return; } @@ -37,10 +37,10 @@ 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.24.7/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 +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/platform.h @@ -115,6 +115,8 @@ struct eth_plat_info { u8 txreadyq; u8 hwaddr[6]; diff --git a/target/linux/ixp4xx/patches-2.6.24/400-dmabounce.patch b/target/linux/ixp4xx/patches-2.6.24/400-dmabounce.patch index f491026..8beb971 100644 --- a/target/linux/ixp4xx/patches-2.6.24/400-dmabounce.patch +++ b/target/linux/ixp4xx/patches-2.6.24/400-dmabounce.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23.14/arch/arm/common/dmabounce.c +Index: linux-2.6.24.7/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.24.7.orig/arch/arm/common/dmabounce.c ++++ linux-2.6.24.7/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.24.7/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.24.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.24.7/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.24/401-avila_pci_dev.patch b/target/linux/ixp4xx/patches-2.6.24/401-avila_pci_dev.patch index db76d15..726c22f 100644 --- a/target/linux/ixp4xx/patches-2.6.24/401-avila_pci_dev.patch +++ b/target/linux/ixp4xx/patches-2.6.24/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.24.7/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.24.7.orig/include/asm-arm/arch-ixp4xx/avila.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/avila.h @@ -25,7 +25,7 @@ /* * AVILA PCI IRQs diff --git a/target/linux/ixp4xx/patches-2.6.24/402-ixp4xx_ehci_backport.patch b/target/linux/ixp4xx/patches-2.6.24/402-ixp4xx_ehci_backport.patch index baae7a6..f898c55 100644 --- a/target/linux/ixp4xx/patches-2.6.24/402-ixp4xx_ehci_backport.patch +++ b/target/linux/ixp4xx/patches-2.6.24/402-ixp4xx_ehci_backport.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.24.2/drivers/usb/host/ehci.h linux-2.6.24.2-owrt/drivers/usb/host/ehci.h ---- linux-2.6.24.2/drivers/usb/host/ehci.h 2008-02-11 06:51:11.000000000 +0100 -+++ linux-2.6.24.2-owrt/drivers/usb/host/ehci.h 2008-04-22 12:58:42.000000000 +0200 -@@ -730,6 +730,11 @@ +Index: linux-2.6.24.7/drivers/usb/host/ehci.h +=================================================================== +--- linux-2.6.24.7.orig/drivers/usb/host/ehci.h ++++ linux-2.6.24.7/drivers/usb/host/ehci.h +@@ -730,6 +730,11 @@ ehci_port_speed(struct ehci_hcd *ehci, u #define writel_be(val, addr) out_be32((__force unsigned *)addr, val) #endif @@ -13,10 +14,11 @@ diff -Nur linux-2.6.24.2/drivers/usb/host/ehci.h linux-2.6.24.2-owrt/drivers/usb static inline unsigned int ehci_readl(const struct ehci_hcd *ehci, __u32 __iomem * regs) { -diff -Nur linux-2.6.24.2/drivers/usb/host/ehci-hcd.c linux-2.6.24.2-owrt/drivers/usb/host/ehci-hcd.c ---- linux-2.6.24.2/drivers/usb/host/ehci-hcd.c 2008-02-11 06:51:11.000000000 +0100 -+++ linux-2.6.24.2-owrt/drivers/usb/host/ehci-hcd.c 2008-04-22 12:58:42.000000000 +0200 -@@ -964,6 +964,11 @@ +Index: linux-2.6.24.7/drivers/usb/host/ehci-hcd.c +=================================================================== +--- linux-2.6.24.7.orig/drivers/usb/host/ehci-hcd.c ++++ linux-2.6.24.7/drivers/usb/host/ehci-hcd.c +@@ -964,6 +964,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_ppc_soc_driver #endif @@ -28,9 +30,10 @@ diff -Nur linux-2.6.24.2/drivers/usb/host/ehci-hcd.c linux-2.6.24.2-owrt/drivers #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \ !defined(PS3_SYSTEM_BUS_DRIVER) #error "missing bus glue for ehci-hcd" -diff -Nur linux-2.6.24.2/drivers/usb/host/ehci-ixp4xx.c linux-2.6.24.2-owrt/drivers/usb/host/ehci-ixp4xx.c ---- linux-2.6.24.2/drivers/usb/host/ehci-ixp4xx.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.24.2-owrt/drivers/usb/host/ehci-ixp4xx.c 2008-04-22 12:58:42.000000000 +0200 +Index: linux-2.6.24.7/drivers/usb/host/ehci-ixp4xx.c +=================================================================== +--- /dev/null ++++ linux-2.6.24.7/drivers/usb/host/ehci-ixp4xx.c @@ -0,0 +1,152 @@ +/* + * IXP4XX EHCI Host Controller Driver @@ -184,10 +187,11 @@ diff -Nur linux-2.6.24.2/drivers/usb/host/ehci-ixp4xx.c linux-2.6.24.2-owrt/driv +// .bus = &platform_bus_type + }, +}; -diff -Nur linux-2.6.24.2/drivers/usb/host/Kconfig linux-2.6.24.2-owrt/drivers/usb/host/Kconfig ---- linux-2.6.24.2/drivers/usb/host/Kconfig 2008-02-11 06:51:11.000000000 +0100 -+++ linux-2.6.24.2-owrt/drivers/usb/host/Kconfig 2008-04-22 12:58:42.000000000 +0200 -@@ -69,12 +69,12 @@ +Index: linux-2.6.24.7/drivers/usb/host/Kconfig +=================================================================== +--- linux-2.6.24.7.orig/drivers/usb/host/Kconfig ++++ linux-2.6.24.7/drivers/usb/host/Kconfig +@@ -69,12 +69,12 @@ config USB_EHCI_TT_NEWSCHED config USB_EHCI_BIG_ENDIAN_MMIO bool @@ -202,10 +206,11 @@ diff -Nur linux-2.6.24.2/drivers/usb/host/Kconfig linux-2.6.24.2-owrt/drivers/us default y config USB_EHCI_FSL -diff -Nur linux-2.6.24.2/drivers/usb/Kconfig linux-2.6.24.2-owrt/drivers/usb/Kconfig ---- linux-2.6.24.2/drivers/usb/Kconfig 2008-02-11 06:51:11.000000000 +0100 -+++ linux-2.6.24.2-owrt/drivers/usb/Kconfig 2008-04-22 12:58:42.000000000 +0200 -@@ -49,6 +49,7 @@ +Index: linux-2.6.24.7/drivers/usb/Kconfig +=================================================================== +--- linux-2.6.24.7.orig/drivers/usb/Kconfig ++++ linux-2.6.24.7/drivers/usb/Kconfig +@@ -49,6 +49,7 @@ config USB_ARCH_HAS_EHCI boolean default y if PPC_83xx default y if SOC_AU1200 diff --git a/target/linux/ixp4xx/patches-2.6.24/900-include_bitops_h_from_arch_io_h.patch b/target/linux/ixp4xx/patches-2.6.24/900-include_bitops_h_from_arch_io_h.patch index b97c3d7..15e09aa 100644 --- a/target/linux/ixp4xx/patches-2.6.24/900-include_bitops_h_from_arch_io_h.patch +++ b/target/linux/ixp4xx/patches-2.6.24/900-include_bitops_h_from_arch_io_h.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.24.5/include/asm-arm/arch-ixp4xx/io.h +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/io.h =================================================================== ---- linux-2.6.24.5.orig/include/asm-arm/arch-ixp4xx/io.h -+++ linux-2.6.24.5/include/asm-arm/arch-ixp4xx/io.h +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/io.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/io.h @@ -13,6 +13,8 @@ #ifndef __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H 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 29cafd2..b29a6a2 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.1/drivers/rtc/rtc-isl1208.c +Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c =================================================================== ---- linux-2.6.25.1.orig/drivers/rtc/rtc-isl1208.c -+++ linux-2.6.25.1/drivers/rtc/rtc-isl1208.c +--- linux-2.6.25.4.orig/drivers/rtc/rtc-isl1208.c ++++ linux-2.6.25.4/drivers/rtc/rtc-isl1208.c @@ -15,16 +15,15 @@ #include <linux/bcd.h> #include <linux/rtc.h> 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 25f60b4..f0ce41f 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.1/drivers/rtc/rtc-pcf8563.c +Index: linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c =================================================================== ---- linux-2.6.25.1.orig/drivers/rtc/rtc-pcf8563.c -+++ linux-2.6.25.1/drivers/rtc/rtc-pcf8563.c +--- linux-2.6.25.4.orig/drivers/rtc/rtc-pcf8563.c ++++ linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c @@ -18,17 +18,7 @@ #include <linux/bcd.h> #include <linux/rtc.h> 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 cea2e63..bccbccc 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.1/drivers/rtc/rtc-x1205.c +Index: linux-2.6.25.4/drivers/rtc/rtc-x1205.c =================================================================== ---- linux-2.6.25.1.orig/drivers/rtc/rtc-x1205.c -+++ linux-2.6.25.1/drivers/rtc/rtc-x1205.c +--- linux-2.6.25.4.orig/drivers/rtc/rtc-x1205.c ++++ linux-2.6.25.4/drivers/rtc/rtc-x1205.c @@ -22,20 +22,7 @@ #include <linux/rtc.h> #include <linux/delay.h> 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 5a2fb4c..ddbb8a4 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 -Index: linux-2.6.25.1/arch/arm/configs/ixp4xx_defconfig +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/configs/ixp4xx_defconfig ++++ linux-2.6.25.4/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: linux-2.6.25.1/arch/arm/configs/ixp4xx_defconfig CONFIG_RTC_DRV_X1205=y CONFIG_RTC_DRV_PCF8563=y # CONFIG_RTC_DRV_PCF8583 is not set -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig @@ -125,6 +125,15 @@ config ARCH_IXDP4XX depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435 default y @@ -114,10 +114,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig # # Certain registers and IRQs are only enabled if supporting IXP465 CPUs # -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.4/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 @@ -134,10 +134,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-pci.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-pci.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-pci.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-pci.c @@ -0,0 +1,71 @@ +/* + * arch/arch/mach-ixp4xx/fsg-pci.c @@ -210,10 +210,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-pci.c +} + +subsys_initcall(fsg_pci_init); -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-setup.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-setup.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-setup.c @@ -0,0 +1,276 @@ +/* + * arch/arm/mach-ixp4xx/fsg-setup.c @@ -491,10 +491,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/fsg-setup.c + .init_machine = fsg_init, +MACHINE_END + -Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/fsg.h +Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/fsg.h =================================================================== --- /dev/null -+++ linux-2.6.25.1/include/asm-arm/arch-ixp4xx/fsg.h ++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/fsg.h @@ -0,0 +1,50 @@ +/* + * include/asm-arm/arch-ixp4xx/fsg.h @@ -546,10 +546,10 @@ Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/fsg.h +#define FSG_LED_USB_BIT 4 +#define FSG_LED_RING_BIT 5 +#define FSG_LED_SYNC_BIT 7 -Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/hardware.h ++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h @@ -45,5 +45,6 @@ #include "nslu2.h" #include "nas100d.h" @@ -557,10 +557,10 @@ Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h +#include "fsg.h" #endif /* _ASM_ARCH_HARDWARE_H */ -Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/irqs.h +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/irqs.h ++++ linux-2.6.25.4/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 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 4830b19..4ebee8d 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 -Index: linux-2.6.25.1/drivers/leds/Kconfig +Index: linux-2.6.25.4/drivers/leds/Kconfig =================================================================== ---- linux-2.6.25.1.orig/drivers/leds/Kconfig -+++ linux-2.6.25.1/drivers/leds/Kconfig +--- linux-2.6.25.4.orig/drivers/leds/Kconfig ++++ linux-2.6.25.4/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,10 +35,10 @@ Index: linux-2.6.25.1/drivers/leds/Kconfig config LEDS_TOSA tristate "LED Support for the Sharp SL-6000 series" depends on LEDS_CLASS && PXA_SHARPSL -Index: linux-2.6.25.1/drivers/leds/Makefile +Index: linux-2.6.25.4/drivers/leds/Makefile =================================================================== ---- linux-2.6.25.1.orig/drivers/leds/Makefile -+++ linux-2.6.25.1/drivers/leds/Makefile +--- linux-2.6.25.4.orig/drivers/leds/Makefile ++++ linux-2.6.25.4/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 @@ -47,10 +47,10 @@ Index: linux-2.6.25.1/drivers/leds/Makefile # LED Triggers obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o -Index: linux-2.6.25.1/drivers/leds/leds-fsg.c +Index: linux-2.6.25.4/drivers/leds/leds-fsg.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/drivers/leds/leds-fsg.c ++++ linux-2.6.25.4/drivers/leds/leds-fsg.c @@ -0,0 +1,261 @@ +/* + * LED Driver for the Freecom FSG-3 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 492b84c..7c95955 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.25.1/drivers/char/random.c +Index: linux-2.6.25.4/drivers/char/random.c =================================================================== ---- linux-2.6.25.1.orig/drivers/char/random.c -+++ linux-2.6.25.1/drivers/char/random.c +--- linux-2.6.25.4.orig/drivers/char/random.c ++++ linux-2.6.25.4/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 a32cb70..5d92f10 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/gateway7001-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c ++++ linux-2.6.25.4/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 7b279e0..81b89c7 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v2-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c ++++ linux-2.6.25.4/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 156fcb1..3f8094d 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,7 +1,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.4/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,10 +17,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig config ARCH_IXDP425 bool "IXDP425" help -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.4/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 @@ -37,10 +37,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-pci.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-pci.c @@ -0,0 +1,74 @@ +/* + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c @@ -116,10 +116,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c +} + +subsys_initcall(pronghornmetro_pci_init); -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c @@ -0,0 +1,147 @@ +/* + * arch/arm/mach-ixp4xx/pronghornmetro-setup.c @@ -268,10 +268,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c + .init_machine = pronghornmetro_init, +MACHINE_END +#endif -Index: linux-2.6.25.1/Documentation/arm/IXP4xx +Index: linux-2.6.25.4/Documentation/arm/IXP4xx =================================================================== ---- linux-2.6.25.1.orig/Documentation/arm/IXP4xx -+++ linux-2.6.25.1/Documentation/arm/IXP4xx +--- linux-2.6.25.4.orig/Documentation/arm/IXP4xx ++++ linux-2.6.25.4/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. @@ -282,10 +282,10 @@ Index: linux-2.6.25.1/Documentation/arm/IXP4xx Gateworks Avila Network Platform http://www.gateworks.com/avila_sbc.htm -Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h @@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_set * Some boards are using UART2 as console */ 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 3a523d1..2cd5a81 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ++++ linux-2.6.25.4/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 c0efcb0..6326db1 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,7 +1,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.4/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,10 +17,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig config ARCH_IXDP425 bool "IXDP425" help -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.4/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 @@ -37,10 +37,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c @@ -0,0 +1,120 @@ +/* + * arch/arm/mach-ixp4xx/compex-setup.c @@ -162,10 +162,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c + .init_machine = compex_init, +MACHINE_END +#endif -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c @@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = { int __init ixdp425_pci_init(void) { @@ -175,10 +175,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c pci_common_init(&ixdp425_pci); return 0; } -Index: linux-2.6.25.1/arch/arm/tools/mach-types +Index: linux-2.6.25.4/arch/arm/tools/mach-types =================================================================== ---- linux-2.6.25.1.orig/arch/arm/tools/mach-types -+++ linux-2.6.25.1/arch/arm/tools/mach-types +--- linux-2.6.25.4.orig/arch/arm/tools/mach-types ++++ linux-2.6.25.4/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 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 ffca727..7c0d76c 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/compex-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/compex-setup.c ++++ linux-2.6.25.4/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 dfb2546..5665f65 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,7 +1,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.4/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,10 +17,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig config ARCH_IXDP425 bool "IXDP425" help -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.4/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 @@ -37,10 +37,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-pci.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-pci.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-pci.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-pci.c @@ -0,0 +1,65 @@ +/* + * arch/arch/mach-ixp4xx/wrt300nv2-pci.c @@ -107,10 +107,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-pci.c +} + +subsys_initcall(wrt300nv2_pci_init); -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c @@ -0,0 +1,108 @@ +/* + * arch/arm/mach-ixp4xx/wrt300nv2-setup.c @@ -220,10 +220,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c + .init_machine = wrt300nv2_init, +MACHINE_END +#endif -Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.25.4/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() || 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 69f5246..b1d6dd2 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c ++++ linux-2.6.25.4/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 507007e..48188a5 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.4/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>. @@ -26,10 +26,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig default y config CPU_IXP43X -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.4/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 @@ -46,10 +46,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-pci.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-pci.c @@ -0,0 +1,71 @@ +/* + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c @@ -122,10 +122,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-pci.c +} + +subsys_initcall(sidewinder_pci_init); -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-setup.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-setup.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/sidewinder-setup.c ++++ linux-2.6.25.4/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 6cfc5be..ccbfe28 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,7 +1,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c @@ -0,0 +1,151 @@ +/* + * arch/arm/mach-ixp4xx/ap1000-setup.c @@ -154,10 +154,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c + .init_machine = ap1000_init, +MACHINE_END +#endif -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c @@ -66,7 +66,8 @@ struct hw_pci ixdp425_pci __initdata = { int __init ixdp425_pci_init(void) { @@ -168,10 +168,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixdp425-pci.c pci_common_init(&ixdp425_pci); return 0; } -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.4/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 @@ -187,10 +187,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig config ARCH_IXDP425 bool "IXDP425" help -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.4/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 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 2d1a5f2..e94046e 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ap1000-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ap1000-setup.c ++++ linux-2.6.25.4/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 0b54355..b0b4334 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,7 +1,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.4/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,10 +17,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig config MACH_WG302V2 bool "Netgear WG302 v2 / WAG302 v2" select PCI -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.4/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 @@ -37,10 +37,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile 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.25.1/arch/arm/mach-ixp4xx/wg302v1-pci.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-pci.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-pci.c ++++ linux-2.6.25.4/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.25.1/arch/arm/mach-ixp4xx/wg302v1-pci.c +} + +subsys_initcall(wg302v1_pci_init); -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c ++++ linux-2.6.25.4/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 03314b5..332dbce 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c ++++ linux-2.6.25.4/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 db8923d..b1ecf2e 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c @@ -100,6 +100,36 @@ static struct platform_device *wg302v1_d &wg302_eth[0], }; 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 ec72314..e6a3875 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,7 +1,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/coyote-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/coyote-setup.c ++++ linux-2.6.25.4/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 3b7ad83..e4a8bf5 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.4/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>. @@ -17,10 +17,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig config MACH_NAS100D bool prompt "NAS100D" -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.4/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 @@ -37,10 +37,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-setup.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-setup.c @@ -0,0 +1,162 @@ +/* + * arch/arm/mach-ixp4xx/tw5334-setup.c @@ -204,10 +204,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-setup.c + .init_machine = tw5334_init, +MACHINE_END +#endif -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-pci.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-pci.c @@ -0,0 +1,69 @@ +/* + * arch/arch/mach-ixp4xx/tw5334-pci.c @@ -278,10 +278,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/tw5334-pci.c +} + +subsys_initcall(tw5334_pci_init); -Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/uncompress.h +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.25.4/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() || 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 ccd4045..ee207d1 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.4/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>. @@ -26,10 +26,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig default y config MACH_GTWX5715 -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile @@ -7,6 +7,7 @@ obj-pci-n := obj-pci-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o @@ -46,10 +46,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-pci.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-pci.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c @@ -0,0 +1,74 @@ +/* + * arch/arch/mach-ixp4xx/cambria-pci.c @@ -125,10 +125,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-pci.c +} + +subsys_initcall(cambria_pci_init); -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-setup.c +Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c @@ -0,0 +1,250 @@ +/* + * arch/arm/mach-ixp4xx/cambria-setup.c @@ -380,10 +380,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/cambria-setup.c + .init_machine = cambria_init, +MACHINE_END +#endif -Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/hardware.h ++++ linux-2.6.25.4/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 4faad52..9b34b8a 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 @@ -Index: linux-2.6.25.1/drivers/net/arm/Kconfig +Index: linux-2.6.25.4/drivers/net/arm/Kconfig =================================================================== ---- linux-2.6.25.1.orig/drivers/net/arm/Kconfig -+++ linux-2.6.25.1/drivers/net/arm/Kconfig +--- linux-2.6.25.4.orig/drivers/net/arm/Kconfig ++++ linux-2.6.25.4/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,19 +14,19 @@ Index: linux-2.6.25.1/drivers/net/arm/Kconfig + help + Say Y here if you want to use built-in Ethernet ports + on IXP4xx processor. -Index: linux-2.6.25.1/drivers/net/arm/Makefile +Index: linux-2.6.25.4/drivers/net/arm/Makefile =================================================================== ---- linux-2.6.25.1.orig/drivers/net/arm/Makefile -+++ linux-2.6.25.1/drivers/net/arm/Makefile +--- linux-2.6.25.4.orig/drivers/net/arm/Makefile ++++ linux-2.6.25.4/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 -Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c +Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c @@ -0,0 +1,1265 @@ +/* + * Intel IXP4xx Ethernet driver for Linux @@ -1293,10 +1293,10 @@ Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c +MODULE_ALIAS("platform:ixp4xx_eth"); +module_init(eth_init_module); +module_exit(eth_cleanup_module); -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c @@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, co return -ETIMEDOUT; } @@ -1317,10 +1317,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c return 0; } -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c ++++ linux-2.6.25.4/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 dce7655..c269caf 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.25.4/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 93a5d2d..5104017 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.25.1/drivers/net/arm/ixp4xx_eth.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c @@ -165,14 +165,15 @@ struct port { struct net_device *netdev; struct napi_struct napi; @@ -228,10 +228,10 @@ Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread); return 0; -Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/platform.h +Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h =================================================================== ---- 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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.25.4/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 7d635de..b53bf5f 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.25.1/drivers/net/arm/ixp4xx_eth.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.25.4/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 18d5d87..264a99e 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,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.25.4/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]); @@ -22,10 +22,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/ixp4xx_npe.c if (!npe->id) instr_size = NPE_A_42X_INSTR_SIZE; else -Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c @@ -32,6 +32,7 @@ #include <linux/kernel.h> #include <linux/mii.h> @@ -55,10 +55,10 @@ Index: linux-2.6.25.1/drivers/net/arm/ixp4xx_eth.c __raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control); return platform_driver_register(&drv); -Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/cpu.h +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/cpu.h ++++ linux-2.6.25.4/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()) @@ -68,10 +68,10 @@ Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/cpu.h return val; } -Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h ++++ linux-2.6.25.4/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 c3349f1..50683fd 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,7 +1,7 @@ -Index: linux-2.6.25.1/drivers/net/wan/Kconfig +Index: linux-2.6.25.4/drivers/net/wan/Kconfig =================================================================== ---- linux-2.6.25.1.orig/drivers/net/wan/Kconfig -+++ linux-2.6.25.1/drivers/net/wan/Kconfig +--- linux-2.6.25.4.orig/drivers/net/wan/Kconfig ++++ linux-2.6.25.4/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: linux-2.6.25.1/drivers/net/wan/Kconfig config DLCI tristate "Frame Relay DLCI support" ---help--- -Index: linux-2.6.25.1/drivers/net/wan/Makefile +Index: linux-2.6.25.4/drivers/net/wan/Makefile =================================================================== ---- linux-2.6.25.1.orig/drivers/net/wan/Makefile -+++ linux-2.6.25.1/drivers/net/wan/Makefile +--- linux-2.6.25.4.orig/drivers/net/wan/Makefile ++++ linux-2.6.25.4/drivers/net/wan/Makefile @@ -42,6 +42,7 @@ obj-$(CONFIG_C101) += c101.o obj-$(CONFIG_WANXL) += wanxl.o obj-$(CONFIG_PCI200SYN) += pci200syn.o @@ -30,10 +30,10 @@ Index: linux-2.6.25.1/drivers/net/wan/Makefile clean-files := wanxlfw.inc $(obj)/wanxl.o: $(obj)/wanxlfw.inc -Index: linux-2.6.25.1/drivers/net/wan/ixp4xx_hss.c +Index: linux-2.6.25.4/drivers/net/wan/ixp4xx_hss.c =================================================================== --- /dev/null -+++ linux-2.6.25.1/drivers/net/wan/ixp4xx_hss.c ++++ linux-2.6.25.4/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 e8e59df..5849a7b 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,7 +1,7 @@ -Index: linux-2.6.25.1/drivers/i2c/chips/eeprom.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/drivers/i2c/chips/eeprom.c ++++ linux-2.6.25.4/drivers/i2c/chips/eeprom.c @@ -33,6 +33,8 @@ #include <linux/jiffies.h> #include <linux/i2c.h> @@ -99,10 +99,10 @@ Index: linux-2.6.25.1/drivers/i2c/chips/eeprom.c static int __init eeprom_init(void) { return i2c_add_driver(&eeprom_driver); -Index: linux-2.6.25.1/include/linux/eeprom.h +Index: linux-2.6.25.4/include/linux/eeprom.h =================================================================== --- /dev/null -+++ linux-2.6.25.1/include/linux/eeprom.h ++++ linux-2.6.25.4/include/linux/eeprom.h @@ -0,0 +1,71 @@ +#ifndef _LINUX_EEPROM_H +#define _LINUX_EEPROM_H @@ -175,10 +175,10 @@ Index: linux-2.6.25.1/include/linux/eeprom.h +extern int unregister_eeprom_notifier(struct notifier_block *nb); + +#endif /* _LINUX_EEPROM_H */ -Index: linux-2.6.25.1/include/linux/notifier.h +Index: linux-2.6.25.4/include/linux/notifier.h =================================================================== ---- linux-2.6.25.1.orig/include/linux/notifier.h -+++ linux-2.6.25.1/include/linux/notifier.h +--- linux-2.6.25.4.orig/include/linux/notifier.h ++++ linux-2.6.25.4/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 */ 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 4c103ac..26267c8 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.25.1/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c @@ -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 7f2d611..1d154c6 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.25.1/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c @@ -14,10 +14,18 @@ #include <linux/kernel.h> #include <linux/init.h> 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 14be023..b7e4940 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.25.1/include/asm-arm/arch-ixp4xx/avila.h +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/avila.h ++++ linux-2.6.25.4/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.25.1/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.25.1/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c @@ -26,6 +26,7 @@ # include <linux/eeprom.h> #endif 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 8c91f0d..7e4e3b9 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.25.1/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c @@ -192,10 +192,28 @@ static struct platform_device avila_leds .dev.platform_data = &avila_leds_data, }; @@ -32,10 +32,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c }; static void __init avila_gw23xx_setup(void) -Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/avila.h +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/avila.h ++++ linux-2.6.25.4/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 fa91b38..3e5c3fe 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,7 +1,7 @@ -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c @@ -247,6 +247,7 @@ static void __init avila_gw2345_setup(vo static void __init avila_gw2347_setup(void) @@ -18,10 +18,10 @@ Index: linux-2.6.25.1/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.25.1/drivers/net/arm/ixp4xx_eth.c +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c @@ -348,6 +348,14 @@ static void phy_reset(struct net_device return; } @@ -37,10 +37,10 @@ Index: linux-2.6.25.1/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.25.1/include/asm-arm/arch-ixp4xx/platform.h +Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h =================================================================== ---- 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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h @@ -104,6 +104,8 @@ struct eth_plat_info { u8 txreadyq; u8 hwaddr[6]; 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 2b7cd76..9831cd5 100644 --- a/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch +++ b/target/linux/ixp4xx/patches-2.6.25/400-dmabounce.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25.1/arch/arm/common/dmabounce.c +Index: linux-2.6.25.4/arch/arm/common/dmabounce.c =================================================================== ---- linux-2.6.25.1.orig/arch/arm/common/dmabounce.c -+++ linux-2.6.25.1/arch/arm/common/dmabounce.c +--- linux-2.6.25.4.orig/arch/arm/common/dmabounce.c ++++ linux-2.6.25.4/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; @@ -13,10 +13,10 @@ Index: linux-2.6.25.1/arch/arm/common/dmabounce.c pool = NULL; } -Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.25.4/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 0ec2149..74bc9ae 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.25.1/include/asm-arm/arch-ixp4xx/avila.h +Index: linux-2.6.25.4/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 +--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/avila.h ++++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h @@ -25,7 +25,7 @@ /* * AVILA PCI IRQs diff --git a/target/linux/ixp4xx/patches/050-dsmg600_upstream_support.patch b/target/linux/ixp4xx/patches/050-dsmg600_upstream_support.patch index b214ef2..5f27aa7 100644 --- a/target/linux/ixp4xx/patches/050-dsmg600_upstream_support.patch +++ b/target/linux/ixp4xx/patches/050-dsmg600_upstream_support.patch @@ -24,11 +24,11 @@ Signed-off-by: Michael Westerhof <mwester@dls.net> include/asm-arm/arch-ixp4xx/irqs.h | 10 + 8 files changed, 458 insertions(+) -Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/Kconfig +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig =================================================================== ---- linux-2.6.21.1-armeb.orig/arch/arm/mach-ixp4xx/Kconfig -+++ linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/Kconfig -@@ -89,6 +89,15 @@ +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig +@@ -89,6 +89,15 @@ config MACH_NAS100D NAS 100d device. For more information on this platform, see http://www.nslu2-linux.org/wiki/NAS100d/HomePage @@ -44,11 +44,11 @@ Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/Kconfig # # Avila and IXDP share the same source for now. Will change in future # -Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile =================================================================== ---- linux-2.6.21.1-armeb.orig/arch/arm/mach-ixp4xx/Makefile -+++ linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/Makefile -@@ -12,6 +12,7 @@ +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile +@@ -12,6 +12,7 @@ obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coy obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-pci.o obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o @@ -56,17 +56,17 @@ Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/Makefile obj-y += common.o -@@ -22,5 +23,6 @@ +@@ -22,5 +23,6 @@ obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote- obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o +obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o -Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-pci.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-pci.c =================================================================== --- /dev/null -+++ linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-pci.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-pci.c @@ -0,0 +1,74 @@ +/* + * DSM-G600 board-level PCI initialization @@ -142,10 +142,10 @@ Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-pci.c +} + +subsys_initcall(dsmg600_pci_init); -Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-power.c =================================================================== --- /dev/null -+++ linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-power.c @@ -0,0 +1,130 @@ +/* + * arch/arm/mach-ixp4xx/dsmg600-power.c @@ -277,10 +277,10 @@ Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c +MODULE_AUTHOR("Michael Westerhof <mwester@dls.net>"); +MODULE_DESCRIPTION("DSM-G600 Power/Reset driver"); +MODULE_LICENSE("GPL"); -Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c =================================================================== --- /dev/null -+++ linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c @@ -0,0 +1,175 @@ +/* + * DSM-G600 board-setup @@ -457,10 +457,10 @@ Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c + .timer = &ixp4xx_timer, + .init_machine = dsmg600_init, +MACHINE_END -Index: linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/dsmg600.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/dsmg600.h =================================================================== --- /dev/null -+++ linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/dsmg600.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/dsmg600.h @@ -0,0 +1,57 @@ +/* + * DSM-G600 platform specific definitions @@ -519,21 +519,21 @@ Index: linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/dsmg600.h + +#define DSMG600_LED_WLAN_GPIO 14 +#define DSMG600_LED_WLAN_BM (1L << DSMG600_LED_WLAN_GPIO) -Index: linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/hardware.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/hardware.h =================================================================== ---- linux-2.6.21.1-armeb.orig/include/asm-arm/arch-ixp4xx/hardware.h -+++ linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/hardware.h -@@ -47,5 +47,6 @@ +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/hardware.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/hardware.h +@@ -47,5 +47,6 @@ extern unsigned int processor_id; #include "prpmc1100.h" #include "nslu2.h" #include "nas100d.h" +#include "dsmg600.h" #endif /* _ASM_ARCH_HARDWARE_H */ -Index: linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/irqs.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/irqs.h =================================================================== ---- linux-2.6.21.1-armeb.orig/include/asm-arm/arch-ixp4xx/irqs.h -+++ linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/irqs.h +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/irqs.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/irqs.h @@ -118,4 +118,14 @@ #define IRQ_NAS100D_PCI_INTD IRQ_IXP4XX_GPIO8 #define IRQ_NAS100D_PCI_INTE IRQ_IXP4XX_GPIO7 diff --git a/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch b/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch index 5b406a7..2975712 100644 --- a/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch +++ b/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch @@ -5,10 +5,10 @@ that a 'fixup' routine is avoided. Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk> -Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c =================================================================== ---- linux-2.6.21-arm.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-05-07 12:05:40.000000000 -0700 -+++ linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-05-07 12:15:56.000000000 -0700 +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c @@ -22,6 +22,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -17,7 +17,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c static struct flash_platform_data nslu2_flash_data = { .map_name = "cfi_probe", -@@ -157,10 +158,21 @@ +@@ -157,10 +158,21 @@ static void nslu2_power_off(void) gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH); } @@ -41,7 +41,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c ixp4xx_sys_init(); nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -@@ -185,6 +197,6 @@ +@@ -185,6 +197,6 @@ MACHINE_START(NSLU2, "Linksys NSLU2") .boot_params = 0x00000100, .map_io = ixp4xx_map_io, .init_irq = ixp4xx_init_irq, @@ -49,11 +49,11 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c + .timer = &nslu2_timer, .init_machine = nslu2_init, MACHINE_END -Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/common.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/common.c =================================================================== ---- linux-2.6.21-arm.orig/arch/arm/mach-ixp4xx/common.c 2007-05-07 12:05:40.000000000 -0700 -+++ linux-2.6.21-arm/arch/arm/mach-ixp4xx/common.c 2007-05-07 12:15:16.000000000 -0700 -@@ -269,7 +269,7 @@ +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/common.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/common.c +@@ -269,7 +269,7 @@ static struct irqaction ixp4xx_timer_irq .handler = ixp4xx_timer_interrupt, }; @@ -62,11 +62,11 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/common.c { /* Clear Pending Interrupt by writing '1' to it */ *IXP4XX_OSST = IXP4XX_OSST_TIMER_1_PEND; -Index: linux-2.6.21-arm/include/asm-arm/arch-ixp4xx/platform.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h =================================================================== ---- linux-2.6.21-arm.orig/include/asm-arm/arch-ixp4xx/platform.h 2007-05-07 12:05:40.000000000 -0700 -+++ linux-2.6.21-arm/include/asm-arm/arch-ixp4xx/platform.h 2007-05-07 12:15:16.000000000 -0700 -@@ -113,6 +113,7 @@ +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h +@@ -113,6 +113,7 @@ extern unsigned long ixp4xx_timer_freq; extern void ixp4xx_map_io(void); extern void ixp4xx_init_irq(void); extern void ixp4xx_sys_init(void); @@ -74,10 +74,10 @@ Index: linux-2.6.21-arm/include/asm-arm/arch-ixp4xx/platform.h extern struct sys_timer ixp4xx_timer; extern void ixp4xx_pci_preinit(void); struct pci_sys_data; -Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c =================================================================== ---- linux-2.6.21-arm.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c 2007-05-07 12:05:42.000000000 -0700 -+++ linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c 2007-05-07 12:16:07.000000000 -0700 +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c @@ -18,6 +18,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -86,7 +86,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c static struct flash_platform_data dsmg600_flash_data = { .map_name = "cfi_probe", -@@ -128,6 +129,19 @@ +@@ -128,6 +129,19 @@ static void dsmg600_power_off(void) gpio_line_set(DSMG600_PO_GPIO, IXP4XX_GPIO_HIGH); } @@ -106,7 +106,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c static void __init dsmg600_init(void) { ixp4xx_sys_init(); -@@ -155,21 +169,13 @@ +@@ -155,21 +169,13 @@ static void __init dsmg600_init(void) #endif } diff --git a/target/linux/ixp4xx/patches/080-trivial_nslu2_nas100d_cleanup.patch b/target/linux/ixp4xx/patches/080-trivial_nslu2_nas100d_cleanup.patch index f0bfcde..13ae639 100644 --- a/target/linux/ixp4xx/patches/080-trivial_nslu2_nas100d_cleanup.patch +++ b/target/linux/ixp4xx/patches/080-trivial_nslu2_nas100d_cleanup.patch @@ -5,11 +5,11 @@ are included. Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk> -Index: linux-2.6.21-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c =================================================================== ---- linux-2.6.21-armeb.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-05-09 07:32:43.000000000 -0700 -+++ linux-2.6.21-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-05-09 07:32:46.000000000 -0700 -@@ -50,26 +50,26 @@ +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c +@@ -50,26 +50,26 @@ static struct ixp4xx_i2c_pins nslu2_i2c_ static struct resource nslu2_led_resources[] = { { .name = "ready", /* green led */ @@ -44,7 +44,7 @@ Index: linux-2.6.21-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c .flags = IXP4XX_GPIO_LOW, }, }; -@@ -181,7 +181,8 @@ +@@ -181,7 +181,8 @@ static void __init nslu2_init(void) pm_power_off = nslu2_power_off; @@ -54,10 +54,10 @@ Index: linux-2.6.21-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c * to have it first in order to see debug messages, and so that * it does *not* get removed if platform_add_devices fails! */ -Index: linux-2.6.21-armeb/include/asm-arm/arch-ixp4xx/nslu2.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/nslu2.h =================================================================== ---- linux-2.6.21-armeb.orig/include/asm-arm/arch-ixp4xx/nslu2.h 2007-05-09 07:32:43.000000000 -0700 -+++ linux-2.6.21-armeb/include/asm-arm/arch-ixp4xx/nslu2.h 2007-05-09 07:32:46.000000000 -0700 +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/nslu2.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/nslu2.h @@ -9,7 +9,7 @@ * based on ixdp425.h: * Copyright 2004 (c) MontaVista, Software, Inc. @@ -132,10 +132,10 @@ Index: linux-2.6.21-armeb/include/asm-arm/arch-ixp4xx/nslu2.h +#define NSLU2_LED_DISK2_BM (1L << NSLU2_LED_DISK2_GPIO) -Index: linux-2.6.21-armeb/include/asm-arm/arch-ixp4xx/nas100d.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/nas100d.h =================================================================== ---- linux-2.6.21-armeb.orig/include/asm-arm/arch-ixp4xx/nas100d.h 2007-04-25 20:08:32.000000000 -0700 -+++ linux-2.6.21-armeb/include/asm-arm/arch-ixp4xx/nas100d.h 2007-05-09 07:34:14.000000000 -0700 +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/nas100d.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/nas100d.h @@ -10,7 +10,7 @@ * based on ixdp425.h: * Copyright 2004 (c) MontaVista, Software, Inc. @@ -180,11 +180,11 @@ Index: linux-2.6.21-armeb/include/asm-arm/arch-ixp4xx/nas100d.h #define NAS100D_PB_IRQ IRQ_IXP4XX_GPIO14 #define NAS100D_RB_IRQ IRQ_IXP4XX_GPIO4 -Index: linux-2.6.21-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c =================================================================== ---- linux-2.6.21-armeb.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-05-09 07:32:43.000000000 -0700 -+++ linux-2.6.21-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-05-09 07:34:55.000000000 -0700 -@@ -155,7 +155,8 @@ +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c +@@ -155,7 +155,8 @@ static void __init nas100d_init(void) pm_power_off = nas100d_power_off; diff --git a/target/linux/ixp4xx/patches/100-npe_driver.patch b/target/linux/ixp4xx/patches/100-npe_driver.patch index 78fb119..987e349 100644 --- a/target/linux/ixp4xx/patches/100-npe_driver.patch +++ b/target/linux/ixp4xx/patches/100-npe_driver.patch @@ -1,10 +1,7 @@ -diff --git a/Documentation/networking/ixp4xx/IxNpeMicrocode.h b/Documentation/networking/ixp4xx/IxNpeMicrocode.h -new file mode 100644 -index 0000000..e5a4bd3 -Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/IxNpeMicrocode.h +Index: linux-2.6.21.7/Documentation/networking/ixp4xx/IxNpeMicrocode.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/IxNpeMicrocode.h 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/Documentation/networking/ixp4xx/IxNpeMicrocode.h @@ -0,0 +1,143 @@ +/* + * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file @@ -149,10 +146,10 @@ Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/IxNpeMicrocode.h + close(fd); + return 0; +} -Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/README +Index: linux-2.6.21.7/Documentation/networking/ixp4xx/README =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/README 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/Documentation/networking/ixp4xx/README @@ -0,0 +1,62 @@ +Informations about the Networking Driver using the IXP4XX CPU internal NPEs +and Queue manager. @@ -216,10 +213,10 @@ Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/README + to grab the microcode from a binary image like the RedBoot bootloader. + + -Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/mc_grab.c +Index: linux-2.6.21.7/Documentation/networking/ixp4xx/mc_grab.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/mc_grab.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/Documentation/networking/ixp4xx/mc_grab.c @@ -0,0 +1,97 @@ +/* + * mc_grab.c - grabs IXP4XX microcode from a binary datastream @@ -318,11 +315,11 @@ Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/mc_grab.c + fprintf(stderr, "Error reading Microcode\n"); + return ret; +} -Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/common.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/common.c =================================================================== ---- linux-2.6.21-rc1-arm.orig/arch/arm/mach-ixp4xx/common.c 2007-02-21 02:24:18.000000000 -0800 -+++ linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/common.c 2007-02-21 02:24:35.000000000 -0800 -@@ -357,6 +357,90 @@ +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/common.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/common.c +@@ -357,6 +357,90 @@ static struct platform_device *ixp46x_de &ixp46x_i2c_controller }; @@ -413,7 +410,7 @@ Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/common.c unsigned long ixp4xx_exp_bus_size; EXPORT_SYMBOL(ixp4xx_exp_bus_size); -@@ -378,8 +462,19 @@ +@@ -378,8 +462,19 @@ void __init ixp4xx_sys_init(void) break; } } @@ -433,11 +430,11 @@ Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/common.c printk("IXP4xx: Using %luMiB expansion bus window size\n", ixp4xx_exp_bus_size >> 20); } -Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/ixdp425-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/ixdp425-setup.c =================================================================== ---- linux-2.6.21-rc1-arm.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-02-21 02:24:18.000000000 -0800 -+++ linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-02-21 02:24:35.000000000 -0800 -@@ -101,10 +101,59 @@ +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/ixdp425-setup.c +@@ -101,10 +101,59 @@ static struct platform_device ixdp425_ua .resource = ixdp425_uart_resources }; @@ -498,11 +495,11 @@ Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/ixdp425-setup.c }; static void __init ixdp425_init(void) -Index: linux-2.6.21-rc1-arm/drivers/net/Kconfig +Index: linux-2.6.21.7/drivers/net/Kconfig =================================================================== ---- linux-2.6.21-rc1-arm.orig/drivers/net/Kconfig 2007-02-21 02:24:18.000000000 -0800 -+++ linux-2.6.21-rc1-arm/drivers/net/Kconfig 2007-02-21 02:24:35.000000000 -0800 -@@ -201,6 +201,8 @@ +--- linux-2.6.21.7.orig/drivers/net/Kconfig ++++ linux-2.6.21.7/drivers/net/Kconfig +@@ -324,6 +324,8 @@ config MACB source "drivers/net/arm/Kconfig" @@ -511,11 +508,11 @@ Index: linux-2.6.21-rc1-arm/drivers/net/Kconfig config MACE tristate "MACE (Power Mac ethernet) support" depends on NET_ETHERNET && PPC_PMAC && PPC32 -Index: linux-2.6.21-rc1-arm/drivers/net/Makefile +Index: linux-2.6.21.7/drivers/net/Makefile =================================================================== ---- linux-2.6.21-rc1-arm.orig/drivers/net/Makefile 2007-02-21 02:24:18.000000000 -0800 -+++ linux-2.6.21-rc1-arm/drivers/net/Makefile 2007-02-21 02:24:35.000000000 -0800 -@@ -212,6 +212,7 @@ +--- linux-2.6.21.7.orig/drivers/net/Makefile ++++ linux-2.6.21.7/drivers/net/Makefile +@@ -213,6 +213,7 @@ obj-$(CONFIG_HAMRADIO) += hamradio/ obj-$(CONFIG_IRDA) += irda/ obj-$(CONFIG_ETRAX_ETHERNET) += cris/ obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/ @@ -523,10 +520,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/Makefile obj-$(CONFIG_NETCONSOLE) += netconsole.o -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Kconfig +Index: linux-2.6.21.7/drivers/net/ixp4xx/Kconfig =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Kconfig 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/Kconfig @@ -0,0 +1,48 @@ +config IXP4XX_QMGR + tristate "IXP4xx Queue Manager support" @@ -576,10 +573,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Kconfig + help + This driver is a generic NPE-crypto access layer. + You need additional code in OCF for example. -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Makefile +Index: linux-2.6.21.7/drivers/net/ixp4xx/Makefile =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Makefile 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/Makefile @@ -0,0 +1,7 @@ +obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o +obj-$(CONFIG_IXP4XX_NPE) += ixp4xx_npe.o @@ -588,10 +585,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Makefile + +ixp4xx_npe-objs := ucode_dl.o npe_mh.o npe.o +ixp4xx_mac-objs := mac_driver.o phy.o -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_crypto.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/ixp4xx_crypto.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_crypto.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/ixp4xx_crypto.c @@ -0,0 +1,851 @@ +/* + * ixp4xx_crypto.c - interface to the HW crypto @@ -1444,10 +1441,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_crypto.c +module_init(init_crypto); +module_exit(finish_crypto); + -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_qmgr.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/ixp4xx_qmgr.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_qmgr.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/ixp4xx_qmgr.c @@ -0,0 +1,474 @@ +/* + * qmgr.c - reimplementation of the queue configuration interface. @@ -1923,10 +1920,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_qmgr.c +EXPORT_SYMBOL(queue_set_irq_src); +EXPORT_SYMBOL(queue_set_watermarks); +EXPORT_SYMBOL(queue_len); -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac.h +Index: linux-2.6.21.7/drivers/net/ixp4xx/mac.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac.h 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/mac.h @@ -0,0 +1,275 @@ +/* + * Copyright (C) 2002-2006 Christian Hohnstaedt <chohnstaedt@innominate.com> @@ -2203,10 +2200,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac.h + {"RxInternalNPEReceiveErrors "}, \ + {"TxInternalNPETransmitErrors "} + -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac_driver.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac_driver.c 2007-02-21 02:24:46.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c @@ -0,0 +1,850 @@ +/* + * mac_driver.c - provide a network interface for each MAC @@ -3058,10 +3055,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac_driver.c +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Christian Hohnstaedt <chohnstaedt@innominate.com>"); + -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/npe.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/npe.c @@ -0,0 +1,291 @@ + +#include <linux/ixp_npe.h> @@ -3354,10 +3351,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe.c +EXPORT_SYMBOL(npe_stop); +EXPORT_SYMBOL(npe_start); +EXPORT_SYMBOL(npe_reset); -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe_mh.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/npe_mh.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe_mh.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/npe_mh.c @@ -0,0 +1,170 @@ +/* + * npe_mh.c - NPE message handler. @@ -3529,10 +3526,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe_mh.c +EXPORT_SYMBOL(npe_mh_set_rxqid); +EXPORT_SYMBOL(npe_mh_npe_loopback_mode); +EXPORT_SYMBOL(npe_mh_get_stats); -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/phy.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/phy.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/phy.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/phy.c @@ -0,0 +1,113 @@ +/* + * phy.c - MDIO functions and mii initialisation @@ -3647,10 +3644,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/phy.c + mac->mii.mdio_write = mdio_write_register; +} + -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ucode_dl.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/ucode_dl.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ucode_dl.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/ucode_dl.c @@ -0,0 +1,479 @@ +/* + * ucode_dl.c - provide an NPE device and a char-dev for microcode download @@ -4131,10 +4128,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ucode_dl.c + +EXPORT_SYMBOL(get_npe_by_id); +EXPORT_SYMBOL(return_npe_dev); -Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h =================================================================== ---- linux-2.6.21-rc1-arm.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2007-02-21 02:24:18.000000000 -0800 -+++ linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2007-02-21 02:24:35.000000000 -0800 +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h @@ -22,6 +22,8 @@ #ifndef _ASM_ARM_IXP4XX_H_ #define _ASM_ARM_IXP4XX_H_ @@ -4220,7 +4217,7 @@ Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h #ifndef __ASSEMBLY__ static inline int cpu_is_ixp46x(void) { -@@ -620,6 +668,15 @@ +@@ -620,6 +668,15 @@ static inline int cpu_is_ixp46x(void) #endif return 0; } @@ -4236,10 +4233,10 @@ Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h #endif #endif -Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/npe_regs.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/npe_regs.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/npe_regs.h 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/npe_regs.h @@ -0,0 +1,82 @@ +#ifndef NPE_REGS_H +#define NPE_REGS_H @@ -4323,11 +4320,11 @@ Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/npe_regs.h + +#endif + -Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/platform.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h =================================================================== ---- linux-2.6.21-rc1-arm.orig/include/asm-arm/arch-ixp4xx/platform.h 2007-02-21 02:24:18.000000000 -0800 -+++ linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/platform.h 2007-02-21 02:24:35.000000000 -0800 -@@ -86,6 +86,25 @@ +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h +@@ -86,6 +86,25 @@ struct ixp4xx_i2c_pins { unsigned long scl_pin; }; @@ -4353,10 +4350,10 @@ Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/platform.h /* * This structure provide a means for the board setup code * to give information to th pata_ixp4xx driver. It is -Index: linux-2.6.21-rc1-arm/include/linux/ixp_crypto.h +Index: linux-2.6.21.7/include/linux/ixp_crypto.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/include/linux/ixp_crypto.h 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/include/linux/ixp_crypto.h @@ -0,0 +1,192 @@ + +#ifndef IX_CRYPTO_H @@ -4550,10 +4547,10 @@ Index: linux-2.6.21-rc1-arm/include/linux/ixp_crypto.h + const struct ix_hash_algo *auth, int len); + +#endif -Index: linux-2.6.21-rc1-arm/include/linux/ixp_npe.h +Index: linux-2.6.21.7/include/linux/ixp_npe.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/include/linux/ixp_npe.h 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/include/linux/ixp_npe.h @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt@innominate.com> @@ -4672,10 +4669,10 @@ Index: linux-2.6.21-rc1-arm/include/linux/ixp_npe.h +npe_mh_get_stats(struct npe_info *npe, struct mac_plat_info *mp, u32 phys, int reset); + +#endif -Index: linux-2.6.21-rc1-arm/include/linux/ixp_qmgr.h +Index: linux-2.6.21.7/include/linux/ixp_qmgr.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/include/linux/ixp_qmgr.h 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/include/linux/ixp_qmgr.h @@ -0,0 +1,202 @@ +/* + * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt@innominate.com> diff --git a/target/linux/ixp4xx/patches/110-ixp4xx_net_driver_fix_mac_handling.patch b/target/linux/ixp4xx/patches/110-ixp4xx_net_driver_fix_mac_handling.patch index 1050702..6adf499 100644 --- a/target/linux/ixp4xx/patches/110-ixp4xx_net_driver_fix_mac_handling.patch +++ b/target/linux/ixp4xx/patches/110-ixp4xx_net_driver_fix_mac_handling.patch @@ -2,11 +2,11 @@ drivers/net/ixp4xx/mac_driver.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) -Index: linux-2.6.21-rc4-git6-arm/drivers/net/ixp4xx/mac_driver.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c =================================================================== ---- linux-2.6.21-rc4-git6-arm.orig/drivers/net/ixp4xx/mac_driver.c 2007-03-22 10:32:20.735684085 +0000 -+++ linux-2.6.21-rc4-git6-arm/drivers/net/ixp4xx/mac_driver.c 2007-03-22 10:33:29.355972584 +0000 -@@ -842,7 +842,7 @@ +--- linux-2.6.21.7.orig/drivers/net/ixp4xx/mac_driver.c ++++ linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c +@@ -842,7 +842,7 @@ static void __exit finish_mac(void) } } diff --git a/target/linux/ixp4xx/patches/139-ixp4xx_net_driver_mtd_load_fw.patch b/target/linux/ixp4xx/patches/139-ixp4xx_net_driver_mtd_load_fw.patch index ef53155..9ed1b42 100644 --- a/target/linux/ixp4xx/patches/139-ixp4xx_net_driver_mtd_load_fw.patch +++ b/target/linux/ixp4xx/patches/139-ixp4xx_net_driver_mtd_load_fw.patch @@ -7,11 +7,11 @@ include/linux/ixp_npe.h | 1 6 files changed, 239 insertions(+), 20 deletions(-) -Index: linux-2.6.20-rc3/drivers/net/ixp4xx/Kconfig +Index: linux-2.6.21.7/drivers/net/ixp4xx/Kconfig =================================================================== ---- linux-2.6.20-rc3.orig/drivers/net/ixp4xx/Kconfig -+++ linux-2.6.20-rc3/drivers/net/ixp4xx/Kconfig -@@ -11,6 +11,7 @@ +--- linux-2.6.21.7.orig/drivers/net/ixp4xx/Kconfig ++++ linux-2.6.21.7/drivers/net/ixp4xx/Kconfig +@@ -11,6 +11,7 @@ config IXP4XX_NPE tristate "IXP4xx NPE support" depends on ARCH_IXP4XX depends on NET_ETHERNET @@ -19,7 +19,7 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/Kconfig help The IXP4XX NPE driver supports the 3 CPU co-processors called "Network Processing Engines" (NPE). It adds support fo downloading -@@ -18,7 +19,7 @@ +@@ -18,7 +19,7 @@ config IXP4XX_NPE More about this at: Documentation/networking/ixp4xx/README. You can either use this OR the Intel Access Library (IAL) @@ -28,7 +28,7 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/Kconfig bool "Use Firmware hotplug for Microcode download" depends on IXP4XX_NPE select HOTPLUG -@@ -28,6 +29,13 @@ +@@ -28,6 +29,13 @@ config IXP4XX_FW_LOAD /usr/lib/hotplug/firmware/NPE-[ABC] see Documentation/firmware_class/hotplug-script @@ -42,10 +42,10 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/Kconfig config IXP4XX_MAC tristate "IXP4xx MAC support" depends on IXP4XX_NPE -Index: linux-2.6.20-rc3/drivers/net/ixp4xx/Makefile +Index: linux-2.6.21.7/drivers/net/ixp4xx/Makefile =================================================================== ---- linux-2.6.20-rc3.orig/drivers/net/ixp4xx/Makefile -+++ linux-2.6.20-rc3/drivers/net/ixp4xx/Makefile +--- linux-2.6.21.7.orig/drivers/net/ixp4xx/Makefile ++++ linux-2.6.21.7/drivers/net/ixp4xx/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o obj-$(CONFIG_IXP4XX_NPE) += ixp4xx_npe.o @@ -53,10 +53,10 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/Makefile obj-$(CONFIG_IXP4XX_MAC) += ixp4xx_mac.o obj-$(CONFIG_IXP4XX_CRYPTO) += ixp4xx_crypto.o -Index: linux-2.6.20-rc3/drivers/net/ixp4xx/npe_ucode.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/npe_ucode.c =================================================================== --- /dev/null -+++ linux-2.6.20-rc3/drivers/net/ixp4xx/npe_ucode.c ++++ linux-2.6.21.7/drivers/net/ixp4xx/npe_ucode.c @@ -0,0 +1,185 @@ +/* + * Provide an NPE platform device for microcode handling @@ -243,10 +243,10 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/npe_ucode.c + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -Index: linux-2.6.20-rc3/drivers/net/ixp4xx/ucode_dl.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/ucode_dl.c =================================================================== ---- linux-2.6.20-rc3.orig/drivers/net/ixp4xx/ucode_dl.c -+++ linux-2.6.20-rc3/drivers/net/ixp4xx/ucode_dl.c +--- linux-2.6.21.7.orig/drivers/net/ixp4xx/ucode_dl.c ++++ linux-2.6.21.7/drivers/net/ixp4xx/ucode_dl.c @@ -16,6 +16,7 @@ #include <linux/firmware.h> #include <linux/dma-mapping.h> @@ -268,7 +268,7 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/ucode_dl.c #define EOF_BLOCK 0xf #define IMG_SIZE(image) (((image)->size * sizeof(u32)) + \ sizeof(struct dl_image)) -@@ -38,21 +45,6 @@ +@@ -38,21 +45,6 @@ enum blk_type { data, }; @@ -290,7 +290,7 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/ucode_dl.c struct dl_codeblock { u32 npe_addr; u32 size; -@@ -127,20 +119,33 @@ +@@ -127,20 +119,33 @@ download_block(struct npe_info *npe, str return 0; } @@ -326,7 +326,7 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/ucode_dl.c npe = dev_get_drvdata(dev); if (npe->loaded && (npe->usage > 0)) { printk(KERN_INFO "Cowardly refusing to reload an Image " -@@ -267,8 +272,7 @@ +@@ -267,8 +272,7 @@ static ssize_t ucode_write(struct file * static void npe_firmware_probe(struct device *dev) { @@ -336,16 +336,16 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/ucode_dl.c const struct firmware *fw_entry; struct npe_info *npe = dev_get_drvdata(dev); struct dl_image *image; -@@ -477,3 +481,4 @@ +@@ -477,3 +481,4 @@ MODULE_AUTHOR("Christian Hohnstaedt <cho EXPORT_SYMBOL(get_npe_by_id); EXPORT_SYMBOL(return_npe_dev); +EXPORT_SYMBOL(store_npe_image); -Index: linux-2.6.20-rc3/include/asm-arm/arch-ixp4xx/platform.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h =================================================================== ---- linux-2.6.20-rc3.orig/include/asm-arm/arch-ixp4xx/platform.h -+++ linux-2.6.20-rc3/include/asm-arm/arch-ixp4xx/platform.h -@@ -86,6 +86,21 @@ +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h +@@ -86,6 +86,21 @@ struct ixp4xx_i2c_pins { unsigned long scl_pin; }; @@ -367,7 +367,7 @@ Index: linux-2.6.20-rc3/include/asm-arm/arch-ixp4xx/platform.h struct npe_plat_data { const char *name; int data_size; -@@ -105,6 +120,10 @@ +@@ -105,6 +120,10 @@ struct mac_plat_info { }; @@ -378,11 +378,11 @@ Index: linux-2.6.20-rc3/include/asm-arm/arch-ixp4xx/platform.h /* * This structure provide a means for the board setup code * to give information to th pata_ixp4xx driver. It is -Index: linux-2.6.20-rc3/include/linux/ixp_npe.h +Index: linux-2.6.21.7/include/linux/ixp_npe.h =================================================================== ---- linux-2.6.20-rc3.orig/include/linux/ixp_npe.h -+++ linux-2.6.20-rc3/include/linux/ixp_npe.h -@@ -99,6 +99,7 @@ +--- linux-2.6.21.7.orig/include/linux/ixp_npe.h ++++ linux-2.6.21.7/include/linux/ixp_npe.h +@@ -99,6 +99,7 @@ extern void npe_reset(struct npe_info *n extern struct device *get_npe_by_id(int id); extern void return_npe_dev(struct device *dev); diff --git a/target/linux/ixp4xx/patches/140-ixp4xx_net_driver_no_phy.patch b/target/linux/ixp4xx/patches/140-ixp4xx_net_driver_no_phy.patch index 4bd6875..fcff63a 100644 --- a/target/linux/ixp4xx/patches/140-ixp4xx_net_driver_no_phy.patch +++ b/target/linux/ixp4xx/patches/140-ixp4xx_net_driver_no_phy.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.19.2/drivers/net/ixp4xx/mac_driver.c linux-2.6.19.2-owrt/drivers/net/ixp4xx/mac_driver.c ---- linux-2.6.19.2/drivers/net/ixp4xx/mac_driver.c 2007-04-15 14:26:54.000000000 +0200 -+++ linux-2.6.19.2-owrt/drivers/net/ixp4xx/mac_driver.c 2007-04-15 14:33:44.000000000 +0200 -@@ -161,6 +161,16 @@ +Index: linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c +=================================================================== +--- linux-2.6.21.7.orig/drivers/net/ixp4xx/mac_driver.c ++++ linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c +@@ -161,6 +161,16 @@ static int media_check(struct net_device { struct mac_info *mac = netdev_priv(dev); @@ -18,7 +19,7 @@ diff -Nur linux-2.6.19.2/drivers/net/ixp4xx/mac_driver.c linux-2.6.19.2-owrt/dri if (mii_check_media(&mac->mii, netif_msg_link(mac), init)) { update_duplex_mode(dev); return 1; -@@ -458,7 +468,12 @@ +@@ -448,7 +458,12 @@ static int ixmac_ioctl(struct net_device return -EINVAL; if (!try_module_get(THIS_MODULE)) return -ENODEV; @@ -32,7 +33,7 @@ diff -Nur linux-2.6.19.2/drivers/net/ixp4xx/mac_driver.c linux-2.6.19.2-owrt/dri module_put(THIS_MODULE); if (duplex_changed) update_duplex_mode(dev); -@@ -488,6 +503,9 @@ +@@ -478,6 +493,9 @@ static void ixmac_get_drvinfo(struct net static int ixmac_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { struct mac_info *mac = netdev_priv(dev); @@ -42,7 +43,7 @@ diff -Nur linux-2.6.19.2/drivers/net/ixp4xx/mac_driver.c linux-2.6.19.2-owrt/dri mii_ethtool_gset(&mac->mii, cmd); return 0; } -@@ -496,6 +514,9 @@ +@@ -486,6 +504,9 @@ static int ixmac_set_settings(struct net { struct mac_info *mac = netdev_priv(dev); int rc; @@ -52,7 +53,7 @@ diff -Nur linux-2.6.19.2/drivers/net/ixp4xx/mac_driver.c linux-2.6.19.2-owrt/dri rc = mii_ethtool_sset(&mac->mii, cmd); return rc; } -@@ -503,12 +524,18 @@ +@@ -493,12 +514,18 @@ static int ixmac_set_settings(struct net static int ixmac_nway_reset(struct net_device *dev) { struct mac_info *mac = netdev_priv(dev); diff --git a/target/linux/ixp4xx/patches/141-nslu2_setup_mac.patch b/target/linux/ixp4xx/patches/141-nslu2_setup_mac.patch index cada1bd..5d72f06 100644 --- a/target/linux/ixp4xx/patches/141-nslu2_setup_mac.patch +++ b/target/linux/ixp4xx/patches/141-nslu2_setup_mac.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c =================================================================== ---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nslu2-setup.c -+++ linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c -@@ -137,6 +137,29 @@ static struct platform_device nslu2_uart +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c +@@ -138,6 +138,29 @@ static struct platform_device nslu2_uart .resource = nslu2_uart_resources, }; @@ -32,7 +32,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c static struct platform_device *nslu2_devices[] __initdata = { &nslu2_i2c_controller, &nslu2_flash, -@@ -144,6 +166,7 @@ static struct platform_device *nslu2_dev +@@ -145,6 +168,7 @@ static struct platform_device *nslu2_dev #ifdef CONFIG_LEDS_IXP4XX &nslu2_leds, #endif diff --git a/target/linux/ixp4xx/patches/142-nas100d_setup_mac.patch b/target/linux/ixp4xx/patches/142-nas100d_setup_mac.patch index 9256324..023dd6c 100644 --- a/target/linux/ixp4xx/patches/142-nas100d_setup_mac.patch +++ b/target/linux/ixp4xx/patches/142-nas100d_setup_mac.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c =================================================================== ---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c @@ -123,12 +123,36 @@ static struct platform_device nas100d_ua .resource = nas100d_uart_resources, }; diff --git a/target/linux/ixp4xx/patches/143-nslu2_mtd_microcode.patch b/target/linux/ixp4xx/patches/143-nslu2_mtd_microcode.patch index adf9189..7642544 100644 --- a/target/linux/ixp4xx/patches/143-nslu2_mtd_microcode.patch +++ b/target/linux/ixp4xx/patches/143-nslu2_mtd_microcode.patch @@ -2,11 +2,11 @@ arch/arm/mach-ixp4xx/nslu2-setup.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c =================================================================== ---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nslu2-setup.c -+++ linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c -@@ -159,6 +159,16 @@ static struct platform_device mac0 = { +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c +@@ -161,6 +161,16 @@ static struct platform_device mac0 = { .resource = &res_mac0, }; @@ -23,7 +23,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c static struct platform_device *nslu2_devices[] __initdata = { &nslu2_i2c_controller, &nslu2_flash, -@@ -166,7 +176,8 @@ static struct platform_device *nslu2_dev +@@ -168,7 +178,8 @@ static struct platform_device *nslu2_dev #ifdef CONFIG_LEDS_IXP4XX &nslu2_leds, #endif diff --git a/target/linux/ixp4xx/patches/144-nas100d_mtd_microcode.patch b/target/linux/ixp4xx/patches/144-nas100d_mtd_microcode.patch index 0794e6f..836ed41 100644 --- a/target/linux/ixp4xx/patches/144-nas100d_mtd_microcode.patch +++ b/target/linux/ixp4xx/patches/144-nas100d_mtd_microcode.patch @@ -2,11 +2,11 @@ arch/arm/mach-ixp4xx/nas100d-setup.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c =================================================================== ---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c -@@ -145,13 +145,24 @@ static struct platform_device mac0 = { +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c +@@ -146,13 +146,24 @@ static struct platform_device mac0 = { .resource = &res_mac0, }; diff --git a/target/linux/ixp4xx/patches/152-nas100d_mtd_load_mac.patch b/target/linux/ixp4xx/patches/152-nas100d_mtd_load_mac.patch index 3736886..1adb3fd 100644 --- a/target/linux/ixp4xx/patches/152-nas100d_mtd_load_mac.patch +++ b/target/linux/ixp4xx/patches/152-nas100d_mtd_load_mac.patch @@ -2,10 +2,10 @@ arch/arm/mach-ixp4xx/nas100d-setup.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c =================================================================== ---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c @@ -16,6 +16,7 @@ #include <linux/serial.h> #include <linux/serial_8250.h> @@ -14,7 +14,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c #include <asm/mach-types.h> #include <asm/mach/arch.h> -@@ -165,6 +166,30 @@ static struct platform_device *nas100d_d +@@ -166,6 +167,30 @@ static struct platform_device *nas100d_d &nas100d_npe_ucode, }; @@ -45,7 +45,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c static void nas100d_power_off(void) { /* This causes the box to drop the power and go dead. */ -@@ -196,6 +221,8 @@ static void __init nas100d_init(void) +@@ -198,6 +223,8 @@ static void __init nas100d_init(void) (void)platform_device_register(&nas100d_uart); platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices)); diff --git a/target/linux/ixp4xx/patches/153-nslu2_mtd_load_mac.patch b/target/linux/ixp4xx/patches/153-nslu2_mtd_load_mac.patch index 21fe29a..a290cf6 100644 --- a/target/linux/ixp4xx/patches/153-nslu2_mtd_load_mac.patch +++ b/target/linux/ixp4xx/patches/153-nslu2_mtd_load_mac.patch @@ -2,10 +2,10 @@ arch/arm/mach-ixp4xx/nslu2-setup.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c =================================================================== ---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nslu2-setup.c -+++ linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c @@ -18,6 +18,7 @@ #include <linux/serial.h> #include <linux/serial_8250.h> @@ -14,7 +14,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c #include <asm/mach-types.h> #include <asm/mach/arch.h> -@@ -180,6 +181,30 @@ static struct platform_device *nslu2_dev +@@ -182,6 +183,30 @@ static struct platform_device *nslu2_dev &nslu2_npe_ucode, }; @@ -45,7 +45,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c static void nslu2_power_off(void) { /* This causes the box to drop the power and go dead. */ -@@ -210,6 +235,8 @@ static void __init nslu2_init(void) +@@ -224,6 +249,8 @@ static void __init nslu2_init(void) (void)platform_device_register(&nslu2_uart); platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); diff --git a/target/linux/ixp4xx/patches/160-nas100d_artop_temp_fix.patch b/target/linux/ixp4xx/patches/160-nas100d_artop_temp_fix.patch index b7ac4d9..e93600e 100644 --- a/target/linux/ixp4xx/patches/160-nas100d_artop_temp_fix.patch +++ b/target/linux/ixp4xx/patches/160-nas100d_artop_temp_fix.patch @@ -23,10 +23,10 @@ not to go poking at pata ports if the ret is 0xFF drivers/ata/pata_artop.c | 6 ++++++ 1 file changed, 6 insertions(+) -Index: linux-2.6.19/drivers/ata/pata_artop.c +Index: linux-2.6.21.7/drivers/ata/pata_artop.c =================================================================== ---- linux-2.6.19.orig/drivers/ata/pata_artop.c -+++ linux-2.6.19/drivers/ata/pata_artop.c +--- linux-2.6.21.7.orig/drivers/ata/pata_artop.c ++++ linux-2.6.21.7/drivers/ata/pata_artop.c @@ -26,6 +26,7 @@ #include <scsi/scsi_host.h> #include <linux/libata.h> diff --git a/target/linux/ixp4xx/patches/178-via_velocity_bigendian.patch b/target/linux/ixp4xx/patches/178-via_velocity_bigendian.patch index bfff465..169a537 100644 --- a/target/linux/ixp4xx/patches/178-via_velocity_bigendian.patch +++ b/target/linux/ixp4xx/patches/178-via_velocity_bigendian.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.20-rc3/drivers/net/via-velocity.c +Index: linux-2.6.21.7/drivers/net/via-velocity.c =================================================================== ---- linux-2.6.20-rc3.orig/drivers/net/via-velocity.c 2007-01-02 10:30:25.892465963 +0000 -+++ linux-2.6.20-rc3/drivers/net/via-velocity.c 2007-01-02 10:30:36.261113964 +0000 -@@ -96,11 +96,31 @@ +--- linux-2.6.21.7.orig/drivers/net/via-velocity.c ++++ linux-2.6.21.7/drivers/net/via-velocity.c +@@ -96,11 +96,31 @@ MODULE_AUTHOR("VIA Networking Technologi MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("VIA Networking Velocity Family Gigabit Ethernet Adapter Driver"); @@ -34,7 +34,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c #define RX_DESC_MIN 64 #define RX_DESC_MAX 255 #define RX_DESC_DEF 64 -@@ -385,12 +405,12 @@ +@@ -385,12 +405,12 @@ static void __devinit velocity_set_int_o if (val == -1) *opt = def; else if (val < min || val > max) { @@ -51,7 +51,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c *opt = val; } } -@@ -415,12 +435,12 @@ +@@ -415,12 +435,12 @@ static void __devinit velocity_set_bool_ if (val == -1) *opt |= (def ? flag : 0); else if (val < 0 || val > 1) { @@ -68,7 +68,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c *opt |= (val ? flag : 0); } } -@@ -438,6 +458,7 @@ +@@ -438,6 +458,7 @@ static void __devinit velocity_set_bool_ static void __devinit velocity_get_options(struct velocity_opt *opts, int index, char *devname) { @@ -76,7 +76,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c velocity_set_int_opt(&opts->rx_thresh, rx_thresh[index], RX_THRESH_MIN, RX_THRESH_MAX, RX_THRESH_DEF, "rx_thresh", devname); velocity_set_int_opt(&opts->DMA_length, DMA_length[index], DMA_LENGTH_MIN, DMA_LENGTH_MAX, DMA_LENGTH_DEF, "DMA_length", devname); velocity_set_int_opt(&opts->numrx, RxDescriptors[index], RX_DESC_MIN, RX_DESC_MAX, RX_DESC_DEF, "RxDescriptors", devname); -@@ -452,6 +473,7 @@ +@@ -452,6 +473,7 @@ static void __devinit velocity_get_optio velocity_set_int_opt((int *) &opts->wol_opts, wol_opts[index], WOL_OPT_MIN, WOL_OPT_MAX, WOL_OPT_DEF, "Wake On Lan options", devname); velocity_set_int_opt((int *) &opts->int_works, int_works[index], INT_WORKS_MIN, INT_WORKS_MAX, INT_WORKS_DEF, "Interrupt service works", devname); opts->numrx = (opts->numrx & ~3); @@ -84,7 +84,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c } /** -@@ -466,6 +488,8 @@ +@@ -466,6 +488,8 @@ static void velocity_init_cam_filter(str { struct mac_regs __iomem * regs = vptr->mac_regs; @@ -93,7 +93,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c /* Turn on MCFG_PQEN, turn off MCFG_RTGOPT */ WORD_REG_BITS_SET(MCFG_PQEN, MCFG_RTGOPT, ®s->MCFG); WORD_REG_BITS_ON(MCFG_VIDFR, ®s->MCFG); -@@ -484,14 +508,12 @@ +@@ -484,14 +508,12 @@ static void velocity_init_cam_filter(str WORD_REG_BITS_ON(MCFG_RTGOPT, ®s->MCFG); mac_set_cam(regs, 0, (u8 *) & (vptr->options.vid), VELOCITY_VLAN_ID_CAM); @@ -110,7 +110,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c } /** -@@ -508,13 +530,15 @@ +@@ -508,13 +530,15 @@ static void velocity_rx_reset(struct vel struct mac_regs __iomem * regs = vptr->mac_regs; int i; @@ -127,7 +127,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c writew(vptr->options.numrx, ®s->RBRDU); writel(vptr->rd_pool_dma, ®s->RDBaseLo); -@@ -537,12 +561,15 @@ +@@ -537,12 +561,15 @@ static void velocity_init_registers(stru struct mac_regs __iomem * regs = vptr->mac_regs; int i, mii_status; @@ -143,7 +143,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c netif_stop_queue(vptr->dev); /* -@@ -570,12 +597,13 @@ +@@ -570,12 +597,13 @@ static void velocity_init_registers(stru case VELOCITY_INIT_COLD: default: @@ -158,7 +158,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c mac_eeprom_reload(regs); for (i = 0; i < 6; i++) { writeb(vptr->dev->dev_addr[i], &(regs->PAR[i])); -@@ -593,11 +621,16 @@ +@@ -593,11 +621,16 @@ static void velocity_init_registers(stru */ BYTE_REG_BITS_SET(CFGB_OFSET, (CFGB_CRANDOM | CFGB_CAP | CFGB_MBA | CFGB_BAKOPT), ®s->CFGB); @@ -175,7 +175,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c /* * Set packet filter: Receive directed and broadcast address */ -@@ -607,10 +640,12 @@ +@@ -607,10 +640,12 @@ static void velocity_init_registers(stru * Enable MII auto-polling */ enable_mii_autopoll(regs); @@ -189,7 +189,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c writew(vptr->options.numrx - 1, ®s->RDCSize); mac_rx_queue_run(regs); mac_rx_queue_wake(regs); -@@ -618,10 +653,13 @@ +@@ -618,10 +653,13 @@ static void velocity_init_registers(stru writew(vptr->options.numtx - 1, ®s->TDCSize); for (i = 0; i < vptr->num_txq; i++) { @@ -204,7 +204,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c init_flow_control_register(vptr); writel(CR0_STOP, ®s->CR0Clr); -@@ -640,8 +678,10 @@ +@@ -640,8 +678,10 @@ static void velocity_init_registers(stru enable_flow_control_ability(vptr); mac_hw_mibs_init(regs); @@ -215,7 +215,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c } } -@@ -659,6 +699,7 @@ +@@ -659,6 +699,7 @@ static int velocity_soft_reset(struct ve struct mac_regs __iomem * regs = vptr->mac_regs; int i = 0; @@ -223,7 +223,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c writel(CR0_SFRST, ®s->CR0Set); for (i = 0; i < W_MAX_TIMEOUT; i++) { -@@ -722,6 +763,7 @@ +@@ -722,6 +763,7 @@ static int __devinit velocity_found1(str VELOCITY_FULL_DRV_NAM, VELOCITY_VERSION); printk(KERN_INFO "Copyright (c) 2002, 2003 VIA Networking Technologies, Inc.\n"); printk(KERN_INFO "Copyright (c) 2004 Red Hat Inc.\n"); @@ -231,7 +231,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c first = 0; } -@@ -935,6 +977,7 @@ +@@ -935,6 +977,7 @@ static int velocity_init_rings(struct ve dma_addr_t pool_dma; u8 *pool; @@ -239,7 +239,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c /* * Allocate all RD/TD rings a single pool */ -@@ -997,6 +1040,7 @@ +@@ -997,6 +1040,7 @@ static int velocity_init_rings(struct ve static void velocity_free_rings(struct velocity_info *vptr) { int size; @@ -247,7 +247,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c size = vptr->options.numrx * sizeof(struct rx_desc) + vptr->options.numtx * sizeof(struct tx_desc) * vptr->num_txq; -@@ -1013,6 +1057,7 @@ +@@ -1013,6 +1057,7 @@ static inline void velocity_give_many_rx struct mac_regs __iomem *regs = vptr->mac_regs; int avail, dirty, unusable; @@ -255,7 +255,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c /* * RD number must be equal to 4X per hardware spec * (programming guide rev 1.20, p.13) -@@ -1026,7 +1071,8 @@ +@@ -1026,7 +1071,8 @@ static inline void velocity_give_many_rx dirty = vptr->rd_dirty - unusable; for (avail = vptr->rd_filled & 0xfffc; avail; avail--) { dirty = (dirty > 0) ? dirty - 1 : vptr->options.numrx - 1; @@ -265,7 +265,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c } writew(vptr->rd_filled & 0xfffc, ®s->RBRDU); -@@ -1036,12 +1082,14 @@ +@@ -1036,12 +1082,14 @@ static inline void velocity_give_many_rx static int velocity_rx_refill(struct velocity_info *vptr) { int dirty = vptr->rd_dirty, done = 0, ret = 0; @@ -281,7 +281,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c break; if (!vptr->rd_info[dirty].skb) { -@@ -1076,6 +1124,7 @@ +@@ -1076,6 +1124,7 @@ static int velocity_init_rd_ring(struct unsigned int rsize = sizeof(struct velocity_rd_info) * vptr->options.numrx; @@ -289,7 +289,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c vptr->rd_info = kmalloc(rsize, GFP_KERNEL); if(vptr->rd_info == NULL) goto out; -@@ -1105,6 +1154,7 @@ +@@ -1105,6 +1154,7 @@ static void velocity_free_rd_ring(struct { int i; @@ -297,7 +297,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c if (vptr->rd_info == NULL) return; -@@ -1146,6 +1196,7 @@ +@@ -1146,6 +1196,7 @@ static int velocity_init_td_ring(struct unsigned int tsize = sizeof(struct velocity_td_info) * vptr->options.numtx; @@ -305,7 +305,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c /* Init the TD ring entries */ for (j = 0; j < vptr->num_txq; j++) { curr = vptr->td_pool_dma[j]; -@@ -1182,6 +1233,7 @@ +@@ -1182,6 +1233,7 @@ static void velocity_free_td_ring_entry( struct velocity_td_info * td_info = &(vptr->td_infos[q][n]); int i; @@ -313,7 +313,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c if (td_info == NULL) return; -@@ -1211,6 +1263,7 @@ +@@ -1211,6 +1263,7 @@ static void velocity_free_td_ring(struct { int i, j; @@ -321,7 +321,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c for (j = 0; j < vptr->num_txq; j++) { if (vptr->td_infos[j] == NULL) continue; -@@ -1238,34 +1291,42 @@ +@@ -1238,34 +1291,42 @@ static int velocity_rx_srv(struct veloci struct net_device_stats *stats = &vptr->stats; int rd_curr = vptr->rd_curr; int works = 0; @@ -369,7 +369,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c vptr->dev->last_rx = jiffies; -@@ -1296,13 +1357,21 @@ +@@ -1296,13 +1357,21 @@ static int velocity_rx_srv(struct veloci static inline void velocity_rx_csum(struct rx_desc *rd, struct sk_buff *skb) { @@ -396,7 +396,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c return; } } -@@ -1328,9 +1397,11 @@ +@@ -1328,9 +1397,11 @@ static inline int velocity_rx_copy(struc { int ret = -1; @@ -408,7 +408,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c new_skb = dev_alloc_skb(pkt_size + 2); if (new_skb) { new_skb->dev = vptr->dev; -@@ -1360,10 +1431,12 @@ +@@ -1360,10 +1431,12 @@ static inline int velocity_rx_copy(struc static inline void velocity_iph_realign(struct velocity_info *vptr, struct sk_buff *skb, int pkt_size) { @@ -421,7 +421,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c for (i = pkt_size; i >= 0; i--) *(skb->data + i + 2) = *(skb->data + i); skb_reserve(skb, 2); -@@ -1382,19 +1455,27 @@ +@@ -1382,19 +1455,27 @@ static inline void velocity_iph_realign( static int velocity_receive_frame(struct velocity_info *vptr, int idx) { void (*pci_action)(struct pci_dev *, dma_addr_t, size_t, int); @@ -453,7 +453,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c vptr->stats.multicast++; skb = rd_info->skb; -@@ -1408,7 +1489,8 @@ +@@ -1408,7 +1489,8 @@ static int velocity_receive_frame(struct */ if (vptr->flags & VELOCITY_FLAGS_VAL_PKT_LEN) { @@ -463,7 +463,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c stats->rx_length_errors++; return -EINVAL; } -@@ -1452,6 +1534,7 @@ +@@ -1452,6 +1534,7 @@ static int velocity_alloc_rx_buf(struct struct rx_desc *rd = &(vptr->rd_ring[idx]); struct velocity_rd_info *rd_info = &(vptr->rd_info[idx]); @@ -471,7 +471,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c rd_info->skb = dev_alloc_skb(vptr->rx_buf_sz + 64); if (rd_info->skb == NULL) return -ENOMEM; -@@ -1469,10 +1552,14 @@ +@@ -1469,10 +1552,14 @@ static int velocity_alloc_rx_buf(struct */ *((u32 *) & (rd->rdesc0)) = 0; @@ -489,7 +489,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c return 0; } -@@ -1493,9 +1580,11 @@ +@@ -1493,9 +1580,11 @@ static int velocity_tx_srv(struct veloci int full = 0; int idx; int works = 0; @@ -501,7 +501,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c for (qnum = 0; qnum < vptr->num_txq; qnum++) { for (idx = vptr->td_tail[qnum]; vptr->td_used[qnum] > 0; idx = (idx + 1) % vptr->options.numtx) { -@@ -1506,22 +1595,29 @@ +@@ -1506,22 +1595,29 @@ static int velocity_tx_srv(struct veloci td = &(vptr->td_rings[qnum][idx]); tdinfo = &(vptr->td_infos[qnum][idx]); @@ -537,7 +537,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c stats->tx_window_errors++; } else { stats->tx_packets++; -@@ -1610,6 +1706,7 @@ +@@ -1610,6 +1706,7 @@ static void velocity_print_link_status(s static void velocity_error(struct velocity_info *vptr, int status) { @@ -545,7 +545,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c if (status & ISR_TXSTLI) { struct mac_regs __iomem * regs = vptr->mac_regs; -@@ -1699,6 +1796,7 @@ +@@ -1699,6 +1796,7 @@ static void velocity_free_tx_buf(struct struct sk_buff *skb = tdinfo->skb; int i; @@ -553,7 +553,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c /* * Don't unmap the pre-allocated tx_bufs */ -@@ -1902,6 +2000,7 @@ +@@ -1902,6 +2000,7 @@ static int velocity_xmit(struct sk_buff struct velocity_td_info *tdinfo; unsigned long flags; int index; @@ -561,7 +561,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c int pktlen = skb->len; -@@ -1918,9 +2017,18 @@ +@@ -1918,9 +2017,18 @@ static int velocity_xmit(struct sk_buff td_ptr = &(vptr->td_rings[qnum][index]); tdinfo = &(vptr->td_infos[qnum][index]); @@ -583,7 +583,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c /* * Pad short frames. -@@ -1932,20 +2040,35 @@ +@@ -1932,20 +2040,35 @@ static int velocity_xmit(struct sk_buff memset(tdinfo->buf + skb->len, 0, ETH_ZLEN - skb->len); tdinfo->skb = skb; tdinfo->skb_dma[0] = tdinfo->buf_dma; @@ -623,7 +623,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c td_ptr->tdesc0.pktsize = td_ptr->td_buf[0].pa_low = cpu_to_le32(tdinfo->skb_dma[0]); td_ptr->td_buf[0].pa_high = 0; -@@ -1962,6 +2085,7 @@ +@@ -1962,6 +2085,7 @@ static int velocity_xmit(struct sk_buff /* FIXME: support 48bit DMA later */ td_ptr->td_buf[i].pa_low = cpu_to_le32(tdinfo->skb_dma); td_ptr->td_buf[i].pa_high = 0; @@ -631,7 +631,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c td_ptr->td_buf[i].bufsize = skb->len->skb->data_len; for (i = 0; i < nfrags; i++) { -@@ -1979,7 +2103,7 @@ +@@ -1979,7 +2103,7 @@ static int velocity_xmit(struct sk_buff } } else @@ -640,7 +640,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c { /* * Map the linear network buffer into PCI space and -@@ -1987,19 +2111,30 @@ +@@ -1987,19 +2111,30 @@ static int velocity_xmit(struct sk_buff */ tdinfo->skb = skb; tdinfo->skb_dma[0] = pci_map_single(vptr->pdev, skb->data, pktlen, PCI_DMA_TODEVICE); @@ -679,7 +679,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c } /* -@@ -2009,26 +2144,34 @@ +@@ -2009,26 +2144,34 @@ static int velocity_xmit(struct sk_buff && (skb->ip_summed == CHECKSUM_PARTIAL)) { struct iphdr *ip = skb->nh.iph; if (ip->protocol == IPPROTO_TCP) @@ -721,7 +721,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c mac_tx_queue_wake(vptr->mac_regs, qnum); } dev->trans_start = jiffies; -@@ -2054,7 +2197,7 @@ +@@ -2054,7 +2197,7 @@ static int velocity_intr(int irq, void * u32 isr_status; int max_count = 0; @@ -730,7 +730,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c spin_lock(&vptr->lock); isr_status = mac_read_isr(vptr->mac_regs); -@@ -2073,7 +2216,10 @@ +@@ -2073,7 +2216,10 @@ static int velocity_intr(int irq, void * while (isr_status != 0) { mac_write_isr(vptr->mac_regs, isr_status); @@ -742,7 +742,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c velocity_error(vptr, isr_status); if (isr_status & (ISR_PRXI | ISR_PPRXI)) max_count += velocity_rx_srv(vptr, isr_status); -@@ -2111,6 +2257,7 @@ +@@ -2111,6 +2257,7 @@ static void velocity_set_multi(struct ne int i; struct dev_mc_list *mclist; @@ -750,7 +750,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ writel(0xffffffff, ®s->MARCAM[0]); writel(0xffffffff, ®s->MARCAM[4]); -@@ -2154,6 +2301,7 @@ +@@ -2154,6 +2301,7 @@ static struct net_device_stats *velocity { struct velocity_info *vptr = netdev_priv(dev); @@ -758,7 +758,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c /* If the hardware is down, don't touch MII */ if(!netif_running(dev)) return &vptr->stats; -@@ -2198,6 +2346,7 @@ +@@ -2198,6 +2346,7 @@ static int velocity_ioctl(struct net_dev struct velocity_info *vptr = netdev_priv(dev); int ret; @@ -766,7 +766,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c /* If we are asked for information and the device is power saving then we need to bring the device back up to talk to it */ -@@ -2416,6 +2565,7 @@ +@@ -2416,6 +2565,7 @@ static int velocity_mii_read(struct mac_ { u16 ww; @@ -774,7 +774,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c /* * Disable MIICR_MAUTO, so that mii addr can be set normally */ -@@ -2452,6 +2602,7 @@ +@@ -2452,6 +2602,7 @@ static int velocity_mii_write(struct mac { u16 ww; @@ -782,10 +782,10 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c /* * Disable MIICR_MAUTO, so that mii addr can be set normally */ -Index: linux-2.6.20-rc3/drivers/net/via-velocity.h +Index: linux-2.6.21.7/drivers/net/via-velocity.h =================================================================== ---- linux-2.6.20-rc3.orig/drivers/net/via-velocity.h 2006-11-29 21:57:37.000000000 +0000 -+++ linux-2.6.20-rc3/drivers/net/via-velocity.h 2007-01-02 10:30:36.265114211 +0000 +--- linux-2.6.21.7.orig/drivers/net/via-velocity.h ++++ linux-2.6.21.7/drivers/net/via-velocity.h @@ -196,64 +196,70 @@ * Receive descriptor */ @@ -900,7 +900,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.h struct td_buf td_buf[7]; }; -@@ -279,6 +285,16 @@ +@@ -279,6 +285,16 @@ enum velocity_owner { OWNED_BY_NIC = 1 }; @@ -917,7 +917,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.h /* * MAC registers and macros. -@@ -1698,6 +1714,7 @@ +@@ -1698,6 +1714,7 @@ enum velocity_flow_cntl_type { }; struct velocity_opt { diff --git a/target/linux/ixp4xx/patches/185-nslu2_rtc_fixup.patch b/target/linux/ixp4xx/patches/185-nslu2_rtc_fixup.patch index 2c379d2..59d3e70 100644 --- a/target/linux/ixp4xx/patches/185-nslu2_rtc_fixup.patch +++ b/target/linux/ixp4xx/patches/185-nslu2_rtc_fixup.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c =================================================================== ---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nslu2-setup.c -+++ linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c @@ -20,6 +20,7 @@ #include <linux/leds.h> #include <linux/mtd/mtd.h> @@ -10,7 +10,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> -@@ -239,11 +240,41 @@ static void __init nslu2_init(void) +@@ -253,11 +254,41 @@ static void __init nslu2_init(void) register_mtd_user(&nslu2_flash_notifier); } @@ -51,4 +51,4 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c + .fixup = nslu2_fixup, .map_io = ixp4xx_map_io, .init_irq = ixp4xx_init_irq, - .timer = &ixp4xx_timer, + .timer = &nslu2_timer, diff --git a/target/linux/ixp4xx/patches/186-nas100d_rtc_fixup.patch b/target/linux/ixp4xx/patches/186-nas100d_rtc_fixup.patch index f594802..f15b64f 100644 --- a/target/linux/ixp4xx/patches/186-nas100d_rtc_fixup.patch +++ b/target/linux/ixp4xx/patches/186-nas100d_rtc_fixup.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c =================================================================== ---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c @@ -18,6 +18,7 @@ #include <linux/leds.h> #include <linux/mtd/mtd.h> @@ -10,7 +10,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> -@@ -225,11 +226,42 @@ static void __init nas100d_init(void) +@@ -227,11 +228,42 @@ static void __init nas100d_init(void) register_mtd_user(&nas100d_flash_notifier); } diff --git a/target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch b/target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch index 04e51cd..8993a9e 100644 --- a/target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch +++ b/target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c =================================================================== ---- linux-2.6.21-arm.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c 2007-05-07 11:29:44.000000000 -0700 -+++ linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c 2007-05-07 11:31:15.000000000 -0700 +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c @@ -15,6 +15,7 @@ #include <linux/serial.h> #include <linux/serial_8250.h> @@ -10,7 +10,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> -@@ -142,6 +143,36 @@ +@@ -142,6 +143,36 @@ static struct sys_timer dsmg600_timer = .init = dsmg600_timer_init, }; @@ -47,7 +47,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c static void __init dsmg600_init(void) { ixp4xx_sys_init(); -@@ -174,6 +205,7 @@ +@@ -174,6 +205,7 @@ MACHINE_START(DSMG600, "D-Link DSM-G600 .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, .boot_params = 0x00000100, diff --git a/target/linux/ixp4xx/patches/200-gateway_7001.patch b/target/linux/ixp4xx/patches/200-gateway_7001.patch index 80cf000..509b24a 100644 --- a/target/linux/ixp4xx/patches/200-gateway_7001.patch +++ b/target/linux/ixp4xx/patches/200-gateway_7001.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.19.2/arch/arm/boot/compressed/head-xscale.S linux-2.6.19.2-owrt/arch/arm/boot/compressed/head-xscale.S ---- linux-2.6.19.2/arch/arm/boot/compressed/head-xscale.S 2007-01-10 20:10:37.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/boot/compressed/head-xscale.S 2007-04-02 15:39:28.000000000 +0200 -@@ -46,6 +46,11 @@ +Index: linux-2.6.21.7/arch/arm/boot/compressed/head-xscale.S +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/boot/compressed/head-xscale.S ++++ linux-2.6.21.7/arch/arm/boot/compressed/head-xscale.S +@@ -46,6 +46,11 @@ __XScale_start: orr r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00) #endif @@ -13,9 +14,10 @@ diff -Nur linux-2.6.19.2/arch/arm/boot/compressed/head-xscale.S linux-2.6.19.2-o #ifdef CONFIG_ARCH_IXP2000 mov r1, #-1 mov r0, #0xd6000000 -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c 2007-04-02 15:39:28.000000000 +0200 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-pci.c @@ -0,0 +1,68 @@ +/* + * arch/arch/mach-ixp4xx/gateway7001-pci.c @@ -85,9 +87,10 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-pci.c linux-2.6.19.2-o +} + +subsys_initcall(gateway7001_pci_init); -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-04-02 15:49:28.000000000 +0200 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-setup.c @@ -0,0 +1,108 @@ +/* + * arch/arm/mach-ixp4xx/gateway7001-setup.c @@ -197,10 +200,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.19.2 + .init_machine = gateway7001_init, +MACHINE_END +#endif -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig 2007-01-10 20:10:37.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-04-02 15:39:28.000000000 +0200 -@@ -33,6 +33,14 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig +@@ -41,6 +41,14 @@ config ARCH_ADI_COYOTE Engineering Coyote Gateway Reference Platform. For more information on this platform, see <file:Documentation/arm/IXP4xx>. @@ -215,10 +219,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/a config ARCH_IXDP425 bool "IXDP425" help -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile 2007-01-10 20:10:37.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile 2007-04-02 15:49:49.000000000 +0200 -@@ -11,6 +11,7 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile +@@ -13,6 +13,7 @@ obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-pci.o obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o @@ -226,17 +231,18 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/ obj-y += common.o -@@ -20,5 +21,6 @@ +@@ -24,5 +25,6 @@ obj-$(CONFIG_MACH_GTWX5715) += gtwx5715- obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o +obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o -diff -Nur linux-2.6.19.2/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.19.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h ---- linux-2.6.19.2/include/asm-arm/arch-ixp4xx/uncompress.h 2007-01-10 20:10:37.000000000 +0100 -+++ linux-2.6.19.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2007-04-02 15:42:04.000000000 +0200 -@@ -38,9 +38,9 @@ +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h +=================================================================== +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h +@@ -38,9 +38,9 @@ static void flush(void) static __inline__ void __arch_decomp_setup(unsigned long arch_id) { /* diff --git a/target/linux/ixp4xx/patches/210-gateway_7001_setup_mac.patch b/target/linux/ixp4xx/patches/210-gateway_7001_setup_mac.patch index 8b3f4b9..fb84d51 100644 --- a/target/linux/ixp4xx/patches/210-gateway_7001_setup_mac.patch +++ b/target/linux/ixp4xx/patches/210-gateway_7001_setup_mac.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-04-02 15:56:39.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-04-02 15:57:38.000000000 +0200 -@@ -76,9 +76,57 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-setup.c +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-setup.c +@@ -76,9 +76,57 @@ static struct platform_device gateway700 .resource = &gateway7001_uart_resource, }; diff --git a/target/linux/ixp4xx/patches/212-gateway_7001_mtd_microcode.patch b/target/linux/ixp4xx/patches/212-gateway_7001_mtd_microcode.patch index c15c5f6..2e24f6c 100644 --- a/target/linux/ixp4xx/patches/212-gateway_7001_mtd_microcode.patch +++ b/target/linux/ixp4xx/patches/212-gateway_7001_mtd_microcode.patch @@ -1,5 +1,7 @@ ---- linux-2.6.21.5/arch/arm/mach-ixp4xx/gateway7001-setup.c.orig 2007-06-19 18:03:37.202848276 +0100 -+++ linux-2.6.21.5/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-06-19 18:09:04.152969985 +0100 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-setup.c +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-setup.c @@ -16,6 +16,7 @@ #include <linux/device.h> #include <linux/serial.h> @@ -8,7 +10,7 @@ #include <linux/serial_8250.h> #include <linux/slab.h> -@@ -122,11 +123,48 @@ +@@ -122,11 +123,48 @@ static struct platform_device mac1 = { .resource = &res_mac1, }; @@ -57,7 +59,7 @@ }; static void __init gateway7001_init(void) -@@ -140,6 +178,7 @@ +@@ -140,6 +178,7 @@ static void __init gateway7001_init(void *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; platform_add_devices(gateway7001_devices, ARRAY_SIZE(gateway7001_devices)); diff --git a/target/linux/ixp4xx/patches/300-wg302v2.patch b/target/linux/ixp4xx/patches/300-wg302v2.patch index 8dc1d72..e0f0c21 100644 --- a/target/linux/ixp4xx/patches/300-wg302v2.patch +++ b/target/linux/ixp4xx/patches/300-wg302v2.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig 2007-04-02 16:09:06.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-04-02 16:01:25.000000000 +0200 -@@ -41,6 +41,14 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.21.7/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 @@ -16,27 +17,29 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/a config ARCH_IXDP425 bool "IXDP425" help -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile 2007-04-02 16:09:06.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile 2007-04-02 16:09:25.000000000 +0200 -@@ -12,6 +12,7 @@ - obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-pci.o +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.21.7/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 +obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-y += common.o -@@ -22,5 +23,6 @@ - obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o +@@ -26,5 +27,6 @@ obj-$(CONFIG_MACH_NSLU2) += nslu2-setup. obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o + obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o +obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wg302v2-pci.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wg302v2-pci.c 2007-04-02 16:00:12.000000000 +0200 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/wg302v2-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/wg302v2-pci.c @@ -0,0 +1,68 @@ +/* + * arch/arch/mach-ixp4xx/wg302v2-pci.c @@ -106,9 +109,10 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-pci.c linux-2.6.19.2-owrt/ +} + +subsys_initcall(wg302v2_pci_init); -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c 2007-04-02 16:08:57.000000000 +0200 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/wg302v2-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/wg302v2-setup.c @@ -0,0 +1,107 @@ +/* + * arch/arm/mach-ixp4xx/wg302-setup.c @@ -217,10 +221,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-setup.c linux-2.6.19.2-owr + .init_machine = wg302v2_init, +MACHINE_END +#endif -diff -Nur linux-2.6.19.2/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.19.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h ---- linux-2.6.19.2/include/asm-arm/arch-ixp4xx/uncompress.h 2007-04-02 16:09:06.000000000 +0200 -+++ linux-2.6.19.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2007-04-02 16:02:04.000000000 +0200 -@@ -40,7 +40,7 @@ +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h +=================================================================== +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h +@@ -40,7 +40,7 @@ static __inline__ void __arch_decomp_set /* * Some boards are using UART2 as console */ diff --git a/target/linux/ixp4xx/patches/310-wg302v2_setup_mac.patch b/target/linux/ixp4xx/patches/310-wg302v2_setup_mac.patch index 27616e1..c12c5fe 100644 --- a/target/linux/ixp4xx/patches/310-wg302v2_setup_mac.patch +++ b/target/linux/ixp4xx/patches/310-wg302v2_setup_mac.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-setup.c 2007-04-02 16:06:02.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c 2007-03-05 11:57:24.000000000 +0100 -@@ -75,9 +75,33 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/wg302v2-setup.c +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/wg302v2-setup.c +@@ -75,9 +75,33 @@ static struct platform_device wg302v2_ua .resource = &wg302v2_uart_resource, }; diff --git a/target/linux/ixp4xx/patches/400-pronghorn_metro.patch b/target/linux/ixp4xx/patches/400-pronghorn_metro.patch index 8b88e10..035ccf6 100644 --- a/target/linux/ixp4xx/patches/400-pronghorn_metro.patch +++ b/target/linux/ixp4xx/patches/400-pronghorn_metro.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.21.1/Documentation/arm/IXP4xx linux-2.6.21.1-owrt/Documentation/arm/IXP4xx ---- linux-2.6.21.1/Documentation/arm/IXP4xx 2007-06-10 13:54:49.000000000 +0200 -+++ linux-2.6.21.1-owrt/Documentation/arm/IXP4xx 2007-06-10 13:46:37.000000000 +0200 -@@ -111,6 +111,9 @@ +Index: linux-2.6.21.7/Documentation/arm/IXP4xx +=================================================================== +--- linux-2.6.21.7.orig/Documentation/arm/IXP4xx ++++ linux-2.6.21.7/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. @@ -11,10 +12,11 @@ diff -Nur linux-2.6.21.1/Documentation/arm/IXP4xx linux-2.6.21.1-owrt/Documentat Gateworks Avila Network Platform http://www.gateworks.com/avila_sbc.htm -diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/Kconfig linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/Kconfig ---- linux-2.6.21.1/arch/arm/mach-ixp4xx/Kconfig 2007-06-10 13:54:47.000000000 +0200 -+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-06-10 13:46:37.000000000 +0200 -@@ -57,6 +57,14 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.21.7/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 @@ -29,27 +31,29 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/Kconfig linux-2.6.21.1-owrt/arch/a config ARCH_IXDP425 bool "IXDP425" help -diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/Makefile linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/Makefile ---- linux-2.6.21.1/arch/arm/mach-ixp4xx/Makefile 2007-06-10 13:54:47.000000000 +0200 -+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/Makefile 2007-06-10 13:46:37.000000000 +0200 -@@ -14,6 +14,7 @@ - obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.21.7/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 +obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o obj-y += common.o -@@ -26,5 +27,6 @@ - obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o +@@ -28,5 +29,6 @@ obj-$(CONFIG_MACH_NAS100D) += nas100d-se + obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o +obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o -diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-pci.c ---- linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-pci.c 2007-06-10 13:50:08.000000000 +0200 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-pci.c @@ -0,0 +1,74 @@ +/* + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c @@ -125,9 +129,10 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c linux-2.6.21. +} + +subsys_initcall(pronghornmetro_pci_init); -diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ---- linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 13:51:51.000000000 +0200 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c @@ -0,0 +1,108 @@ +/* + * arch/arm/mach-ixp4xx/pronghornmetro-setup.c @@ -237,10 +242,11 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.2 + .init_machine = pronghornmetro_init, +MACHINE_END +#endif -diff -Nur linux-2.6.21.1/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.21.1-owrt/include/asm-arm/arch-ixp4xx/uncompress.h ---- linux-2.6.21.1/include/asm-arm/arch-ixp4xx/uncompress.h 2007-06-10 13:54:52.000000000 +0200 -+++ linux-2.6.21.1-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2007-06-10 13:49:37.000000000 +0200 -@@ -40,7 +40,7 @@ +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h +=================================================================== +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h +@@ -40,7 +40,7 @@ static __inline__ void __arch_decomp_set /* * Some boards are using UART2 as console */ diff --git a/target/linux/ixp4xx/patches/410-pronghorn_metro_setup_mac.patch b/target/linux/ixp4xx/patches/410-pronghorn_metro_setup_mac.patch index 54621d6..146baa4 100644 --- a/target/linux/ixp4xx/patches/410-pronghorn_metro_setup_mac.patch +++ b/target/linux/ixp4xx/patches/410-pronghorn_metro_setup_mac.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ---- linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:05:47.000000000 +0200 -+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:05:38.000000000 +0200 -@@ -76,9 +76,57 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +@@ -76,9 +76,57 @@ static struct platform_device pronghornm .resource = &pronghornmetro_uart_resource, }; diff --git a/target/linux/ixp4xx/patches/420-pronghorn_metro_mtd_microcode.patch b/target/linux/ixp4xx/patches/420-pronghorn_metro_mtd_microcode.patch index 0c304c7..1308fc1 100644 --- a/target/linux/ixp4xx/patches/420-pronghorn_metro_mtd_microcode.patch +++ b/target/linux/ixp4xx/patches/420-pronghorn_metro_mtd_microcode.patch @@ -1,6 +1,7 @@ -diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ---- linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:10:24.000000000 +0200 -+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:10:15.000000000 +0200 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c @@ -17,6 +17,7 @@ #include <linux/serial.h> #include <linux/tty.h> @@ -9,7 +10,7 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.2 #include <linux/slab.h> #include <asm/types.h> -@@ -122,11 +123,34 @@ +@@ -122,11 +123,34 @@ static struct platform_device mac1 = { .resource = &res_mac1, }; @@ -44,7 +45,7 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.2 }; static void __init pronghornmetro_init(void) -@@ -140,6 +164,8 @@ +@@ -140,6 +164,8 @@ static void __init pronghornmetro_init(v *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; platform_add_devices(pronghornmetro_devices, ARRAY_SIZE(pronghornmetro_devices)); diff --git a/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch b/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch index d2982bc..be5e7a5 100644 --- a/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch +++ b/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ---- linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:31:27.000000000 +0200 -+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:36:23.000000000 +0200 -@@ -77,6 +77,35 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +@@ -77,6 +77,35 @@ static struct platform_device pronghornm .resource = &pronghornmetro_uart_resource, }; @@ -37,7 +38,7 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.2 static struct resource res_mac0 = { .start = IXP4XX_EthB_BASE_PHYS, .end = IXP4XX_EthB_BASE_PHYS + 0x1ff, -@@ -165,6 +194,17 @@ +@@ -165,6 +194,17 @@ static void __init pronghornmetro_init(v platform_add_devices(pronghornmetro_devices, ARRAY_SIZE(pronghornmetro_devices)); diff --git a/target/linux/ixp4xx/patches/500-compex.patch b/target/linux/ixp4xx/patches/500-compex.patch index 854194b..284a892 100644 --- a/target/linux/ixp4xx/patches/500-compex.patch +++ b/target/linux/ixp4xx/patches/500-compex.patch @@ -1,6 +1,7 @@ -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-10 01:56:21.000000000 +0200 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c @@ -0,0 +1,120 @@ +/* + * arch/arm/mach-ixp4xx/compex-setup.c @@ -122,10 +123,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt + .init_machine = compex_init, +MACHINE_END +#endif -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-01-10 20:10:37.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-04-10 00:22:16.000000000 +0200 -@@ -66,7 +66,7 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/ixdp425-pci.c +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c ++++ linux-2.6.21.7/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() || @@ -134,10 +136,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.19.2-owrt/ pci_common_init(&ixdp425_pci); return 0; } -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig 2007-04-10 00:33:31.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-04-10 00:48:37.000000000 +0200 -@@ -57,6 +57,14 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.21.7/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>. @@ -152,10 +155,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/a config ARCH_IXDP425 bool "IXDP425" help -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile 2007-04-10 00:33:39.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile 2007-04-09 20:23:06.000000000 +0200 -@@ -14,6 +14,7 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.21.7/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_PRONGHORNMETRO) += pronghornmetro-pci.o @@ -163,17 +167,18 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/ obj-y += common.o -@@ -26,5 +27,6 @@ +@@ -30,5 +31,6 @@ obj-$(CONFIG_MACH_DSMG600) += dsmg6 obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-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 -diff -Nur linux-2.6.19.2/arch/arm/tools/mach-types linux-2.6.19.2-owrt/arch/arm/tools/mach-types ---- linux-2.6.19.2/arch/arm/tools/mach-types 2007-04-10 01:27:55.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/tools/mach-types 2007-04-09 20:22:33.000000000 +0200 -@@ -1278,7 +1278,7 @@ +Index: linux-2.6.21.7/arch/arm/tools/mach-types +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/tools/mach-types ++++ linux-2.6.21.7/arch/arm/tools/mach-types +@@ -1278,7 +1278,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/510-compex_setup_mac.patch b/target/linux/ixp4xx/patches/510-compex_setup_mac.patch index ed85df0..d8f7385 100644 --- a/target/linux/ixp4xx/patches/510-compex_setup_mac.patch +++ b/target/linux/ixp4xx/patches/510-compex_setup_mac.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-09 20:30:37.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-09 20:36:23.000000000 +0200 -@@ -90,9 +90,57 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/compex-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c +@@ -90,9 +90,57 @@ static struct platform_device compex_uar .resource = compex_uart_resources }; diff --git a/target/linux/ixp4xx/patches/520-compex_mtd_microcode.patch b/target/linux/ixp4xx/patches/520-compex_mtd_microcode.patch index 9084223..c330ed1 100644 --- a/target/linux/ixp4xx/patches/520-compex_mtd_microcode.patch +++ b/target/linux/ixp4xx/patches/520-compex_mtd_microcode.patch @@ -1,6 +1,7 @@ -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-09 20:51:57.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-09 21:48:22.000000000 +0200 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/compex-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c @@ -17,6 +17,7 @@ #include <linux/serial.h> #include <linux/tty.h> @@ -9,7 +10,7 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt #include <linux/slab.h> #include <asm/types.h> -@@ -136,11 +137,34 @@ +@@ -136,11 +137,34 @@ static struct platform_device mac1 = { .resource = &res_mac1, }; @@ -44,7 +45,7 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt }; static void __init compex_init(void) -@@ -152,6 +176,8 @@ +@@ -152,6 +176,8 @@ static void __init compex_init(void) IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; platform_add_devices(compex_devices, ARRAY_SIZE(compex_devices)); @@ -52,4 +53,4 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt + register_mtd_user(&compex_flash_notifier); } - #ifdef CONFIG_ARCH_COMPEX + #ifdef CONFIG_MACH_COMPEX diff --git a/target/linux/ixp4xx/patches/600-wrt300nv2.patch b/target/linux/ixp4xx/patches/600-wrt300nv2.patch index 9697e5d..39e1dd0 100644 --- a/target/linux/ixp4xx/patches/600-wrt300nv2.patch +++ b/target/linux/ixp4xx/patches/600-wrt300nv2.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig 2007-05-03 23:17:47.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-04-24 14:25:02.000000000 +0200 -@@ -65,6 +65,14 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.21.7/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 @@ -16,10 +17,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/a config ARCH_IXDP425 bool "IXDP425" help -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile 2007-05-03 23:17:47.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile 2007-04-24 14:25:02.000000000 +0200 -@@ -15,6 +15,7 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.21.7/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_PRONGHORNMETRO) += pronghornmetro-pci.o obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o @@ -27,16 +29,17 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/ obj-y += common.o -@@ -28,5 +29,6 @@ +@@ -32,5 +33,6 @@ obj-$(CONFIG_MACH_GATEWAY7001) += gatewa obj-$(CONFIG_MACH_WG302V2) += wg302v2-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 -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wrt300nv2-pci.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wrt300nv2-pci.c 2007-05-10 10:40:54.000000000 +0200 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/wrt300nv2-pci.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/wrt300nv2-pci.c @@ -0,0 +1,65 @@ +/* + * arch/arch/mach-ixp4xx/wrt300nv2-pci.c @@ -103,9 +106,10 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-pci.c linux-2.6.19.2-owr +} + +subsys_initcall(wrt300nv2_pci_init); -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-05-03 23:16:53.000000000 +0200 +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +=================================================================== +--- /dev/null ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/wrt300nv2-setup.c @@ -0,0 +1,108 @@ +/* + * arch/arm/mach-ixp4xx/wrt300nv2-setup.c @@ -215,10 +219,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-setup.c linux-2.6.19.2-o + .init_machine = wrt300nv2_init, +MACHINE_END +#endif -diff -Nur linux-2.6.19.2/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.19.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h ---- linux-2.6.19.2/include/asm-arm/arch-ixp4xx/uncompress.h 2007-05-03 23:17:48.000000000 +0200 -+++ linux-2.6.19.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2007-04-24 14:25:02.000000000 +0200 -@@ -40,7 +40,7 @@ +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h +=================================================================== +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h +@@ -40,7 +40,7 @@ static __inline__ void __arch_decomp_set /* * Some boards are using UART2 as console */ diff --git a/target/linux/ixp4xx/patches/610-wrt300nv2_setup_mac.patch b/target/linux/ixp4xx/patches/610-wrt300nv2_setup_mac.patch index 145ad76..bbc7607 100644 --- a/target/linux/ixp4xx/patches/610-wrt300nv2_setup_mac.patch +++ b/target/linux/ixp4xx/patches/610-wrt300nv2_setup_mac.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-04-24 14:25:02.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-04-24 14:31:09.000000000 +0200 -@@ -76,9 +76,57 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +@@ -76,9 +76,57 @@ static struct platform_device wrt300nv2_ .resource = &wrt300nv2_uart_resource, }; diff --git a/target/linux/ixp4xx/patches/720-avila_setup_mac.patch b/target/linux/ixp4xx/patches/720-avila_setup_mac.patch index 3784852..66270f0 100644 --- a/target/linux/ixp4xx/patches/720-avila_setup_mac.patch +++ b/target/linux/ixp4xx/patches/720-avila_setup_mac.patch @@ -2,12 +2,12 @@ arch/arm/mach-ixp4xx/avila-setup.c | 50 ++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) -Index: linux-2.6.19/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/avila-setup.c =================================================================== ---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/avila-setup.c -+++ linux-2.6.19/arch/arm/mach-ixp4xx/avila-setup.c -@@ -104,10 +104,60 @@ static struct platform_device avila_uart - .resource = avila_uart_resources +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/avila-setup.c +@@ -132,10 +132,60 @@ static struct platform_device avila_pata + .resource = avila_pata_resources, }; +/* MACs */ diff --git a/target/linux/ixp4xx/patches/740-avila_loft_mac_platform.patch b/target/linux/ixp4xx/patches/740-avila_loft_mac_platform.patch index 952a055..87d0892 100644 --- a/target/linux/ixp4xx/patches/740-avila_loft_mac_platform.patch +++ b/target/linux/ixp4xx/patches/740-avila_loft_mac_platform.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.19/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/avila-setup.c =================================================================== ---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/avila-setup.c 2007-01-23 03:12:36.000000000 -0800 -+++ linux-2.6.19/arch/arm/mach-ixp4xx/avila-setup.c 2007-01-23 03:12:47.000000000 -0800 +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/avila-setup.c @@ -18,6 +18,10 @@ #include <linux/tty.h> #include <linux/serial_8250.h> @@ -13,8 +13,8 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/avila-setup.c #include <asm/types.h> #include <asm/setup.h> -@@ -198,9 +202,34 @@ - &avila_npe_ucode, +@@ -188,9 +192,34 @@ static struct platform_device *avila_dev + }; +#ifdef CONFIG_SENSORS_EEPROM diff --git a/target/linux/ixp4xx/patches/750-avila_mtd_microcode.patch b/target/linux/ixp4xx/patches/750-avila_mtd_microcode.patch index 0ecd3a5..2973a22 100644 --- a/target/linux/ixp4xx/patches/750-avila_mtd_microcode.patch +++ b/target/linux/ixp4xx/patches/750-avila_mtd_microcode.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/avila-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/avila-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/avila-setup.c 2007-05-10 12:30:54.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/avila-setup.c 2007-05-10 12:33:08.000000000 +0200 -@@ -155,13 +155,23 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/avila-setup.c +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/avila-setup.c +@@ -183,13 +183,23 @@ static struct platform_device mac1 = { .resource = &res_mac1, }; diff --git a/target/linux/ixp4xx/patches/800-eeprom_new_notifier.patch b/target/linux/ixp4xx/patches/800-eeprom_new_notifier.patch index 79a0971..d10153e 100644 --- a/target/linux/ixp4xx/patches/800-eeprom_new_notifier.patch +++ b/target/linux/ixp4xx/patches/800-eeprom_new_notifier.patch @@ -9,10 +9,10 @@ the 'maclist' code and read out by the ethernet config. Signed-off-by: John Bowler <jbowler@acm.org> -Index: linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c +Index: linux-2.6.21.7/drivers/i2c/chips/eeprom.c =================================================================== ---- linux-2.6.21-rc1-arm.orig/drivers/i2c/chips/eeprom.c 2007-02-21 02:24:14.000000000 -0800 -+++ linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c 2007-02-21 02:25:01.000000000 -0800 +--- linux-2.6.21.7.orig/drivers/i2c/chips/eeprom.c ++++ linux-2.6.21.7/drivers/i2c/chips/eeprom.c @@ -33,6 +33,8 @@ #include <linux/jiffies.h> #include <linux/i2c.h> @@ -22,7 +22,7 @@ Index: linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c /* Addresses to scan */ static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54, -@@ -41,26 +43,7 @@ +@@ -41,26 +43,7 @@ static unsigned short normal_i2c[] = { 0 /* Insmod parameters */ I2C_CLIENT_INSMOD_1(eeprom); @@ -50,7 +50,7 @@ Index: linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c static int eeprom_attach_adapter(struct i2c_adapter *adapter); static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind); -@@ -189,6 +172,7 @@ +@@ -189,6 +172,7 @@ static int eeprom_detect(struct i2c_adap data->valid = 0; mutex_init(&data->update_lock); data->nature = UNKNOWN; @@ -58,7 +58,7 @@ Index: linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c /* Tell the I2C layer a new client has arrived */ if ((err = i2c_attach_client(new_client))) -@@ -212,6 +196,9 @@ +@@ -212,6 +196,9 @@ static int eeprom_detect(struct i2c_adap if (err) goto exit_detach; @@ -68,7 +68,7 @@ Index: linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c return 0; exit_detach: -@@ -237,6 +224,41 @@ +@@ -237,6 +224,41 @@ static int eeprom_detach_client(struct i return 0; } @@ -110,10 +110,10 @@ Index: linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c static int __init eeprom_init(void) { return i2c_add_driver(&eeprom_driver); -Index: linux-2.6.21-rc1-arm/include/linux/eeprom.h +Index: linux-2.6.21.7/include/linux/eeprom.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/include/linux/eeprom.h 2007-02-21 02:25:01.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/include/linux/eeprom.h @@ -0,0 +1,71 @@ +#ifndef _LINUX_EEPROM_H +#define _LINUX_EEPROM_H @@ -186,11 +186,11 @@ Index: linux-2.6.21-rc1-arm/include/linux/eeprom.h +extern int unregister_eeprom_notifier(struct notifier_block *nb); + +#endif /* _LINUX_EEPROM_H */ -Index: linux-2.6.21-rc1-arm/include/linux/notifier.h +Index: linux-2.6.21.7/include/linux/notifier.h =================================================================== ---- linux-2.6.21-rc1-arm.orig/include/linux/notifier.h 2007-02-21 02:24:14.000000000 -0800 -+++ linux-2.6.21-rc1-arm/include/linux/notifier.h 2007-02-21 02:25:01.000000000 -0800 -@@ -187,5 +187,8 @@ +--- linux-2.6.21.7.orig/include/linux/notifier.h ++++ linux-2.6.21.7/include/linux/notifier.h +@@ -187,5 +187,8 @@ extern int srcu_notifier_call_chain(stru #define CPU_DOWN_FAILED 0x0006 /* CPU (unsigned)v NOT going down */ #define CPU_DEAD 0x0007 /* CPU (unsigned)v dead */ diff --git a/target/linux/ixp4xx/patches/900-no_loader_workaround.patch b/target/linux/ixp4xx/patches/900-no_loader_workaround.patch index f84f15b..cb6a531 100644 --- a/target/linux/ixp4xx/patches/900-no_loader_workaround.patch +++ b/target/linux/ixp4xx/patches/900-no_loader_workaround.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.19/arch/arm/boot/compressed/head-xscale.S linux-2.6.19-owrt/arch/arm/boot/compressed/head-xscale.S ---- linux-2.6.19/arch/arm/boot/compressed/head-xscale.S 2006-12-19 12:56:21.000000000 +0100 -+++ linux-2.6.19-owrt/arch/arm/boot/compressed/head-xscale.S 2006-12-19 12:58:15.000000000 +0100 -@@ -41,6 +41,7 @@ +Index: linux-2.6.21.7/arch/arm/boot/compressed/head-xscale.S +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/boot/compressed/head-xscale.S ++++ linux-2.6.21.7/arch/arm/boot/compressed/head-xscale.S +@@ -41,6 +41,7 @@ __XScale_start: mov r7, #MACH_TYPE_COTULLA_IDP #endif @@ -9,7 +10,7 @@ diff -Nur linux-2.6.19/arch/arm/boot/compressed/head-xscale.S linux-2.6.19-owrt/ #ifdef CONFIG_MACH_GTWX5715 mov r7, #(MACH_TYPE_GTWX5715 & 0xff) orr r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00) -@@ -50,6 +51,7 @@ +@@ -50,6 +51,7 @@ __XScale_start: mov r7, #(MACH_TYPE_GATEWAY7001 & 0xff) orr r7, r7, #(MACH_TYPE_GATEWAY7001 & 0xff00) #endif diff --git a/target/linux/ixp4xx/patches/996-fsg3_support.patch b/target/linux/ixp4xx/patches/996-fsg3_support.patch index ecf5d75..987abdf 100644 --- a/target/linux/ixp4xx/patches/996-fsg3_support.patch +++ b/target/linux/ixp4xx/patches/996-fsg3_support.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-pci.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/fsg-pci.c =================================================================== --- /dev/null -+++ linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-pci.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/fsg-pci.c @@ -0,0 +1,71 @@ +/* + * arch/arch/mach-ixp4xx/fsg-pci.c @@ -74,10 +74,10 @@ Index: linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-pci.c +} + +subsys_initcall(fsg_pci_init); -Index: linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/fsg-setup.c =================================================================== --- /dev/null -+++ linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/fsg-setup.c @@ -0,0 +1,223 @@ +/* + * arch/arm/mach-ixp4xx/fsg-setup.c @@ -302,10 +302,10 @@ Index: linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-setup.c + .init_machine = fsg_init, +MACHINE_END + -Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/fsg.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/fsg.h =================================================================== --- /dev/null -+++ linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/fsg.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/fsg.h @@ -0,0 +1,58 @@ +/* + * include/asm-arm/arch-ixp4xx/fsg.h @@ -365,10 +365,10 @@ Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/fsg.h +#define FSG_LED_SATA_BIT 3 +#define FSG_LED_WAN_BIT 4 +#define FSG_LED_WLAN_BIT 5 -Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/hardware.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/hardware.h =================================================================== ---- linux-2.6.21.5-armeb.orig/include/asm-arm/arch-ixp4xx/hardware.h -+++ linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/hardware.h +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/hardware.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/hardware.h @@ -48,5 +48,6 @@ extern unsigned int processor_id; #include "nslu2.h" #include "nas100d.h" @@ -376,10 +376,10 @@ Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/hardware.h +#include "fsg.h" #endif /* _ASM_ARCH_HARDWARE_H */ -Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/irqs.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/irqs.h =================================================================== ---- linux-2.6.21.5-armeb.orig/include/asm-arm/arch-ixp4xx/irqs.h -+++ linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/irqs.h +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/irqs.h ++++ linux-2.6.21.7/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 @@ -392,9 +392,11 @@ Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/irqs.h +#define IRQ_FSG_PCI_INTC IRQ_IXP4XX_GPIO5 + #endif ---- linux-2.6.21.6/arch/arm/mach-ixp4xx/Makefile~ 2007-07-11 22:20:52.000000000 +0930 -+++ linux-2.6.21.6/arch/arm/mach-ixp4xx/Makefile 2007-07-11 22:22:02.000000000 +0930 -@@ -13,6 +13,7 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile +@@ -13,6 +13,7 @@ obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-pci.o obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o @@ -402,7 +404,7 @@ Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/irqs.h obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o -@@ -29,6 +30,7 @@ +@@ -29,6 +30,7 @@ obj-$(CONFIG_MACH_GTWX5715) += gtwx5715- obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o @@ -410,9 +412,11 @@ Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/irqs.h obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o ---- linux-2.6.21.6/arch/arm/mach-ixp4xx/Kconfig~ 2007-07-11 22:23:24.000000000 +0930 -+++ linux-2.6.21.6/arch/arm/mach-ixp4xx/Kconfig 2007-07-11 22:23:47.000000000 +0930 -@@ -138,6 +138,14 @@ +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig +@@ -138,6 +138,14 @@ config MACH_DSMG600 DSM-G600 RevA device. For more information on this platform, see http://www.nslu2-linux.org/wiki/DSMG600/HomePage diff --git a/target/linux/ixp4xx/patches/997-fsg3_buttons.patch b/target/linux/ixp4xx/patches/997-fsg3_buttons.patch index b9f589d..1b8d8cf 100644 --- a/target/linux/ixp4xx/patches/997-fsg3_buttons.patch +++ b/target/linux/ixp4xx/patches/997-fsg3_buttons.patch @@ -3,10 +3,10 @@ arch/arm/mach-ixp4xx/fsg-power.c | 168 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 1 deletion(-) -Index: linux-2.6.21.6-armeb/arch/arm/mach-ixp4xx/fsg-power.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/fsg-power.c =================================================================== --- /dev/null -+++ linux-2.6.21.6-armeb/arch/arm/mach-ixp4xx/fsg-power.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/fsg-power.c @@ -0,0 +1,168 @@ +/* + * arch/arm/mach-ixp4xx/fsg-power.c @@ -176,11 +176,11 @@ Index: linux-2.6.21.6-armeb/arch/arm/mach-ixp4xx/fsg-power.c +MODULE_AUTHOR("Zintis Petersons <Zintis.Petersons@e-mail.lv>"); +MODULE_DESCRIPTION("FSG buttons driver"); +MODULE_LICENSE("GPL"); -Index: linux-2.6.21.6-armeb/arch/arm/mach-ixp4xx/Makefile +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile =================================================================== ---- linux-2.6.21.6-armeb.orig/arch/arm/mach-ixp4xx/Makefile -+++ linux-2.6.21.6-armeb/arch/arm/mach-ixp4xx/Makefile -@@ -30,7 +30,7 @@ +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile +@@ -30,7 +30,7 @@ obj-$(CONFIG_MACH_GTWX5715) += gtwx5715- obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o diff --git a/target/linux/ixp4xx/patches/998-VT6421.patch b/target/linux/ixp4xx/patches/998-VT6421.patch index 805880f..a7f28e9 100644 --- a/target/linux/ixp4xx/patches/998-VT6421.patch +++ b/target/linux/ixp4xx/patches/998-VT6421.patch @@ -6,14 +6,16 @@ PATA_UDMA_TIMING register. This patch fixes a copy/paste bug that breaks DMA modes on VT6421 PATA port. Signed-off-by: Ondrej Zary <linux@rain...> -diff -Nur linux-2.6.21.6/drivers/ata/sata_via.c linux-2.6.21.6-new/drivers/ata/sata_via.c ---- linux-2.6.21.6/drivers/ata/sata_via.c 2007-07-07 06:47:55.000000000 +0200 -+++ linux-2.6.21.6-new/drivers/ata/sata_via.c 2007-09-29 11:05:07.000000000 +0200 -@@ -380,6 +380,6 @@ +Index: linux-2.6.21.7/drivers/ata/sata_via.c +=================================================================== +--- linux-2.6.21.7.orig/drivers/ata/sata_via.c ++++ linux-2.6.21.7/drivers/ata/sata_via.c +@@ -380,7 +380,7 @@ static void vt6421_set_dma_mode(struct a { struct pci_dev *pdev = to_pci_dev(ap->host->dev); static const u8 udma_bits[] = { 0xEE, 0xE8, 0xE6, 0xE4, 0xE2, 0xE1, 0xE0, 0xE0 }; - pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->pio_mode - XFER_UDMA_0]); + pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->dma_mode - XFER_UDMA_0]); } - + + static int vt6421_port_start(struct ata_port *ap) |