hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refresh kernel patches 

SVN-Revision: 11204
owl
Gabor Juhos 2008-05-19 10:58:03 +00:00
parent 51e45450f1
commit 7758bda7d0
160 changed files with 1981 additions and 2054 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
target/linux/ixp4xx/patches-2.6.23/001-kexec_atags.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- 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 @@ @@ -7,6 +7,23 @@
.globl relocate_new_kernel .globl relocate_new_kernel
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: relocate_new_kernel_end:
.globl relocate_new_kernel_size .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 Index: linux-2.6.23.17/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 --- 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 @@ @@ -24,6 +24,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/smp.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 * If we have the old style parameters, convert them to
* a tag list. * a tag list.
diff -uprN linux-2.6.23.orig/include/asm-arm/kexec.h linux-2.6.23/include/asm-arm/kexec.h Index: linux-2.6.23.17/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 --- 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 @@ @@ -14,6 +14,8 @@
#define KEXEC_ARCH KEXEC_ARCH_ARM #define KEXEC_ARCH KEXEC_ARCH_ARM

14
target/linux/ixp4xx/patches-2.6.23/012-velocity_BE.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- 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 @@ -96,11 +96,31 @@ MODULE_AUTHOR("VIA Networking Technologi
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("VIA Networking Velocity Family Gigabit Ethernet Adapter Driver"); 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 * 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 Index: linux-2.6.23.17/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 --- 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 @@ @@ -196,64 +196,70 @@
* Receive descriptor * Receive descriptor
*/ */

20
target/linux/ixp4xx/patches-2.6.23/016-dsmg600_auto_power_on.patch
View File

@ -13,10 +13,10 @@ Signed-off-by: Rod Whitby <rod@whitby.id.au>
include/asm-arm/arch-ixp4xx/dsmg600.h | 7 +------ include/asm-arm/arch-ixp4xx/dsmg600.h | 7 +------
2 files changed, 15 insertions(+), 16 deletions(-) 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.17.orig/arch/arm/mach-ixp4xx/dsmg600-power.c
+++ 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/arch/arm/mach-ixp4xx/dsmg600-power.c
@@ -26,10 +26,9 @@ @@ -26,10 +26,9 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/timer.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 /* 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. * 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. * 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) { if (power_button_countdown == 0) {
/* Signal init to do the ctrlaltdel action, this will bypass /* Signal init to do the ctrlaltdel action, this will bypass
* init if it hasn't started and do a kernel_restart. * 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" */ /* Change the state of the power LED to "blink" */
gpio_line_set(DSMG600_LED_PWR_GPIO, IXP4XX_GPIO_LOW); 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)); 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())) if (!(machine_is_dsmg600()))
return 0; return 0;
@ -76,7 +76,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c
return -EIO; return -EIO;
} }
@@ -114,7 +118,7 @@ @@ -114,7 +118,7 @@ static void __exit dsmg600_power_exit(vo
del_timer_sync(&dsmg600_power_timer); 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); 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.17.orig/include/asm-arm/arch-ixp4xx/dsmg600.h
+++ 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/include/asm-arm/arch-ixp4xx/dsmg600.h
@@ -40,18 +40,13 @@ @@ -40,18 +40,13 @@
/* Buttons */ /* Buttons */

24
target/linux/ixp4xx/patches-2.6.23/017-nas100d_auto_power_on.patch
View File

@ -10,10 +10,10 @@ Also, update the board LED setup code to use constants.
Signed-off-by: Rod Whitby <rod@whitby.id.au> 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.17.orig/arch/arm/mach-ixp4xx/nas100d-power.c
+++ 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/arch/arm/mach-ixp4xx/nas100d-power.c
@@ -21,15 +21,61 @@ @@ -21,15 +21,61 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/module.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; return IRQ_HANDLED;
} }
@@ -39,17 +85,30 @@ @@ -39,17 +85,30 @@ static int __init nas100d_power_init(voi
if (!(machine_is_nas100d())) if (!(machine_is_nas100d()))
return 0; return 0;
@ -114,7 +114,7 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-power.c
return 0; return 0;
} }
@@ -58,7 +117,9 @@ @@ -58,7 +117,9 @@ static void __exit nas100d_power_exit(vo
if (!(machine_is_nas100d())) if (!(machine_is_nas100d()))
return; return;
@ -125,10 +125,10 @@ Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-power.c
} }
module_init(nas100d_power_init); 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.17.orig/include/asm-arm/arch-ixp4xx/nas100d.h
+++ 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/include/asm-arm/arch-ixp4xx/nas100d.h
@@ -38,15 +38,15 @@ @@ -38,15 +38,15 @@
/* Buttons */ /* 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_WLAN_GPIO 0
+#define NAS100D_LED_DISK_GPIO 3 +#define NAS100D_LED_DISK_GPIO 3
+#define NAS100D_LED_PWR_GPIO 15 +#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.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-11 17:06:15.000000000 +1030 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -44,20 +44,20 @@ @@ -42,20 +42,20 @@ static struct platform_device nas100d_fl
static struct resource nas100d_led_resources[] = { static struct resource nas100d_led_resources[] = {
{ {
.name = "wlan", /* green led */ .name = "wlan", /* green led */

52
target/linux/ixp4xx/patches-2.6.23/020-ixp4xx_i2c_gpio.patch
View File

@ -6,10 +6,10 @@ Tested by the nslu2-linux and openwrt projects in public firmware releases.
Acked-by: Rod Whitby <rod@whitby.id.au> Acked-by: Rod Whitby <rod@whitby.id.au>
Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk> 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.23.17.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ 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/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/serial_8250.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-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
@@ -41,7 +42,7 @@ @@ -41,7 +42,7 @@ static struct platform_device nslu2_flas
.resource = &nslu2_flash_resource, .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, .sda_pin = NSLU2_SDA_PIN,
.scl_pin = NSLU2_SCL_PIN, .scl_pin = NSLU2_SCL_PIN,
}; };
@@ -82,11 +83,12 @@ @@ -82,11 +83,12 @@ static struct platform_device nslu2_leds
}; };
#endif #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 = { 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 = { 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_flash,
&nslu2_beeper, &nslu2_beeper,
#ifdef CONFIG_LEDS_IXP4XX #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.23.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ 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/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/serial_8250.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-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
@@ -68,16 +69,17 @@ @@ -68,16 +69,17 @@ static struct platform_device nas100d_le
}; };
#endif #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[] = { 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 = { 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, &nas100d_flash,
#ifdef CONFIG_LEDS_IXP4XX #ifdef CONFIG_LEDS_IXP4XX
&nas100d_leds, &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.23.17.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ 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/arch/arm/mach-ixp4xx/avila-setup.c
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/serial_8250.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/types.h>
#include <asm/setup.h> #include <asm/setup.h>
@@ -47,18 +48,17 @@ @@ -47,18 +48,17 @@ static struct platform_device avila_flas
.resource = &avila_flash_resource, .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[] = { 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 = { 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_flash,
&avila_uart &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.23.17.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ 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/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/serial.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-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
@@ -37,15 +38,17 @@ @@ -37,15 +38,17 @@ static struct platform_device dsmg600_fl
.resource = &dsmg600_flash_resource, .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 #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 = { 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, &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.23.17.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ 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/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/serial_8250.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/io.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.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 */ #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[] = { 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 = { static struct platform_device *ixdp425_devices[] __initdata = {

77
target/linux/ixp4xx/patches-2.6.23/030-ixp4xx_fsg_board_support.patch
View File

@ -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 --- /dev/null
+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-pci.c 2008-01-11 17:06:33.000000000 +1030 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/fsg-pci.c
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/fsg-pci.c + * 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); +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 --- /dev/null
+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-setup.c 2008-01-11 17:06:33.000000000 +1030 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/fsg-setup.c
@@ -0,0 +1,220 @@ @@ -0,0 +1,220 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/fsg-setup.c + * 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, + .init_machine = fsg_init,
+MACHINE_END +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.17.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Kconfig 2008-01-11 17:06:33.000000000 +1030 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig
@@ -125,6 +125,15 @@ @@ -125,6 +125,15 @@ config ARCH_IXDP4XX
depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435 depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
default y 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 # 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.17.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Makefile 2008-01-11 17:06:33.000000000 +1030 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Makefile
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas10
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-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 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_DSMG600) += dsmg600-setup.o dsmg600-power.o
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
+obj-$(CONFIG_MACH_FSG) += fsg-setup.o fsg-power.o +obj-$(CONFIG_MACH_FSG) += fsg-setup.o fsg-power.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/fsg.h
Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/fsg.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/fsg.h 2008-01-11 17:06:33.000000000 +1030 +++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/fsg.h
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+/* +/*
+ * include/asm-arm/arch-ixp4xx/fsg.h + * 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_USB_BIT 4
+#define FSG_LED_RING_BIT 5 +#define FSG_LED_RING_BIT 5
+#define FSG_LED_SYNC_BIT 7 +#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.17.orig/include/asm-arm/arch-ixp4xx/hardware.h
+++ 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/include/asm-arm/arch-ixp4xx/hardware.h
@@ -45,5 +45,6 @@ @@ -45,5 +45,6 @@
#include "nslu2.h" #include "nslu2.h"
#include "nas100d.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" +#include "fsg.h"
#endif /* _ASM_ARCH_HARDWARE_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.17.orig/include/asm-arm/arch-ixp4xx/irqs.h
+++ 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/include/asm-arm/arch-ixp4xx/irqs.h
@@ -128,4 +128,11 @@ @@ -128,4 +128,11 @@
#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7 #define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6 #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 +#define IRQ_FSG_PCI_INTC IRQ_IXP4XX_GPIO5
+ +
#endif #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 --- /dev/null
+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-power.c 2008-01-11 17:06:33.000000000 +1030 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/fsg-power.c
@@ -0,0 +1,89 @@ @@ -0,0 +1,89 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/fsg-power.c + * 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_AUTHOR("Rod Whitby <rod@whitby.id.au>");
+MODULE_DESCRIPTION("FSG Power/Reset driver"); +MODULE_DESCRIPTION("FSG Power/Reset driver");
+MODULE_LICENSE("GPL"); +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.17.orig/drivers/leds/Kconfig
+++ linux-2.6.23.12-armeb/drivers/leds/Kconfig 2008-01-11 17:06:33.000000000 +1030 +++ linux-2.6.23.17/drivers/leds/Kconfig
@@ -48,6 +48,12 @@ @@ -48,6 +48,12 @@ config LEDS_IXP4XX
particular board must have LEDs and they must be connected particular board must have LEDs and they must be connected
to the GPIO lines. If unsure, say Y. 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 config LEDS_TOSA
tristate "LED Support for the Sharp SL-6000 series" tristate "LED Support for the Sharp SL-6000 series"
depends on LEDS_CLASS && PXA_SHARPSL 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.17.orig/drivers/leds/Makefile
+++ linux-2.6.23.12-armeb/drivers/leds/Makefile 2008-01-11 17:06:33.000000000 +1030 +++ linux-2.6.23.17/drivers/leds/Makefile
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@ obj-$(CONFIG_LEDS_CORGI) += leds-corgi.
obj-$(CONFIG_LEDS_LOCOMO) += leds-locomo.o obj-$(CONFIG_LEDS_LOCOMO) += leds-locomo.o
obj-$(CONFIG_LEDS_SPITZ) += leds-spitz.o obj-$(CONFIG_LEDS_SPITZ) += leds-spitz.o
obj-$(CONFIG_LEDS_IXP4XX) += leds-ixp4xx-gpio.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_TOSA) += leds-tosa.o
obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c24xx.o obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c24xx.o
obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.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 --- /dev/null
+++ linux-2.6.23.12-armeb/drivers/leds/leds-fsg.c 2008-01-11 17:06:33.000000000 +1030 +++ linux-2.6.23.17/drivers/leds/leds-fsg.c
@@ -0,0 +1,243 @@ @@ -0,0 +1,243 @@
+/* +/*
+ * LED Driver for the Freecom FSG-3 + * LED Driver for the Freecom FSG-3

14
target/linux/ixp4xx/patches-2.6.23/031-ixp4xx-net-drivers-nslu2.patch
View File

@ -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.17.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ 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/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.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 = { static struct flash_platform_data nslu2_flash_data = {
.map_name = "cfi_probe", .map_name = "cfi_probe",
@@ -140,6 +141,23 @@ @@ -140,6 +141,23 @@ static struct platform_device nslu2_uart
.resource = nslu2_uart_resources, .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 = { static struct platform_device *nslu2_devices[] __initdata = {
&nslu2_i2c_gpio, &nslu2_i2c_gpio,
&nslu2_flash, &nslu2_flash,
@@ -147,6 +165,7 @@ @@ -147,6 +165,7 @@ static struct platform_device *nslu2_dev
#ifdef CONFIG_LEDS_IXP4XX #ifdef CONFIG_LEDS_IXP4XX
&nslu2_leds, &nslu2_leds,
#endif #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) 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) 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(); ixp4xx_sys_init();
nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); 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); (void)platform_device_register(&nslu2_uart);
platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices));

12
target/linux/ixp4xx/patches-2.6.23/032-ixp4xx-net-drivers-nas100d.patch
View File

@ -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.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ 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/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.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 = { static struct flash_platform_data nas100d_flash_data = {
.map_name = "cfi_probe", .map_name = "cfi_probe",
@@ -125,12 +126,30 @@ @@ -125,12 +126,30 @@ static struct platform_device nas100d_ua
.resource = nas100d_uart_resources, .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) 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) 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(); ixp4xx_sys_init();
/* gpio 14 and 15 are _not_ clocks */ /* 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); (void)platform_device_register(&nas100d_uart);
platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices)); platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices));

6
target/linux/ixp4xx/patches-2.6.23/090-increase_entropy_pools.patch
View File

@ -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.23.17.orig/drivers/char/random.c
+++ linux-2.6.19/drivers/char/random.c +++ linux-2.6.23.17/drivers/char/random.c
@@ -248,9 +248,9 @@ @@ -248,9 +248,9 @@
/* /*
* Configuration information * Configuration information

17
target/linux/ixp4xx/patches-2.6.23/091-nslu2_rtc_fixup.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -19,6 +19,7 @@ +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nslu2-setup.c
#include <linux/serial_8250.h> @@ -20,6 +20,7 @@
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/i2c-gpio.h>
+#include <asm/setup.h> +#include <asm/setup.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.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, .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) static void __init nslu2_init(void)
{ {
ixp4xx_sys_init(); uint8_t __iomem *f;
@@ -196,6 +226,7 @@ MACHINE_START(NSLU2, "Linksys NSLU2") @@ -247,6 +277,7 @@ MACHINE_START(NSLU2, "Linksys NSLU2")
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC,
.boot_params = 0x00000100, .boot_params = 0x00000100,

17
target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -17,6 +17,7 @@ +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c
#include <linux/serial_8250.h> @@ -18,6 +18,7 @@
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/i2c-gpio.h>
+#include <asm/setup.h> +#include <asm/setup.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.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); 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) static void __init nas100d_init(void)
{ {
ixp4xx_sys_init(); uint8_t __iomem *f;
@@ -170,6 +200,7 @@ MACHINE_START(NAS100D, "Iomega NAS 100d" @@ -221,6 +251,7 @@ MACHINE_START(NAS100D, "Iomega NAS 100d"
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC,
.boot_params = 0x00000100, .boot_params = 0x00000100,

6
target/linux/ixp4xx/patches-2.6.23/095-dsmg600_rtc_fixup.patch
View File

@ -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.23.17.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/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>

7
target/linux/ixp4xx/patches-2.6.23/096-kexec_cmdline.patch
View File

@ -1,6 +1,7 @@
diff -uprN linux-2.6.23.orig/kernel/ksysfs.c linux-2.6.23/kernel/ksysfs.c Index: linux-2.6.23.17/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 --- 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); @@ -49,6 +49,165 @@ KERNEL_ATTR_RW(uevent_helper);
#endif #endif

9
target/linux/ixp4xx/patches-2.6.23/100-gateway7001_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -76,9 +76,36 @@ +++ 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, .resource = &gateway7001_uart_resource,
}; };

9
target/linux/ixp4xx/patches-2.6.23/101-wg302_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c
@@ -77,9 +77,27 @@ +++ 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, .resource = &wg302v2_uart_resource,
}; };

46
target/linux/ixp4xx/patches-2.6.23/110-pronghorn_metro_support.patch
View File

@ -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.17.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.23.12/arch/arm/mach-ixp4xx/Kconfig 2008-01-05 13:37:05.000000000 +1030 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig
@@ -57,6 +57,14 @@ @@ -57,6 +57,14 @@ config MACH_WG302V2
WG302 v2 or WAG302 v2 Access Points. For more information WG302 v2 or WAG302 v2 Access Points. For more information
on this platform, see http://openwrt.org 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 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help 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.17.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.23.12/arch/arm/mach-ixp4xx/Makefile 2008-01-05 13:37:37.000000000 +1030 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Makefile
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@ obj-pci-$(CONFIG_MACH_DSMG600) += dsmg6
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-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 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_GATEWAY7001) += gateway7001-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_FSG) += fsg-setup.o fsg-power.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o fsg-power.o
+obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o +obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.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 --- /dev/null
+++ linux-2.6.23.12/arch/arm/mach-ixp4xx/pronghornmetro-pci.c 2008-01-05 13:37:05.000000000 +1030 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
@@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c + * 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); +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 --- /dev/null
+++ linux-2.6.23.12/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2008-01-05 13:37:05.000000000 +1030 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -0,0 +1,147 @@ @@ -0,0 +1,147 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/pronghornmetro-setup.c + * 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, + .init_machine = pronghornmetro_init,
+MACHINE_END +MACHINE_END
+#endif +#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.17.orig/Documentation/arm/IXP4xx
+++ linux-2.6.23.12/Documentation/arm/IXP4xx 2008-01-05 13:37:05.000000000 +1030 +++ linux-2.6.23.17/Documentation/arm/IXP4xx
@@ -111,6 +111,9 @@ @@ -111,6 +111,9 @@ http://www.adiengineering.com/productsCo
the platform has two mini-PCI slots used for 802.11[bga] cards. the platform has two mini-PCI slots used for 802.11[bga] cards.
Finally, there is an IDE port hanging off the expansion bus. 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 Gateworks Avila Network Platform
http://www.gateworks.com/avila_sbc.htm 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.17.orig/include/asm-arm/arch-ixp4xx/uncompress.h
+++ linux-2.6.23.12/include/asm-arm/arch-ixp4xx/uncompress.h 2008-01-05 13:37:05.000000000 +1030 +++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -41,7 +41,8 @@ @@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_set
* Some boards are using UART2 as console * Some boards are using UART2 as console
*/ */
if (machine_is_adi_coyote() || machine_is_gtwx5715() || if (machine_is_adi_coyote() || machine_is_gtwx5715() ||

9
target/linux/ixp4xx/patches-2.6.23/111-pronghorn_metro_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -104,9 +104,36 @@ +++ 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, .resource = pronghornmetro_pata_resources,
}; };

48
target/linux/ixp4xx/patches-2.6.23/120-compex_support.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>. 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 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help help
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile
@@ -17,6 +17,7 @@ +++ 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_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-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 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_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_PRONGHORNMETRO) += pronghornmetro-setup.o
+obj-$(CONFIG_MACH_COMPEX) += compex-setup.o +obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/compex-setup.c
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 --- /dev/null
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-10-23 18:22:41.000000000 +0200 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/compex-setup.c
@@ -0,0 +1,120 @@ @@ -0,0 +1,120 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/compex-setup.c + * 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, + .init_machine = compex_init,
+MACHINE_END +MACHINE_END
+#endif +#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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,7 @@ +++ 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) int __init ixdp425_pci_init(void)
{ {
if (machine_is_ixdp425() || machine_is_ixcdp1100() || 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); pci_common_init(&ixdp425_pci);
return 0; return 0;
} }
diff -Nur linux-2.6.23/arch/arm/tools/mach-types linux-2.6.23-owrt/arch/arm/tools/mach-types Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/tools/mach-types
@@ -1278,7 +1278,7 @@ +++ linux-2.6.23.17/arch/arm/tools/mach-types
@@ -1278,7 +1278,7 @@ oiab MACH_OIAB OIAB 1269
smdk6400 MACH_SMDK6400 SMDK6400 1270 smdk6400 MACH_SMDK6400 SMDK6400 1270
nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271 nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271
greenphone MACH_GREENPHONE GREENPHONE 1272 greenphone MACH_GREENPHONE GREENPHONE 1272

9
target/linux/ixp4xx/patches-2.6.23/121-compex_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/compex-setup.c
@@ -90,9 +90,36 @@ +++ 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, .resource = compex_uart_resources,
}; };

46
target/linux/ixp4xx/patches-2.6.23/130-wrt300nv2_support.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig
@@ -73,6 +73,14 @@ +++ 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 WP18 or NP18A boards. For more information on this
platform, see http://openwrt.org 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 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help help
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile
@@ -18,6 +18,7 @@ +++ 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_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-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 obj-y += common.o
@@ -34,6 +35,7 @@ @@ -34,5 +35,6 @@ obj-$(CONFIG_MACH_WG302V2) += wg302v2-se
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_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
+obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o +obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
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 --- /dev/null
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/wrt300nv2-pci.c 2007-10-23 19:11:31.000000000 +0200 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/wrt300nv2-pci.c + * 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); +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 Index: linux-2.6.23.17/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 --- /dev/null
+++ linux-2.6.23.17/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -0,0 +1,108 @@ @@ -0,0 +1,108 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c + * 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, + .init_machine = wrt300nv2_init,
+MACHINE_END +MACHINE_END
+#endif +#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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -42,7 +42,7 @@ +++ 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() || if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
machine_is_gateway7001() || machine_is_wg302v2() || machine_is_gateway7001() || machine_is_wg302v2() ||

9
target/linux/ixp4xx/patches-2.6.23/131-wrt300nv2_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -76,9 +76,36 @@ +++ 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, .resource = &wrt300nv2_uart_resource,
}; };

37
target/linux/ixp4xx/patches-2.6.23/140-sidewinder_support.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>. 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 config MACH_COMPEX
bool "Compex WP18 / NP18A" bool "Compex WP18 / NP18A"
select PCI select PCI
@@ -163,7 +171,7 @@ @@ -163,7 +171,7 @@ config MACH_FSG
# #
config CPU_IXP46X config CPU_IXP46X
bool 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 default y
config CPU_IXP43X config CPU_IXP43X
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile
@@ -19,6 +19,7 @@ +++ 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_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-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 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_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
+obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o +obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/sidewinder-pci.c
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 --- /dev/null
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c 2007-10-23 19:23:52.000000000 +0200 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/sidewinder-pci.c
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c + * 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); +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 Index: linux-2.6.23.17/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 --- /dev/null
+++ linux-2.6.23.17/arch/arm/mach-ixp4xx/sidewinder-setup.c
@@ -0,0 +1,115 @@ @@ -0,0 +1,115 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/sidewinder-setup.c + * arch/arm/mach-ixp4xx/sidewinder-setup.c

45
target/linux/ixp4xx/patches-2.6.23/150-lanready_ap1000_support.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- /dev/null
+++ linux-2.6.23.17/arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -0,0 +1,151 @@ @@ -0,0 +1,151 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/ap1000-setup.c + * 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, + .init_machine = ap1000_init,
+MACHINE_END +MACHINE_END
+#endif +#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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,8 @@ +++ 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) int __init ixdp425_pci_init(void)
{ {
if (machine_is_ixdp425() || machine_is_ixcdp1100() || 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); pci_common_init(&ixdp425_pci);
return 0; 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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig
@@ -89,6 +89,14 @@ +++ 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 WRT300N v2 router. For more information on this
platform, see http://openwrt.org 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 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help help
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Makefile Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile
@@ -20,6 +20,7 @@ +++ 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_COMPEX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-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 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_COMPEX) += compex-setup.o
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
+obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o +obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/tools/mach-types
@@ -1367,3 +1367,4 @@ +++ linux-2.6.23.17/arch/arm/tools/mach-types
@@ -1367,3 +1367,4 @@ db88f5281 MACH_DB88F5281 DB88F5281 13
csb726 MACH_CSB726 CSB726 1359 csb726 MACH_CSB726 CSB726 1359
tik27 MACH_TIK27 TIK27 1360 tik27 MACH_TIK27 TIK27 1360
mx_uc7420 MACH_MX_UC7420 MX_UC7420 1361 mx_uc7420 MACH_MX_UC7420 MX_UC7420 1361

9
target/linux/ixp4xx/patches-2.6.23/151-lanready_ap1000_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -90,9 +90,36 @@ +++ 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 .resource = ap1000_uart_resources
}; };

34
target/linux/ixp4xx/patches-2.6.23/160-wg302v1_support.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig
@@ -49,6 +49,14 @@ +++ 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, 7001 Access Point. For more information on this platform,
see http://openwrt.org 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 config MACH_WG302V2
bool "Netgear WG302 v2 / WAG302 v2" bool "Netgear WG302 v2 / WAG302 v2"
select PCI 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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile
@@ -14,6 +14,7 @@ +++ 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_NAS100D) += nas100d-pci.o
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-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_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-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_NAS100D) += nas100d-setup.o nas100d-power.o
obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.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_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_FSG) += fsg-setup.o fsg-power.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o fsg-power.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.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 Index: linux-2.6.23.17/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 --- /dev/null
+++ linux-2.6.23.17/arch/arm/mach-ixp4xx/wg302v1-pci.c
@@ -0,0 +1,63 @@ @@ -0,0 +1,63 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/wg302v1-pci.c + * 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); +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 Index: linux-2.6.23.17/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 --- /dev/null
+++ linux-2.6.23.17/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -0,0 +1,109 @@ @@ -0,0 +1,109 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/wg302v1-setup.c + * arch/arm/mach-ixp4xx/wg302v1-setup.c

9
target/linux/ixp4xx/patches-2.6.23/161-wg302v1_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -77,9 +77,27 @@ +++ 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, .resource = &wg302v1_uart_resource,
}; };

11
target/linux/ixp4xx/patches-2.6.23/162-wg302v1_mem_fixup.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -100,6 +100,36 @@ +++ 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], &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) static void __init wg302v1_init(void)
{ {
ixp4xx_sys_init(); ixp4xx_sys_init();
@@ -118,6 +148,7 @@ @@ -118,6 +148,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

162
target/linux/ixp4xx/patches-2.6.23/200-npe_driver.patch
View File

@ -1,8 +1,8 @@
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c Index: linux-2.6.23.17/arch/arm/kernel/setup.c
index 4de432e..c4c810b 100644 ===================================================================
--- a/arch/arm/kernel/setup.c --- linux-2.6.23.17.orig/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c +++ linux-2.6.23.17/arch/arm/kernel/setup.c
@@ -61,6 +61,7 @@ extern int root_mountflags; @@ -62,6 +62,7 @@ extern int root_mountflags;
extern void _stext, _text, _etext, __data_start, _edata, _end; extern void _stext, _text, _etext, __data_start, _edata, _end;
unsigned int processor_id; unsigned int processor_id;
@ -10,11 +10,11 @@ index 4de432e..c4c810b 100644
unsigned int __machine_arch_type; unsigned int __machine_arch_type;
EXPORT_SYMBOL(__machine_arch_type); EXPORT_SYMBOL(__machine_arch_type);
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig
index 61b2dfc..e774447 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/Kconfig --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig
@@ -189,6 +189,20 @@ config IXP4XX_INDIRECT_PCI @@ -246,6 +246,20 @@ config IXP4XX_INDIRECT_PCI
need to use the indirect method instead. If you don't know need to use the indirect method instead. If you don't know
what you need, leave this option unselected. what you need, leave this option unselected.
@ -35,21 +35,21 @@ index 61b2dfc..e774447 100644
endmenu endmenu
endif endif
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/Makefile
index 77e00ad..4bb97e1 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/Makefile --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/Makefile
+++ b/arch/arm/mach-ixp4xx/Makefile +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Makefile
@@ -30,3 +30,5 @@ obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o @@ -44,3 +44,5 @@ obj-$(CONFIG_MACH_SIDEWINDER) += sidewin
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
+obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o +obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
+obj-$(CONFIG_IXP4XX_NPE) += ixp4xx_npe.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: linux-2.6.23.17/arch/arm/mach-ixp4xx/ixdp425-setup.c
index d5008d8..10b41c6 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/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_uart = { @@ -177,6 +177,31 @@ static struct platform_device ixdp425_ua
.resource = ixdp425_uart_resources .resource = ixdp425_uart_resources
}; };
@ -79,9 +79,9 @@ index d5008d8..10b41c6 100644
+}; +};
+ +
static struct platform_device *ixdp425_devices[] __initdata = { static struct platform_device *ixdp425_devices[] __initdata = {
&ixdp425_i2c_controller, &ixdp425_i2c_gpio,
&ixdp425_flash, &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) defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
&ixdp425_flash_nand, &ixdp425_flash_nand,
#endif #endif
@ -92,11 +92,10 @@ index d5008d8..10b41c6 100644
}; };
static void __init ixdp425_init(void) static void __init ixdp425_init(void)
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/ixp4xx_npe.c
new file mode 100644 ===================================================================
index 0000000..83c137e
--- /dev/null --- /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 @@ @@ -0,0 +1,741 @@
+/* +/*
+ * Intel IXP4xx Network Processor Engine driver for Linux + * Intel IXP4xx Network Processor Engine driver for Linux
@ -839,11 +838,10 @@ index 0000000..83c137e
+EXPORT_SYMBOL(npe_send_message); +EXPORT_SYMBOL(npe_send_message);
+EXPORT_SYMBOL(npe_recv_message); +EXPORT_SYMBOL(npe_recv_message);
+EXPORT_SYMBOL(npe_send_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 Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
new file mode 100644 ===================================================================
index 0000000..e833013
--- /dev/null --- /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 @@ @@ -0,0 +1,274 @@
+/* +/*
+ * Intel IXP4xx Queue Manager driver for Linux + * Intel IXP4xx Queue Manager driver for Linux
@ -1119,10 +1117,10 @@ index 0000000..e833013
+EXPORT_SYMBOL(qmgr_disable_irq); +EXPORT_SYMBOL(qmgr_disable_irq);
+EXPORT_SYMBOL(qmgr_request_queue); +EXPORT_SYMBOL(qmgr_request_queue);
+EXPORT_SYMBOL(qmgr_release_queue); +EXPORT_SYMBOL(qmgr_release_queue);
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig Index: linux-2.6.23.17/drivers/net/arm/Kconfig
index f9cc2b6..9274d3f 100644 ===================================================================
--- a/drivers/net/arm/Kconfig --- linux-2.6.23.17.orig/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig +++ linux-2.6.23.17/drivers/net/arm/Kconfig
@@ -47,3 +47,13 @@ config EP93XX_ETH @@ -47,3 +47,13 @@ config EP93XX_ETH
help help
This is a driver for the ethernet hardware included in EP93xx CPUs. This is a driver for the ethernet hardware included in EP93xx CPUs.
@ -1137,20 +1135,19 @@ index f9cc2b6..9274d3f 100644
+ help + help
+ Say Y here if you want to use built-in Ethernet ports + Say Y here if you want to use built-in Ethernet ports
+ on IXP4xx processor. + on IXP4xx processor.
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile Index: linux-2.6.23.17/drivers/net/arm/Makefile
index a4c8682..7c812ac 100644 ===================================================================
--- a/drivers/net/arm/Makefile --- linux-2.6.23.17.orig/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile +++ linux-2.6.23.17/drivers/net/arm/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_ARM_ETHER3) += ether3.o @@ -9,3 +9,4 @@ obj-$(CONFIG_ARM_ETHER3) += ether3.o
obj-$(CONFIG_ARM_ETHER1) += ether1.o obj-$(CONFIG_ARM_ETHER1) += ether1.o
obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o
+obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_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 Index: linux-2.6.23.17/drivers/net/arm/ixp4xx_eth.c
new file mode 100644 ===================================================================
index 0000000..2c23f50
--- /dev/null --- /dev/null
+++ b/drivers/net/arm/ixp4xx_eth.c +++ linux-2.6.23.17/drivers/net/arm/ixp4xx_eth.c
@@ -0,0 +1,1259 @@ @@ -0,0 +1,1259 @@
+/* +/*
+ * Intel IXP4xx Ethernet driver for Linux + * Intel IXP4xx Ethernet driver for Linux
@ -2411,10 +2408,10 @@ index 0000000..2c23f50
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
+module_init(eth_init_module); +module_init(eth_init_module);
+module_exit(eth_cleanup_module); +module_exit(eth_cleanup_module);
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig Index: linux-2.6.23.17/drivers/net/wan/Kconfig
index a3df09e..94e7aa7 100644 ===================================================================
--- a/drivers/net/wan/Kconfig --- linux-2.6.23.17.orig/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig +++ linux-2.6.23.17/drivers/net/wan/Kconfig
@@ -334,6 +334,15 @@ config DSCC4_PCI_RST @@ -334,6 +334,15 @@ config DSCC4_PCI_RST
Say Y if your card supports this feature. Say Y if your card supports this feature.
@ -2431,10 +2428,10 @@ index a3df09e..94e7aa7 100644
config DLCI config DLCI
tristate "Frame Relay DLCI support" tristate "Frame Relay DLCI support"
---help--- ---help---
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile Index: linux-2.6.23.17/drivers/net/wan/Makefile
index d61fef3..1b1d116 100644 ===================================================================
--- a/drivers/net/wan/Makefile --- linux-2.6.23.17.orig/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile +++ linux-2.6.23.17/drivers/net/wan/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_C101) += c101.o @@ -42,6 +42,7 @@ obj-$(CONFIG_C101) += c101.o
obj-$(CONFIG_WANXL) += wanxl.o obj-$(CONFIG_WANXL) += wanxl.o
obj-$(CONFIG_PCI200SYN) += pci200syn.o obj-$(CONFIG_PCI200SYN) += pci200syn.o
@ -2443,11 +2440,10 @@ index d61fef3..1b1d116 100644
clean-files := wanxlfw.inc clean-files := wanxlfw.inc
$(obj)/wanxl.o: $(obj)/wanxlfw.inc $(obj)/wanxl.o: $(obj)/wanxlfw.inc
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c Index: linux-2.6.23.17/drivers/net/wan/ixp4xx_hss.c
new file mode 100644 ===================================================================
index 0000000..c4cdace
--- /dev/null --- /dev/null
+++ b/drivers/net/wan/ixp4xx_hss.c +++ linux-2.6.23.17/drivers/net/wan/ixp4xx_hss.c
@@ -0,0 +1,1270 @@ @@ -0,0 +1,1270 @@
+/* +/*
+ * Intel IXP4xx HSS (synchronous serial port) driver for Linux + * Intel IXP4xx HSS (synchronous serial port) driver for Linux
@ -3719,10 +3715,10 @@ index 0000000..c4cdace
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
+module_init(hss_init_module); +module_init(hss_init_module);
+module_exit(hss_cleanup_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: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/cpu.h
index d2523b3..2fa3d6b 100644 ===================================================================
--- a/include/asm-arm/arch-ixp4xx/cpu.h --- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/cpu.h
+++ b/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; @@ -28,4 +28,19 @@ extern unsigned int processor_id;
#define cpu_is_ixp46x() ((processor_id & IXP4XX_PROCESSOR_ID_MASK) == \ #define cpu_is_ixp46x() ((processor_id & IXP4XX_PROCESSOR_ID_MASK) == \
IXP465_PROCESSOR_ID_VALUE) IXP465_PROCESSOR_ID_VALUE)
@ -3743,10 +3739,10 @@ index d2523b3..2fa3d6b 100644
+} +}
+ +
#endif /* _ASM_ARCH_CPU_H */ #endif /* _ASM_ARCH_CPU_H */
diff --git 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
index 297ceda..73e8dc3 100644 ===================================================================
--- a/include/asm-arm/arch-ixp4xx/hardware.h --- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/hardware.h
+++ b/include/asm-arm/arch-ixp4xx/hardware.h +++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/hardware.h
@@ -27,13 +27,13 @@ @@ -27,13 +27,13 @@
#define pcibios_assign_all_busses() 1 #define pcibios_assign_all_busses() 1
@ -3764,10 +3760,10 @@ index 297ceda..73e8dc3 100644
/* Platform helper functions and definitions */ /* Platform helper functions and definitions */
#include "platform.h" #include "platform.h"
diff --git 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
index 5d949d7..c704fe8 100644 ===================================================================
--- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h --- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+++ b/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 @@ @@ -15,10 +15,6 @@
* *
*/ */
@ -3816,11 +3812,10 @@ index 5d949d7..c704fe8 100644
+ IXP4XX_FEATURE_XSCALE_MAX_FREQ) + IXP4XX_FEATURE_XSCALE_MAX_FREQ)
+ +
#endif #endif
diff --git a/include/asm-arm/arch-ixp4xx/npe.h b/include/asm-arm/arch-ixp4xx/npe.h Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/npe.h
new file mode 100644 ===================================================================
index 0000000..37d0511
--- /dev/null --- /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 @@ @@ -0,0 +1,39 @@
+#ifndef __IXP4XX_NPE_H +#ifndef __IXP4XX_NPE_H
+#define __IXP4XX_NPE_H +#define __IXP4XX_NPE_H
@ -3861,11 +3856,11 @@ index 0000000..37d0511
+void npe_release(struct npe *npe); +void npe_release(struct npe *npe);
+ +
+#endif /* __IXP4XX_NPE_H */ +#endif /* __IXP4XX_NPE_H */
diff --git a/include/asm-arm/arch-ixp4xx/platform.h b/include/asm-arm/arch-ixp4xx/platform.h Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/platform.h
index 2a44d3d..695b9c4 100644 ===================================================================
--- a/include/asm-arm/arch-ixp4xx/platform.h --- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/platform.h
+++ b/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; @@ -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 * 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 * This structure provide a means for the board setup code
* to give information to th pata_ixp4xx driver. It is * 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 Index: linux-2.6.23.17/include/asm-arm/arch-ixp4xx/qmgr.h
new file mode 100644 ===================================================================
index 0000000..1e52b95
--- /dev/null --- /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 @@ @@ -0,0 +1,126 @@
+/* +/*
+ * Copyright (C) 2007 Krzysztof Halasa <khc@pm.waw.pl> + * Copyright (C) 2007 Krzysztof Halasa <khc@pm.waw.pl>
@ -4035,10 +4029,10 @@ index 0000000..1e52b95
+} +}
+ +
+#endif +#endif
diff --git 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
index f7a35b7..34ef48f 100644 ===================================================================
--- a/include/asm-arm/arch-ixp4xx/uncompress.h --- linux-2.6.23.17.orig/include/asm-arm/arch-ixp4xx/uncompress.h
+++ b/include/asm-arm/arch-ixp4xx/uncompress.h +++ linux-2.6.23.17/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
#ifndef _ARCH_UNCOMPRESS_H_ #ifndef _ARCH_UNCOMPRESS_H_
#define _ARCH_UNCOMPRESS_H_ #define _ARCH_UNCOMPRESS_H_

9
target/linux/ixp4xx/patches-2.6.23/201-npe_driver_print_license_location.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -585,6 +585,8 @@ +++ 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); npe_reset(npe);
#endif #endif

11
target/linux/ixp4xx/patches-2.6.23/202-npe_driver_no_phy.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/drivers/net/arm/ixp4xx_eth.c
@@ -297,6 +297,27 @@ +++ 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; unsigned long flags;
u16 val; 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); spin_lock_irqsave(&mdio_lock, flags);
val = mdio_cmd(dev, phy_id, location, 0, 0); val = mdio_cmd(dev, phy_id, location, 0, 0);
spin_unlock_irqrestore(&mdio_lock, flags); spin_unlock_irqrestore(&mdio_lock, flags);
@@ -308,6 +329,9 @@ @@ -308,6 +329,9 @@ static void mdio_write(struct net_device
{ {
unsigned long flags; unsigned long flags;

27
target/linux/ixp4xx/patches-2.6.23/294-eeprom_new_notifier.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- 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 @@ @@ -33,6 +33,8 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/i2c.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_attach_adapter(struct i2c_adapter *adapter);
static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind); 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; data->valid = 0;
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
data->nature = UNKNOWN; 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 */ /* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client))) 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) if (err)
goto exit_detach; 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; return 0;
exit_detach: 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; 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) static int __init eeprom_init(void)
{ {
return i2c_add_driver(&eeprom_driver); 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 Index: linux-2.6.23.17/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 --- /dev/null
+++ linux-2.6.23.17/include/linux/eeprom.h
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+#ifndef _LINUX_EEPROM_H +#ifndef _LINUX_EEPROM_H
+#define _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); +extern int unregister_eeprom_notifier(struct notifier_block *nb);
+ +
+#endif /* _LINUX_EEPROM_H */ +#endif /* _LINUX_EEPROM_H */
diff -uprN linux-2.6.23.orig/include/linux/notifier.h linux-2.6.23/include/linux/notifier.h Index: linux-2.6.23.17/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 --- 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 @@ -231,5 +231,8 @@ static inline int notifier_to_errno(int
#define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */ #define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */
#define PM_POST_SUSPEND 0x0004 /* Suspend finished */ #define PM_POST_SUSPEND 0x0004 /* Suspend finished */

10
target/linux/ixp4xx/patches-2.6.23/296-avila_mac_plat_info.patch
View File

@ -1,8 +1,8 @@
diff --git a/arch/arm/mach-ixp4xx/avila-setup.c b/arch/arm/mach-ixp4xx/avila-setup.c Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c
index e38f45f..10ed5d6 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/avila-setup.c --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ b/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 = { @@ -132,10 +132,37 @@ static struct platform_device avila_pata
.resource = avila_pata_resources, .resource = avila_pata_resources,
}; };

15
target/linux/ixp4xx/patches-2.6.23/298-avila_rtc_fixup.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/avila-setup.c
@@ -138,6 +138,35 @@ static struct platform_device *avila_dev +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c
&avila_uart @@ -165,6 +165,35 @@ static struct platform_device *avila_dev
&avila_eth[1],
}; };
+static char avila_rtc_probe[] __initdata = "rtc-ds1672.probe=0,0x68 "; +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) static void __init avila_init(void)
{ {
ixp4xx_sys_init(); 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> */ /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, .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, .map_io = ixp4xx_map_io,
.init_irq = ixp4xx_init_irq, .init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer, .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> */ /* Maintainer: Tom Billman <kernel@giantshoulderinc.com> */
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

10
target/linux/ixp4xx/patches-2.6.23/300-avila_fetch_mac.patch
View File

@ -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 Index: linux-2.6.23.17/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 --- 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 @@ @@ -14,10 +14,18 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.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 <linux/i2c-gpio.h>
#include <asm/types.h> #include <asm/types.h>
@@ -194,9 +202,48 @@ @@ -194,9 +202,48 @@ static void __init avila_fixup(struct ma
t->hdr.size = 0; 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.start = IXP4XX_EXP_BUS_BASE(0);
avila_flash_resource.end = avila_flash_resource.end =

14
target/linux/ixp4xx/patches-2.6.23/301-avila_led.patch
View File

@ -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.17.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.23.14/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-25 18:44:02.000000000 +0100 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c
@@ -165,12 +165,34 @@ @@ -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 "; 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.17.orig/include/asm-arm/arch-ixp4xx/avila.h
+++ 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/include/asm-arm/arch-ixp4xx/avila.h
@@ -36,4 +36,5 @@ @@ -36,4 +36,5 @@
#define AVILA_PCI_INTC_PIN 9 #define AVILA_PCI_INTC_PIN 9
#define AVILA_PCI_INTD_PIN 8 #define AVILA_PCI_INTD_PIN 8

16
target/linux/ixp4xx/patches-2.6.23/302-gpio_device.patch
View File

@ -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.17.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.23.14/arch/arm/mach-ixp4xx/avila-setup.c 2008-01-26 03:03:07.000000000 +0100 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/avila-setup.c
@@ -183,6 +183,23 @@ @@ -183,6 +183,23 @@ static struct platform_device avila_leds
}; };
#endif #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 = { static struct platform_device *avila_devices[] __initdata = {
&avila_i2c_gpio, &avila_i2c_gpio,
@@ -193,6 +210,9 @@ @@ -193,6 +210,9 @@ static struct platform_device *avila_dev
#ifdef CONFIG_LEDS_IXP4XX #ifdef CONFIG_LEDS_IXP4XX
&avila_leds, &avila_leds,
#endif #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 "; 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.17.orig/include/asm-arm/arch-ixp4xx/avila.h
+++ 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/include/asm-arm/arch-ixp4xx/avila.h
@@ -38,3 +38,6 @@ @@ -38,3 +38,6 @@
/* User LED */ /* User LED */

16
target/linux/ixp4xx/patches-2.6.23/400-dmabounce.patch
View File

@ -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.17.orig/arch/arm/common/dmabounce.c
+++ linux-2.6.23.14/arch/arm/common/dmabounce.c 2008-01-24 22:17:36.415822168 +0100 +++ linux-2.6.23.17/arch/arm/common/dmabounce.c
@@ -116,6 +116,10 @@ @@ -116,6 +116,10 @@ alloc_safe_buffer(struct dmabounce_devic
} else if (size <= device_info->large.size) { } else if (size <= device_info->large.size) {
pool = &device_info->large; pool = &device_info->large;
} else { } else {
@ -13,11 +13,11 @@ Index: linux-2.6.23.14/arch/arm/common/dmabounce.c
pool = NULL; 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.17.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig 2008-01-24 22:11:42.891675973 +0100 +++ linux-2.6.23.17/arch/arm/mach-ixp4xx/Kconfig
@@ -220,6 +220,11 @@ @@ -220,6 +220,11 @@ config DMABOUNCE
default y default y
depends on PCI depends on PCI

6
target/linux/ixp4xx/patches-2.6.23/401-avila_pci_dev.patch
View File

@ -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.17.orig/include/asm-arm/arch-ixp4xx/avila.h
+++ 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/include/asm-arm/arch-ixp4xx/avila.h
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
/* /*
* AVILA PCI IRQs * AVILA PCI IRQs

66
target/linux/ixp4xx/patches-2.6.24/010-rtc_new_style.patch
View File

@ -2,10 +2,10 @@
drivers/rtc/rtc-isl1208.c | 357 +++++++++++++++++++++------------------------- drivers/rtc/rtc-isl1208.c | 357 +++++++++++++++++++++-------------------------
1 file changed, 170 insertions(+), 187 deletions(-) 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.7.orig/drivers/rtc/rtc-isl1208.c
+++ linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c 2008-02-01 13:36:24.000000000 +1030 +++ linux-2.6.24.7/drivers/rtc/rtc-isl1208.c
@@ -15,16 +15,15 @@ @@ -15,16 +15,15 @@
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/rtc.h> #include <linux/rtc.h>
@ -89,7 +89,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c
}; };
int ret; int ret;
@@ -103,15 +85,14 @@ @@ -103,15 +85,14 @@ isl1208_i2c_read_regs(struct i2c_client
/* block write */ /* block write */
static int static int
isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[], 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 > ISL1208_REG_USR2);
BUG_ON(reg + len > ISL1208_REG_USR2 + 1); 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 */ /* 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 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
u8 zero_mask[ISL1208_RTC_SECTION_LEN] = { u8 zero_mask[ISL1208_RTC_SECTION_LEN] = {
@@ -139,24 +121,29 @@ @@ -139,24 +121,29 @@ static int isl1208_i2c_validate_client(s
return ret; return ret;
for (i = 0; i < ISL1208_RTC_SECTION_LEN; ++i) { 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 /* The 6bit value in the ATR register controls the load
* capacitance C_load * in steps of 0.25pF * 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); struct i2c_client *const client = to_i2c_client(dev);
int sr, dtr, atr, usr; 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_ALM) ? " ALM" : "",
(sr & ISL1208_REG_SR_WRTC) ? " WRTC" : "", (sr & ISL1208_REG_SR_WRTC) ? " WRTC" : "",
(sr & ISL1208_REG_SR_XTOSCB) ? " XTOSCB" : "", (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); usr = isl1208_i2c_get_usr(client);
if (usr >= 0) if (usr >= 0)
@@ -252,9 +241,8 @@ @@ -252,9 +241,8 @@ static int isl1208_rtc_proc(struct devic
return 0; return 0;
} }
@ -257,7 +257,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c
{ {
int sr; int sr;
u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, }; 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_sec = BCD2BIN(regs[ISL1208_REG_SC]);
tm->tm_min = BCD2BIN(regs[ISL1208_REG_MN]); 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; struct rtc_time *const tm = &alarm->time;
u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, }; 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, 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) { if (sr < 0) {
dev_err(&client->dev, "%s: reading alarm section failed\n", dev_err(&client->dev, "%s: reading alarm section failed\n",
__func__); __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 */ /* 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; int sr;
u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, }; 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 */ /* set WRTC */
@ -348,7 +348,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c
sr | ISL1208_REG_SR_WRTC); sr | ISL1208_REG_SR_WRTC);
if (sr < 0) { if (sr < 0) {
dev_err(&client->dev, "%s: writing SR failed\n", __func__); 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 */ /* clear WRTC again */
@ -357,7 +357,7 @@ Index: linux-2.6.24-arm/drivers/rtc/rtc-isl1208.c
sr & ~ISL1208_REG_SR_WRTC); sr & ~ISL1208_REG_SR_WRTC);
if (sr < 0) { if (sr < 0) {
dev_err(&client->dev, "%s: writing SR failed\n", __func__); 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; 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; 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); i2c_del_driver(&isl1208_driver);
} }
--- Index: linux-2.6.24.7/drivers/rtc/rtc-pcf8563.c
drivers/rtc/rtc-pcf8563.c | 109 +++++++++++++---------------------------------
1 file changed, 32 insertions(+), 77 deletions(-)
Index: linux-2.6.24-armeb/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.7.orig/drivers/rtc/rtc-pcf8563.c
+++ linux-2.6.24-armeb/drivers/rtc/rtc-pcf8563.c 2008-01-30 13:51:55.000000000 +1030 +++ linux-2.6.24.7/drivers/rtc/rtc-pcf8563.c
@@ -18,17 +18,7 @@ @@ -18,17 +18,7 @@
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/rtc.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_ST1 0x00 /* status */
#define PCF8563_REG_ST2 0x01 #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_SC_LV 0x80 /* low voltage */
#define PCF8563_MO_C 0x80 /* century */ #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. * The meaning of MO_C bit varies by the chip type.
* From PCF8563 datasheet: this bit is toggled when the years * 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 */ 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 }; unsigned char buf[13] = { PCF8563_REG_ST1 };
struct i2c_msg msgs[] = { 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) 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; int i, err;
unsigned char buf[9]; 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, .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) static int __init pcf8563_init(void)
{ {
return i2c_add_driver(&pcf8563_driver); return i2c_add_driver(&pcf8563_driver);
--- Index: linux-2.6.24.7/drivers/rtc/rtc-x1205.c
drivers/rtc/rtc-x1205.c | 128 ++++++++++++++++--------------------------------
1 file changed, 43 insertions(+), 85 deletions(-)
Index: linux-2.6.24-armeb/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.7.orig/drivers/rtc/rtc-x1205.c
+++ linux-2.6.24-armeb/drivers/rtc/rtc-x1205.c 2008-01-30 13:51:35.000000000 +1030 +++ linux-2.6.24.7/drivers/rtc/rtc-x1205.c
@@ -22,20 +22,7 @@ @@ -22,20 +22,7 @@
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -871,7 +863,7 @@ Index: linux-2.6.24-armeb/drivers/rtc/rtc-x1205.c
/* offsets into CCR area */ /* 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 */ #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 * 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); 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); i2c_set_clientdata(client, rtc);
@@ -565,45 +533,35 @@ @@ -565,45 +533,35 @@ static int x1205_probe(struct i2c_adapte
else else
dev_err(&client->dev, "couldn't read status\n"); dev_err(&client->dev, "couldn't read status\n");

52
target/linux/ixp4xx/patches-2.6.24/014_ixp4xx_i2c_gpio.patch
View File

@ -6,10 +6,10 @@ Tested by the nslu2-linux and openwrt projects in public firmware releases.
Acked-by: Rod Whitby <rod@whitby.id.au> Acked-by: Rod Whitby <rod@whitby.id.au>
Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk> 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.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ 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/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/serial_8250.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-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
@@ -41,7 +42,7 @@ @@ -41,7 +42,7 @@ static struct platform_device nslu2_flas
.resource = &nslu2_flash_resource, .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, .sda_pin = NSLU2_SDA_PIN,
.scl_pin = NSLU2_SCL_PIN, .scl_pin = NSLU2_SCL_PIN,
}; };
@@ -82,11 +83,12 @@ @@ -82,11 +83,12 @@ static struct platform_device nslu2_leds
}; };
#endif #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 = { 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 = { 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_flash,
&nslu2_beeper, &nslu2_beeper,
#ifdef CONFIG_LEDS_IXP4XX #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.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ 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/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/serial_8250.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-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
@@ -68,16 +69,17 @@ @@ -68,16 +69,17 @@ static struct platform_device nas100d_le
}; };
#endif #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[] = { 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 = { 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, &nas100d_flash,
#ifdef CONFIG_LEDS_IXP4XX #ifdef CONFIG_LEDS_IXP4XX
&nas100d_leds, &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.7.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ 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/arch/arm/mach-ixp4xx/avila-setup.c
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/serial_8250.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/types.h>
#include <asm/setup.h> #include <asm/setup.h>
@@ -47,18 +48,17 @@ @@ -47,18 +48,17 @@ static struct platform_device avila_flas
.resource = &avila_flash_resource, .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[] = { 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 = { 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_flash,
&avila_uart &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.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ 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/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/serial.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-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
@@ -37,15 +38,17 @@ @@ -37,15 +38,17 @@ static struct platform_device dsmg600_fl
.resource = &dsmg600_flash_resource, .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 #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 = { 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, &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.7.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ 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/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/serial_8250.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/io.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.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 */ #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[] = { 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 = { static struct platform_device *ixdp425_devices[] __initdata = {

48
target/linux/ixp4xx/patches-2.6.24/015-ixp4xx_update_defconfig.patch
View File

@ -24,10 +24,10 @@ Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
PATCH FOLLOWS PATCH FOLLOWS
KernelVersion: 2.6.24-git5 KernelVersion: 2.6.24-git5
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig Index: linux-2.6.24.7/arch/arm/configs/ixp4xx_defconfig
index db850a5..2d5ae33 100644 ===================================================================
--- a/arch/arm/configs/ixp4xx_defconfig --- linux-2.6.24.7.orig/arch/arm/configs/ixp4xx_defconfig
+++ b/arch/arm/configs/ixp4xx_defconfig +++ linux-2.6.24.7/arch/arm/configs/ixp4xx_defconfig
@@ -1,69 +1,96 @@ @@ -1,69 +1,96 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
@ -1005,7 +1005,8 @@ index db850a5..2d5ae33 100644
- -
-# -#
-# Wireless 802.11b ISA/PCI cards support -# Wireless 802.11b ISA/PCI cards support
-# +# Wireless LAN
#
-# CONFIG_AIRO is not set -# CONFIG_AIRO is not set
-CONFIG_HERMES=y -CONFIG_HERMES=y
-# CONFIG_PLX_HERMES is not set -# CONFIG_PLX_HERMES is not set
@ -1013,18 +1014,17 @@ index db850a5..2d5ae33 100644
-# CONFIG_NORTEL_HERMES is not set -# CONFIG_NORTEL_HERMES is not set
-CONFIG_PCI_HERMES=y -CONFIG_PCI_HERMES=y
-# CONFIG_ATMEL is not set -# 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_PRE80211 is not set
+# CONFIG_WLAN_80211 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 -# Wan interfaces
+# USB Network Adapters +# USB Network Adapters
# #
@ -1313,12 +1313,10 @@ index db850a5..2d5ae33 100644
# #
-# CONFIG_VIDEO_DEV is not set -# CONFIG_VIDEO_DEV is not set
+# CONFIG_USBPCWATCHDOG is not set +# CONFIG_USBPCWATCHDOG is not set
+
# +#
-# Digital Video Broadcasting Devices
+# Sonics Silicon Backplane +# Sonics Silicon Backplane
# +#
-# CONFIG_DVB is not set
+CONFIG_SSB_POSSIBLE=y +CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set +# CONFIG_SSB is not set
+ +
@ -1326,10 +1324,12 @@ index db850a5..2d5ae33 100644
+# Multifunction device drivers +# Multifunction device drivers
+# +#
+# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SM501 is not set
+
+# #
-# Digital Video Broadcasting Devices
+# Multimedia devices +# Multimedia devices
+# #
-# CONFIG_DVB is not set
+# CONFIG_VIDEO_DEV is not set +# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set +# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y +CONFIG_DAB=y
@ -1360,8 +1360,9 @@ index db850a5..2d5ae33 100644
# #
-# USB support -# USB support
-#
+# USB Input Devices +# USB Input Devices
# +#
+CONFIG_USB_HID=y +CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set +# CONFIG_HID_FF is not set
@ -1721,6 +1722,3 @@ index db850a5..2d5ae33 100644
+CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y +CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y +CONFIG_HAS_DMA=y
--
1.5.2.5

25
target/linux/ixp4xx/patches-2.6.24/016-dsmg600_auto_power_on.patch
View File

@ -16,10 +16,10 @@ Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
PATCH FOLLOWS PATCH FOLLOWS
KernelVersion: 2.6.24-git5 KernelVersion: 2.6.24-git5
diff --git 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
index 3471787..db63987 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/dsmg600-power.c --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/dsmg600-power.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-power.c +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-power.c
@@ -26,14 +26,13 @@ @@ -26,14 +26,13 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/timer.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 */ /* Must hold the button down for at least this many counts to be processed */
#define PBUTTON_HOLDDOWN_COUNT 4 /* 2 secs */ #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. * state of the power button.
*/ */
@ -72,7 +72,7 @@ index 3471787..db63987 100644
} }
mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500)); 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())) if (!(machine_is_dsmg600()))
return 0; return 0;
@ -87,7 +87,7 @@ index 3471787..db63987 100644
return -EIO; 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); del_timer_sync(&dsmg600_power_timer);
@ -96,10 +96,10 @@ index 3471787..db63987 100644
} }
module_init(dsmg600_power_init); module_init(dsmg600_power_init);
diff --git 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
index a19605a..b7673e1 100644 ===================================================================
--- a/include/asm-arm/arch-ixp4xx/dsmg600.h --- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/dsmg600.h
+++ b/include/asm-arm/arch-ixp4xx/dsmg600.h +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/dsmg600.h
@@ -40,18 +40,13 @@ @@ -40,18 +40,13 @@
/* Buttons */ /* Buttons */
@ -120,6 +120,3 @@ index a19605a..b7673e1 100644
- -
#define DSMG600_LED_WLAN_GPIO 14 #define DSMG600_LED_WLAN_GPIO 14
-#define DSMG600_LED_WLAN_BM (1L << DSMG600_LED_WLAN_GPIO) -#define DSMG600_LED_WLAN_BM (1L << DSMG600_LED_WLAN_GPIO)
--
1.5.2.5

33
target/linux/ixp4xx/patches-2.6.24/017-nas100d_auto_power_on.patch
View File

@ -18,10 +18,10 @@ Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
PATCH FOLLOWS PATCH FOLLOWS
KernelVersion: 2.6.24-git5 KernelVersion: 2.6.24-git5
diff --git 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
index 29aa98d..4c1c01b 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/nas100d-power.c --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-power.c
+++ b/arch/arm/mach-ixp4xx/nas100d-power.c +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-power.c
@@ -21,15 +21,59 @@ @@ -21,15 +21,59 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/module.h> #include <linux/module.h>
@ -86,7 +86,7 @@ index 29aa98d..4c1c01b 100644
return IRQ_HANDLED; 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())) if (!(machine_is_nas100d()))
return 0; return 0;
@ -120,7 +120,7 @@ index 29aa98d..4c1c01b 100644
return 0; 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())) if (!(machine_is_nas100d()))
return; return;
@ -131,11 +131,11 @@ index 29aa98d..4c1c01b 100644
} }
module_init(nas100d_power_init); module_init(nas100d_power_init);
diff --git 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
index 54d884f..213a4ce 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/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_flash = { @@ -43,20 +43,20 @@ static struct platform_device nas100d_fl
static struct resource nas100d_led_resources[] = { static struct resource nas100d_led_resources[] = {
{ {
.name = "wlan", /* green led */ .name = "wlan", /* green led */
@ -163,10 +163,10 @@ index 54d884f..213a4ce 100644
.flags = IXP4XX_GPIO_LOW, .flags = IXP4XX_GPIO_LOW,
}, },
}; };
diff --git 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
index 131e0a1..98d9378 100644 ===================================================================
--- a/include/asm-arm/arch-ixp4xx/nas100d.h --- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/nas100d.h
+++ b/include/asm-arm/arch-ixp4xx/nas100d.h +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/nas100d.h
@@ -38,15 +38,15 @@ @@ -38,15 +38,15 @@
/* Buttons */ /* Buttons */
@ -192,6 +192,3 @@ index 131e0a1..98d9378 100644
+#define NAS100D_LED_WLAN_GPIO 0 +#define NAS100D_LED_WLAN_GPIO 0
+#define NAS100D_LED_DISK_GPIO 3 +#define NAS100D_LED_DISK_GPIO 3
+#define NAS100D_LED_PWR_GPIO 15 +#define NAS100D_LED_PWR_GPIO 15
--
1.5.2.5

75
target/linux/ixp4xx/patches-2.6.24/020-ixp4xx_rtc_info.patch
View File

@ -12,11 +12,11 @@ Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
PATCH FOLLOWS PATCH FOLLOWS
KernelVersion: 2.6.24-git5 KernelVersion: 2.6.24-git5
diff --git 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
index 332a066..ebeb566 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -19,6 +19,7 @@ @@ -18,6 +18,7 @@
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/leds.h> #include <linux/leds.h>
@ -24,7 +24,7 @@ index 332a066..ebeb566 100644
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>
#include <asm/mach-types.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, .scl_pin = NSLU2_SCL_PIN,
}; };
@ -37,7 +37,7 @@ index 332a066..ebeb566 100644
#ifdef CONFIG_LEDS_IXP4XX #ifdef CONFIG_LEDS_IXP4XX
static struct resource nslu2_led_resources[] = { 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; 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 * 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 * to have it first in order to see debug messages, and so that
-- Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c
1.5.2.5 ===================================================================
--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
From d4ef1ee0daf96e42bf93421960eaded71e189712 Mon Sep 17 00:00:00 2001 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c
From: Rod Whitby <rod@whitby.id.au> @@ -16,6 +16,7 @@
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 @@
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/leds.h> #include <linux/leds.h>
@ -76,7 +59,7 @@ index b0884c2..09f75b9 100644
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>
#include <asm/mach-types.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, .resource = &nas100d_flash_resource,
}; };
@ -89,7 +72,7 @@ index b0884c2..09f75b9 100644
#ifdef CONFIG_LEDS_IXP4XX #ifdef CONFIG_LEDS_IXP4XX
static struct resource nas100d_led_resources[] = { 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; 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 * 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 * to have it first in order to see debug messages, and so that
-- Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
1.5.2.5 ===================================================================
--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c
From aa9d35dae397402f57f1baa8d53fed75d76aed8d Mon Sep 17 00:00:00 2001 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
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
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/serial.h> #include <linux/serial.h>
@ -128,7 +94,7 @@ index c473d40..a1c44ef 100644
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>
#include <asm/mach-types.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 /* The UART is required on the DSM-G600 (Redboot cannot use the
* NIC) -- do it here so that it does *not* get removed if * NIC) -- do it here so that it does *not* get removed if
* platform_add_devices fails! * platform_add_devices fails!
--
1.5.2.5

47
target/linux/ixp4xx/patches-2.6.24/021-ixp4xx_use_leds_gpio.patch
View File

@ -12,10 +12,10 @@ Signed-off-by: Rod Whitby <rod@whitby.id.au>
PATCH FOLLOWS PATCH FOLLOWS
KernelVersion: v2.6.24-1915-gc9b12e6 KernelVersion: v2.6.24-1915-gc9b12e6
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig Index: linux-2.6.24.7/arch/arm/configs/ixp4xx_defconfig
index 2d5ae33..77fe3b0 100644 ===================================================================
--- a/arch/arm/configs/ixp4xx_defconfig --- linux-2.6.24.7.orig/arch/arm/configs/ixp4xx_defconfig
+++ b/arch/arm/configs/ixp4xx_defconfig +++ linux-2.6.24.7/arch/arm/configs/ixp4xx_defconfig
@@ -1330,8 +1330,8 @@ CONFIG_LEDS_CLASS=y @@ -1330,8 +1330,8 @@ CONFIG_LEDS_CLASS=y
# #
# LED drivers # LED drivers
@ -27,10 +27,10 @@ index 2d5ae33..77fe3b0 100644
# #
# LED Triggers # LED Triggers
diff --git 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
index a1c44ef..d0e1295 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/dsmg600-setup.c --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/serial.h> #include <linux/serial.h>
@ -39,7 +39,7 @@ index a1c44ef..d0e1295 100644
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-gpio.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[] = { 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 = { static struct platform_device *dsmg600_devices[] __initdata = {
&dsmg600_i2c_gpio, &dsmg600_i2c_gpio,
&dsmg600_flash, &dsmg600_flash,
@ -103,11 +103,11 @@ index a1c44ef..d0e1295 100644
} }
MACHINE_START(DSMG600, "D-Link DSM-G600 RevA") 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: linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c
index dc782d0..5801579 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/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 nas100d_i2c_board_info [] = { @@ -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 = { static struct i2c_gpio_platform_data nas100d_i2c_gpio_data = {
.sda_pin = NAS100D_SDA_PIN, .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 = { static struct platform_device *nas100d_devices[] __initdata = {
&nas100d_i2c_gpio, &nas100d_i2c_gpio,
&nas100d_flash, &nas100d_flash,
@ -167,11 +167,11 @@ index dc782d0..5801579 100644
}; };
static void nas100d_power_off(void) 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: linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c
index 16d091c..41d55c8 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/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 nslu2_i2c_board_info [] = { @@ -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 = { static struct platform_device nslu2_i2c_gpio = {
.name = "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_i2c_gpio,
&nslu2_flash, &nslu2_flash,
&nslu2_beeper, &nslu2_beeper,
@ -237,6 +237,3 @@ index 16d091c..41d55c8 100644
}; };
static void nslu2_power_off(void) static void nslu2_power_off(void)
--
1.5.2.5

70
target/linux/ixp4xx/patches-2.6.24/030-ixp4xx_fsg_board_support.patch
View File

@ -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.7.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-20 21:09:12.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig
@@ -125,6 +125,15 @@ @@ -125,6 +125,15 @@ config ARCH_IXDP4XX
depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435 depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
default y 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 # 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.7.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-20 21:09:12.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas10
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-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 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_DSMG600) += dsmg600-setup.o dsmg600-power.o
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
+obj-$(CONFIG_MACH_FSG) += fsg-setup.o +obj-$(CONFIG_MACH_FSG) += fsg-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.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 --- /dev/null
+++ linux-2.6.24/arch/arm/mach-ixp4xx/fsg-pci.c 2008-03-20 21:09:12.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/fsg-pci.c
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/fsg-pci.c + * 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); +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 --- /dev/null
+++ linux-2.6.24/arch/arm/mach-ixp4xx/fsg-setup.c 2008-03-20 21:09:12.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/fsg-setup.c
@@ -0,0 +1,275 @@ @@ -0,0 +1,275 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/fsg-setup.c + * 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, + .init_machine = fsg_init,
+MACHINE_END +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 --- /dev/null
+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/fsg.h 2008-03-20 21:09:12.000000000 +1030 +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/fsg.h
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+/* +/*
+ * include/asm-arm/arch-ixp4xx/fsg.h + * 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_USB_BIT 4
+#define FSG_LED_RING_BIT 5 +#define FSG_LED_RING_BIT 5
+#define FSG_LED_SYNC_BIT 7 +#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.7.orig/include/asm-arm/arch-ixp4xx/hardware.h
+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/hardware.h 2008-03-20 21:09:12.000000000 +1030 +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/hardware.h
@@ -45,5 +45,6 @@ @@ -45,5 +45,6 @@
#include "nslu2.h" #include "nslu2.h"
#include "nas100d.h" #include "nas100d.h"
@ -459,10 +459,10 @@ Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/hardware.h
+#include "fsg.h" +#include "fsg.h"
#endif /* _ASM_ARCH_HARDWARE_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.7.orig/include/asm-arm/arch-ixp4xx/irqs.h
+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/irqs.h 2008-03-20 21:09:12.000000000 +1030 +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/irqs.h
@@ -128,4 +128,11 @@ @@ -128,4 +128,11 @@
#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7 #define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6 #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 +#define IRQ_FSG_PCI_INTC IRQ_IXP4XX_GPIO5
+ +
#endif #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.7.orig/drivers/leds/Kconfig
+++ linux-2.6.24/drivers/leds/Kconfig 2008-03-20 21:09:12.000000000 +1030 +++ linux-2.6.24.7/drivers/leds/Kconfig
@@ -48,6 +48,12 @@ @@ -48,6 +48,12 @@ config LEDS_IXP4XX
particular board must have LEDs and they must be connected particular board must have LEDs and they must be connected
to the GPIO lines. If unsure, say Y. to the GPIO lines. If unsure, say Y.
@ -492,11 +492,11 @@ Index: linux-2.6.24/drivers/leds/Kconfig
config LEDS_TOSA config LEDS_TOSA
tristate "LED Support for the Sharp SL-6000 series" tristate "LED Support for the Sharp SL-6000 series"
depends on LEDS_CLASS && PXA_SHARPSL 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.7.orig/drivers/leds/Makefile
+++ linux-2.6.24/drivers/leds/Makefile 2008-03-20 21:09:56.000000000 +1030 +++ linux-2.6.24.7/drivers/leds/Makefile
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@ obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-
obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o
@ -504,10 +504,10 @@ Index: linux-2.6.24/drivers/leds/Makefile
# LED Triggers # LED Triggers
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o 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 --- /dev/null
+++ linux-2.6.24/drivers/leds/leds-fsg.c 2008-03-20 21:09:12.000000000 +1030 +++ linux-2.6.24.7/drivers/leds/leds-fsg.c
@@ -0,0 +1,261 @@ @@ -0,0 +1,261 @@
+/* +/*
+ * LED Driver for the Freecom FSG-3 + * LED Driver for the Freecom FSG-3

31
target/linux/ixp4xx/patches-2.6.24/031-nslu2_nas100d_ethernet_support.patch
View File

@ -17,10 +17,10 @@ Tested-by: Tom King <tom@websb.net>
PATCH FOLLOWS PATCH FOLLOWS
KernelVersion: v2.6.24-1916-g3832564 KernelVersion: v2.6.24-1916-g3832564
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig Index: linux-2.6.24.7/arch/arm/configs/ixp4xx_defconfig
index 77fe3b0..efa0485 100644 ===================================================================
--- a/arch/arm/configs/ixp4xx_defconfig --- linux-2.6.24.7.orig/arch/arm/configs/ixp4xx_defconfig
+++ b/arch/arm/configs/ixp4xx_defconfig +++ linux-2.6.24.7/arch/arm/configs/ixp4xx_defconfig
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
@ -56,10 +56,10 @@ index 77fe3b0..efa0485 100644
CONFIG_DLCI=m CONFIG_DLCI=m
CONFIG_DLCI_MAX=8 CONFIG_DLCI_MAX=8
CONFIG_WAN_ROUTER_DRIVERS=m CONFIG_WAN_ROUTER_DRIVERS=m
diff --git 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
index 5801579..a432226 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
* *
*/ */
@ -76,7 +76,7 @@ index 5801579..a432226 100644
static struct flash_platform_data nas100d_flash_data = { static struct flash_platform_data nas100d_flash_data = {
.map_name = "cfi_probe", .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, .resource = nas100d_uart_resources,
}; };
@ -142,10 +142,10 @@ index 5801579..a432226 100644
} }
MACHINE_START(NAS100D, "Iomega NAS 100d") 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: linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c
index 41d55c8..fd9ec17 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
* Changed to conform to new style __init ixdp425 kas11 10/22/04 * 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 = { static struct flash_platform_data nslu2_flash_data = {
.map_name = "cfi_probe", .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, .resource = nslu2_uart_resources,
}; };
@ -230,6 +230,3 @@ index 41d55c8..fd9ec17 100644
} }
MACHINE_START(NSLU2, "Linksys NSLU2") MACHINE_START(NSLU2, "Linksys NSLU2")
--
1.5.2.5

130
target/linux/ixp4xx/patches-2.6.24/032-subsume_power_files.patch
View File

@ -11,23 +11,23 @@ Signed-off-by: Rod Whitby <rod@whitby.id.au>
PATCH FOLLOWS PATCH FOLLOWS
KernelVersion: v2.6.24-1917-gaf66bd3 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.7.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.24-armeb/arch/arm/mach-ixp4xx/Makefile 2008-02-03 22:45:44.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
@@ -23,7 +23,7 @@ @@ -26,7 +26,7 @@ obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-
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_GTWX5715) += gtwx5715-setup.o
-obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o
+obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o obj-$(CONFIG_MACH_NAS100D) += nas100d-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_DSMG600) += dsmg600-setup.o dsmg600-power.o +obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nslu2-power.c
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ /dev/null
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
- * arch/arm/mach-ixp4xx/nslu2-power.c - * 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_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
-MODULE_DESCRIPTION("NSLU2 Power/Reset driver"); -MODULE_DESCRIPTION("NSLU2 Power/Reset driver");
-MODULE_LICENSE("GPL"); -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.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ 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/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -3,22 +3,26 @@ @@ -3,22 +3,26 @@
* *
* NSLU2 board-setup * 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 = { static struct flash_platform_data nslu2_flash_data = {
.map_name = "cfi_probe", .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); 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) static void __init nslu2_timer_init(void)
{ {
/* The xtal on this machine is non-standard. */ /* 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 = nslu2_flash_resource.end =
IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; 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, i2c_register_board_info(0, nslu2_i2c_board_info,
ARRAY_SIZE(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)); 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. * 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.7.orig/include/asm-arm/arch-ixp4xx/nslu2.h
+++ 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/include/asm-arm/arch-ixp4xx/nslu2.h
@@ -39,34 +39,17 @@ @@ -39,34 +39,17 @@
/* Buttons */ /* 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) -#define NSLU2_LED_DISK2_BM (1L << NSLU2_LED_DISK2_GPIO)
- -
- -
From: Rod Whitby <rod@whitby.id.au> Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-power.c
Subject: ixp4xx: Merge nas100d-power.c into nas100d-setup.c (Patch #4808) ===================================================================
--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-power.c
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
+++ /dev/null +++ /dev/null
@@ -1,128 +0,0 @@ @@ -1,128 +0,0 @@
-/* -/*
@ -423,10 +397,10 @@ index 4c1c01b..0000000
-MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
-MODULE_DESCRIPTION("NAS100D Power/Reset driver"); -MODULE_DESCRIPTION("NAS100D Power/Reset driver");
-MODULE_LICENSE("GPL"); -MODULE_LICENSE("GPL");
diff --git 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
index a432226..4cecae8 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -3,8 +3,14 @@ @@ -3,8 +3,14 @@
* *
* NAS 100d board-setup * NAS 100d board-setup
@ -563,38 +537,9 @@ index a432226..4cecae8 100644
/* /*
* Map in a portion of the flash and read the MAC address. * 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 * Since it is stored in BE in the flash itself, we need to
-- Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-power.c
1.5.2.5 ===================================================================
--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/dsmg600-power.c
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
+++ /dev/null +++ /dev/null
@@ -1,129 +0,0 @@ @@ -1,129 +0,0 @@
-/* -/*
@ -726,10 +671,10 @@ index db63987..0000000
-MODULE_AUTHOR("Michael Westerhof <mwester@dls.net>"); -MODULE_AUTHOR("Michael Westerhof <mwester@dls.net>");
-MODULE_DESCRIPTION("DSM-G600 Power/Reset driver"); -MODULE_DESCRIPTION("DSM-G600 Power/Reset driver");
-MODULE_LICENSE("GPL"); -MODULE_LICENSE("GPL");
diff --git 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
index d0e1295..6886596 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/dsmg600-setup.c --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -1,20 +1,29 @@ @@ -1,20 +1,29 @@
/* /*
* DSM-G600 board-setup * DSM-G600 board-setup
@ -868,6 +813,3 @@ index d0e1295..6886596 100644
} }
MACHINE_START(DSMG600, "D-Link DSM-G600 RevA") MACHINE_START(DSMG600, "D-Link DSM-G600 RevA")
--
1.5.2.5

118
target/linux/ixp4xx/patches-2.6.24/033-velocity_be.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/drivers/net/via-velocity.c
@@ -254,11 +254,31 @@ +++ linux-2.6.24.7/drivers/net/via-velocity.c
@@ -254,11 +254,31 @@ MODULE_AUTHOR("VIA Networking Technologi
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("VIA Networking Velocity Family Gigabit Ethernet Adapter Driver"); 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_MIN 64
#define RX_DESC_MAX 255 #define RX_DESC_MAX 255
#define RX_DESC_DEF 64 #define RX_DESC_DEF 64
@@ -557,12 +577,12 @@ @@ -557,12 +577,12 @@ static void __devinit velocity_set_bool_
if (val == -1) if (val == -1)
*opt |= (def ? flag : 0); *opt |= (def ? flag : 0);
else if (val < 0 || val > 1) { 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); *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) 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->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->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); 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->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); 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); 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; struct mac_regs __iomem * regs = vptr->mac_regs;
unsigned short vid; 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 */ /* Turn on MCFG_PQEN, turn off MCFG_RTGOPT */
WORD_REG_BITS_SET(MCFG_PQEN, MCFG_RTGOPT, &regs->MCFG); WORD_REG_BITS_SET(MCFG_PQEN, MCFG_RTGOPT, &regs->MCFG);
WORD_REG_BITS_ON(MCFG_VIDFR, &regs->MCFG); WORD_REG_BITS_ON(MCFG_VIDFR, &regs->MCFG);
@@ -636,8 +660,10 @@ @@ -636,8 +660,10 @@ static void velocity_init_cam_filter(str
} else { } else {
u16 temp = 0; u16 temp = 0;
mac_set_vlan_cam(regs, 0, (u8 *) &temp); 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; struct mac_regs __iomem * regs = vptr->mac_regs;
int i; 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, &regs->RBRDU); writew(vptr->options.numrx, &regs->RBRDU);
writel(vptr->rd_pool_dma, &regs->RDBaseLo); writel(vptr->rd_pool_dma, &regs->RDBaseLo);
@@ -704,12 +732,15 @@ @@ -704,12 +732,15 @@ static void velocity_init_registers(stru
struct mac_regs __iomem * regs = vptr->mac_regs; struct mac_regs __iomem * regs = vptr->mac_regs;
int i, mii_status; 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); netif_stop_queue(vptr->dev);
/* /*
@@ -737,12 +768,13 @@ @@ -737,12 +768,13 @@ static void velocity_init_registers(stru
case VELOCITY_INIT_COLD: case VELOCITY_INIT_COLD:
default: 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); mac_eeprom_reload(regs);
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
writeb(vptr->dev->dev_addr[i], &(regs->PAR[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), &regs->CFGB); BYTE_REG_BITS_SET(CFGB_OFSET, (CFGB_CRANDOM | CFGB_CAP | CFGB_MBA | CFGB_BAKOPT), &regs->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 * 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 auto-polling
*/ */
enable_mii_autopoll(regs); 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, &regs->RDCSize); writew(vptr->options.numrx - 1, &regs->RDCSize);
mac_rx_queue_run(regs); mac_rx_queue_run(regs);
mac_rx_queue_wake(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, &regs->TDCSize); writew(vptr->options.numtx - 1, &regs->TDCSize);
for (i = 0; i < vptr->num_txq; i++) { 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); init_flow_control_register(vptr);
writel(CR0_STOP, &regs->CR0Clr); writel(CR0_STOP, &regs->CR0Clr);
@@ -807,8 +849,10 @@ @@ -807,8 +849,10 @@ static void velocity_init_registers(stru
enable_flow_control_ability(vptr); enable_flow_control_ability(vptr);
mac_hw_mibs_init(regs); 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; struct mac_regs __iomem * regs = vptr->mac_regs;
int i = 0; 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, &regs->CR0Set); writel(CR0_SFRST, &regs->CR0Set);
for (i = 0; i < W_MAX_TIMEOUT; i++) { 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); VELOCITY_FULL_DRV_NAM, VELOCITY_VERSION);
printk(KERN_INFO "Copyright (c) 2002, 2003 VIA Networking Technologies, Inc.\n"); printk(KERN_INFO "Copyright (c) 2002, 2003 VIA Networking Technologies, Inc.\n");
printk(KERN_INFO "Copyright (c) 2004 Red Hat 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; first = 0;
} }
@@ -1104,6 +1150,7 @@ @@ -1104,6 +1150,7 @@ static int velocity_init_rings(struct ve
dma_addr_t pool_dma; dma_addr_t pool_dma;
u8 *pool; 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 * 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) static void velocity_free_rings(struct velocity_info *vptr)
{ {
int size; 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) + size = vptr->options.numrx * sizeof(struct rx_desc) +
vptr->options.numtx * sizeof(struct tx_desc) * vptr->num_txq; 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; struct mac_regs __iomem *regs = vptr->mac_regs;
int avail, dirty, unusable; 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 * RD number must be equal to 4X per hardware spec
* (programming guide rev 1.20, p.13) * (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; dirty = vptr->rd_dirty - unusable;
for (avail = vptr->rd_filled & 0xfffc; avail; avail--) { for (avail = vptr->rd_filled & 0xfffc; avail; avail--) {
dirty = (dirty > 0) ? dirty - 1 : vptr->options.numrx - 1; 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, &regs->RBRDU); writew(vptr->rd_filled & 0xfffc, &regs->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) static int velocity_rx_refill(struct velocity_info *vptr)
{ {
int dirty = vptr->rd_dirty, done = 0, ret = 0; 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; break;
if (!vptr->rd_info[dirty].skb) { if (!vptr->rd_info[dirty].skb) {
@@ -1244,6 +1296,7 @@ @@ -1244,6 +1296,7 @@ static int velocity_init_rd_ring(struct
int ret; int ret;
int mtu = vptr->dev->mtu; 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->rx_buf_sz = (mtu <= ETH_DATA_LEN) ? PKT_BUF_SZ : mtu + 32;
vptr->rd_info = kcalloc(vptr->options.numrx, vptr->rd_info = kcalloc(vptr->options.numrx,
@@ -1275,6 +1328,7 @@ @@ -1275,6 +1328,7 @@ static void velocity_free_rd_ring(struct
{ {
int i; 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) if (vptr->rd_info == NULL)
return; return;
@@ -1314,6 +1368,7 @@ @@ -1314,6 +1368,7 @@ static int velocity_init_td_ring(struct
struct tx_desc *td; struct tx_desc *td;
struct velocity_td_info *td_info; 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 */ /* Init the TD ring entries */
for (j = 0; j < vptr->num_txq; j++) { for (j = 0; j < vptr->num_txq; j++) {
curr = vptr->td_pool_dma[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]); struct velocity_td_info * td_info = &(vptr->td_infos[q][n]);
int i; 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) if (td_info == NULL)
return; return;
@@ -1379,6 +1435,7 @@ @@ -1379,6 +1435,7 @@ static void velocity_free_td_ring(struct
{ {
int i, j; 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++) { for (j = 0; j < vptr->num_txq; j++) {
if (vptr->td_infos[j] == NULL) if (vptr->td_infos[j] == NULL)
continue; continue;
@@ -1406,34 +1463,42 @@ @@ -1406,34 +1463,42 @@ static int velocity_rx_srv(struct veloci
struct net_device_stats *stats = &vptr->stats; struct net_device_stats *stats = &vptr->stats;
int rd_curr = vptr->rd_curr; int rd_curr = vptr->rd_curr;
int works = 0; 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; 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) 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; return;
} }
} }
@@ -1496,9 +1569,11 @@ @@ -1496,9 +1569,11 @@ static inline int velocity_rx_copy(struc
{ {
int ret = -1; 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); new_skb = dev_alloc_skb(pkt_size + 2);
if (new_skb) { if (new_skb) {
new_skb->dev = vptr->dev; 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, static inline void velocity_iph_realign(struct velocity_info *vptr,
struct sk_buff *skb, int pkt_size) 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--) for (i = pkt_size; i >= 0; i--)
*(skb->data + i + 2) = *(skb->data + i); *(skb->data + i + 2) = *(skb->data + i);
skb_reserve(skb, 2); 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) static int velocity_receive_frame(struct velocity_info *vptr, int idx)
{ {
void (*pci_action)(struct pci_dev *, dma_addr_t, size_t, int); 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++; vptr->stats.multicast++;
skb = rd_info->skb; 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) { 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++; stats->rx_length_errors++;
return -EINVAL; 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 rx_desc *rd = &(vptr->rd_ring[idx]);
struct velocity_rd_info *rd_info = &(vptr->rd_info[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); rd_info->skb = dev_alloc_skb(vptr->rx_buf_sz + 64);
if (rd_info->skb == NULL) if (rd_info->skb == NULL)
return -ENOMEM; return -ENOMEM;
@@ -1637,10 +1724,14 @@ @@ -1637,10 +1724,14 @@ static int velocity_alloc_rx_buf(struct
*/ */
*((u32 *) & (rd->rdesc0)) = 0; *((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; return 0;
} }
@@ -1661,9 +1752,11 @@ @@ -1661,9 +1752,11 @@ static int velocity_tx_srv(struct veloci
int full = 0; int full = 0;
int idx; int idx;
int works = 0; 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 (qnum = 0; qnum < vptr->num_txq; qnum++) {
for (idx = vptr->td_tail[qnum]; vptr->td_used[qnum] > 0; for (idx = vptr->td_tail[qnum]; vptr->td_used[qnum] > 0;
idx = (idx + 1) % vptr->options.numtx) { 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]); td = &(vptr->td_rings[qnum][idx]);
tdinfo = &(vptr->td_infos[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++; stats->tx_window_errors++;
} else { } else {
stats->tx_packets++; 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) 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) { if (status & ISR_TXSTLI) {
struct mac_regs __iomem * regs = vptr->mac_regs; 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; struct sk_buff *skb = tdinfo->skb;
int i; 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 * 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; struct velocity_td_info *tdinfo;
unsigned long flags; unsigned long flags;
int index; 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; 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]); td_ptr = &(vptr->td_rings[qnum][index]);
tdinfo = &(vptr->td_infos[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. * 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); memset(tdinfo->buf + skb->len, 0, ETH_ZLEN - skb->len);
tdinfo->skb = skb; tdinfo->skb = skb;
tdinfo->skb_dma[0] = tdinfo->buf_dma; 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->tdesc0.pktsize =
td_ptr->td_buf[0].pa_low = cpu_to_le32(tdinfo->skb_dma[0]); td_ptr->td_buf[0].pa_low = cpu_to_le32(tdinfo->skb_dma[0]);
td_ptr->td_buf[0].pa_high = 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 */ /* FIXME: support 48bit DMA later */
td_ptr->td_buf[i].pa_low = cpu_to_le32(tdinfo->skb_dma); td_ptr->td_buf[i].pa_low = cpu_to_le32(tdinfo->skb_dma);
td_ptr->td_buf[i].pa_high = 0; 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; td_ptr->td_buf[i].bufsize = skb->len->skb->data_len;
for (i = 0; i < nfrags; i++) { for (i = 0; i < nfrags; i++) {
@@ -2144,7 +2273,7 @@ @@ -2144,7 +2273,7 @@ static int velocity_xmit(struct sk_buff
} }
} else } 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 * 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 = skb;
tdinfo->skb_dma[0] = pci_map_single(vptr->pdev, skb->data, pktlen, PCI_DMA_TODEVICE); 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)) { && (skb->ip_summed == CHECKSUM_PARTIAL)) {
const struct iphdr *ip = ip_hdr(skb); const struct iphdr *ip = ip_hdr(skb);
if (ip->protocol == IPPROTO_TCP) 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); mac_tx_queue_wake(vptr->mac_regs, qnum);
} }
dev->trans_start = jiffies; dev->trans_start = jiffies;
@@ -2219,7 +2366,7 @@ @@ -2219,7 +2366,7 @@ static int velocity_intr(int irq, void *
u32 isr_status; u32 isr_status;
int max_count = 0; 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); spin_lock(&vptr->lock);
isr_status = mac_read_isr(vptr->mac_regs); 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) { while (isr_status != 0) {
mac_write_isr(vptr->mac_regs, isr_status); 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); velocity_error(vptr, isr_status);
if (isr_status & (ISR_PRXI | ISR_PPRXI)) if (isr_status & (ISR_PRXI | ISR_PPRXI))
max_count += velocity_rx_srv(vptr, isr_status); 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; int i;
struct dev_mc_list *mclist; 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. */ if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
writel(0xffffffff, &regs->MARCAM[0]); writel(0xffffffff, &regs->MARCAM[0]);
writel(0xffffffff, &regs->MARCAM[4]); writel(0xffffffff, &regs->MARCAM[4]);
@@ -2319,6 +2470,7 @@ @@ -2319,6 +2470,7 @@ static struct net_device_stats *velocity
{ {
struct velocity_info *vptr = netdev_priv(dev); 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 the hardware is down, don't touch MII */
if(!netif_running(dev)) if(!netif_running(dev))
return &vptr->stats; 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); struct velocity_info *vptr = netdev_priv(dev);
int ret; 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 /* 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 */ 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; 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 * 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 Index: linux-2.6.24.7/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 --- 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 @@ @@ -196,64 +196,70 @@
* Receive descriptor * 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]; struct td_buf td_buf[7];
}; };
@@ -279,6 +285,16 @@ @@ -279,6 +285,16 @@ enum velocity_owner {
OWNED_BY_NIC = 1 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. * MAC registers and macros.
@@ -1512,6 +1528,7 @@ @@ -1512,6 +1528,7 @@ enum velocity_flow_cntl_type {
}; };
struct velocity_opt { struct velocity_opt {

6
target/linux/ixp4xx/patches-2.6.24/090-increase_entropy_pools.patch
View File

@ -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.24.7.orig/drivers/char/random.c
+++ linux-2.6.19/drivers/char/random.c +++ linux-2.6.24.7/drivers/char/random.c
@@ -248,9 +248,9 @@ @@ -248,9 +248,9 @@
/* /*
* Configuration information * Configuration information

9
target/linux/ixp4xx/patches-2.6.24/100-gateway7001_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -76,9 +76,36 @@ +++ 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, .resource = &gateway7001_uart_resource,
}; };

9
target/linux/ixp4xx/patches-2.6.24/101-wg302_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c
@@ -77,9 +77,27 @@ +++ 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, .resource = &wg302v2_uart_resource,
}; };

46
target/linux/ixp4xx/patches-2.6.24/110-pronghorn_metro_support.patch
View File

@ -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.7.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig
@@ -57,6 +57,14 @@ @@ -57,6 +57,14 @@ config MACH_WG302V2
WG302 v2 or WAG302 v2 Access Points. For more information WG302 v2 or WAG302 v2 Access Points. For more information
on this platform, see http://openwrt.org on this platform, see http://openwrt.org
@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help 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.7.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@ obj-pci-$(CONFIG_MACH_DSMG600) += dsmg6
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-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 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_GATEWAY7001) += gateway7001-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_FSG) += fsg-setup.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o
+obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o +obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.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 --- /dev/null
+++ linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-pci.c 2008-03-12 21:21:26.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
@@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c + * 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); +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 --- /dev/null
+++ linux-2.6.24/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2008-03-12 21:21:26.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -0,0 +1,147 @@ @@ -0,0 +1,147 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/pronghornmetro-setup.c + * 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, + .init_machine = pronghornmetro_init,
+MACHINE_END +MACHINE_END
+#endif +#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.7.orig/Documentation/arm/IXP4xx
+++ linux-2.6.24/Documentation/arm/IXP4xx 2008-03-12 21:21:26.000000000 +1030 +++ linux-2.6.24.7/Documentation/arm/IXP4xx
@@ -111,6 +111,9 @@ @@ -111,6 +111,9 @@ http://www.adiengineering.com/productsCo
the platform has two mini-PCI slots used for 802.11[bga] cards. the platform has two mini-PCI slots used for 802.11[bga] cards.
Finally, there is an IDE port hanging off the expansion bus. 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 Gateworks Avila Network Platform
http://www.gateworks.com/avila_sbc.htm 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.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h
+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:21:26.000000000 +1030 +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -41,7 +41,8 @@ @@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_set
* Some boards are using UART2 as console * Some boards are using UART2 as console
*/ */
if (machine_is_adi_coyote() || machine_is_gtwx5715() || if (machine_is_adi_coyote() || machine_is_gtwx5715() ||

9
target/linux/ixp4xx/patches-2.6.24/111-pronghorn_metro_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -104,9 +104,36 @@ +++ 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, .resource = pronghornmetro_pata_resources,
}; };

40
target/linux/ixp4xx/patches-2.6.24/120-compex_support.patch
View File

@ -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.7.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:26.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ @@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>. 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 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help 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.7.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:26.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@ obj-pci-$(CONFIG_MACH_GATEWAY7001) += ga
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-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 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_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_FSG) += fsg-setup.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
+obj-$(CONFIG_MACH_COMPEX) += compex-setup.o +obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.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 --- /dev/null
+++ linux-2.6.24/arch/arm/mach-ixp4xx/compex-setup.c 2008-03-12 21:21:26.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/compex-setup.c
@@ -0,0 +1,120 @@ @@ -0,0 +1,120 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/compex-setup.c + * 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, + .init_machine = compex_init,
+MACHINE_END +MACHINE_END
+#endif +#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.7.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ linux-2.6.24/arch/arm/mach-ixp4xx/ixdp425-pci.c 2008-03-12 21:21:26.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = {
int __init ixdp425_pci_init(void) int __init ixdp425_pci_init(void)
{ {
if (machine_is_ixdp425() || machine_is_ixcdp1100() || 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); pci_common_init(&ixdp425_pci);
return 0; 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.7.orig/arch/arm/tools/mach-types
+++ linux-2.6.24/arch/arm/tools/mach-types 2008-03-12 21:21:26.000000000 +1030 +++ linux-2.6.24.7/arch/arm/tools/mach-types
@@ -1278,7 +1278,7 @@ @@ -1276,7 +1276,7 @@ oiab MACH_OIAB OIAB 1269
smdk6400 MACH_SMDK6400 SMDK6400 1270 smdk6400 MACH_SMDK6400 SMDK6400 1270
nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271 nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271
greenphone MACH_GREENPHONE GREENPHONE 1272 greenphone MACH_GREENPHONE GREENPHONE 1272

9
target/linux/ixp4xx/patches-2.6.24/121-compex_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/compex-setup.c
@@ -90,9 +90,36 @@ +++ 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, .resource = compex_uart_resources,
}; };

38
target/linux/ixp4xx/patches-2.6.24/130-wrt300nv2_support.patch
View File

@ -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.7.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:27.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig
@@ -73,6 +73,14 @@ @@ -73,6 +73,14 @@ config MACH_COMPEX
WP18 or NP18A boards. For more information on this WP18 or NP18A boards. For more information on this
platform, see http://openwrt.org platform, see http://openwrt.org
@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help 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.7.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:27.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@ obj-pci-$(CONFIG_MACH_WG302V2) += wg302
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-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 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_FSG) += fsg-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
+obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o +obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.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 --- /dev/null
+++ linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-pci.c 2008-03-12 21:21:27.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/wrt300nv2-pci.c + * 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); +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 --- /dev/null
+++ linux-2.6.24/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2008-03-12 21:21:27.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -0,0 +1,108 @@ @@ -0,0 +1,108 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c + * 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, + .init_machine = wrt300nv2_init,
+MACHINE_END +MACHINE_END
+#endif +#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.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h
+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/uncompress.h 2008-03-12 21:21:27.000000000 +1030 +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@ static __inline__ void __arch_decomp_set
*/ */
if (machine_is_adi_coyote() || machine_is_gtwx5715() || if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
machine_is_gateway7001() || machine_is_wg302v2() || machine_is_gateway7001() || machine_is_wg302v2() ||

9
target/linux/ixp4xx/patches-2.6.24/131-wrt300nv2_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -76,9 +76,36 @@ +++ 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, .resource = &wrt300nv2_uart_resource,
}; };

37
target/linux/ixp4xx/patches-2.6.24/140-sidewinder_support.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>. 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 config MACH_COMPEX
bool "Compex WP18 / NP18A" bool "Compex WP18 / NP18A"
select PCI select PCI
@@ -163,7 +171,7 @@ @@ -163,7 +171,7 @@ config MACH_FSG
# #
config CPU_IXP46X config CPU_IXP46X
bool 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 default y
config CPU_IXP43X config CPU_IXP43X
diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile
@@ -19,6 +19,7 @@ +++ 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_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-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 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_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
+obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o +obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/sidewinder-pci.c
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 --- /dev/null
+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c 2007-10-23 19:23:52.000000000 +0200 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/sidewinder-pci.c
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c + * 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); +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 Index: linux-2.6.24.7/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 --- /dev/null
+++ linux-2.6.24.7/arch/arm/mach-ixp4xx/sidewinder-setup.c
@@ -0,0 +1,115 @@ @@ -0,0 +1,115 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/sidewinder-setup.c + * arch/arm/mach-ixp4xx/sidewinder-setup.c

36
target/linux/ixp4xx/patches-2.6.24/150-lanready_ap1000_support.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- /dev/null
+++ linux-2.6.24.7/arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -0,0 +1,151 @@ @@ -0,0 +1,151 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/ap1000-setup.c + * 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, + .init_machine = ap1000_init,
+MACHINE_END +MACHINE_END
+#endif +#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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,8 @@ +++ 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) int __init ixdp425_pci_init(void)
{ {
if (machine_is_ixdp425() || machine_is_ixcdp1100() || 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); pci_common_init(&ixdp425_pci);
return 0; 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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Kconfig
@@ -89,6 +89,14 @@ +++ 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 WRT300N v2 router. For more information on this
platform, see http://openwrt.org 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 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help help
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/Makefile linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/Makefile Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile
@@ -20,6 +20,7 @@ +++ 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_COMPEX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-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 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_COMPEX) += compex-setup.o
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o

9
target/linux/ixp4xx/patches-2.6.24/151-lanready_ap1000_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -90,9 +90,37 @@ +++ 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 .resource = ap1000_uart_resources
}; };

34
target/linux/ixp4xx/patches-2.6.24/160-wg302v1_support.patch
View File

@ -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.7.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-12 21:21:29.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig
@@ -49,6 +49,14 @@ @@ -49,6 +49,14 @@ config MACH_GATEWAY7001
7001 Access Point. For more information on this platform, 7001 Access Point. For more information on this platform,
see http://openwrt.org see http://openwrt.org
@ -17,11 +17,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
config MACH_WG302V2 config MACH_WG302V2
bool "Netgear WG302 v2 / WAG302 v2" bool "Netgear WG302 v2 / WAG302 v2"
select PCI 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.7.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-12 21:21:29.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@ obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-p
obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-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_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-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_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_GATEWAY7001) += gateway7001-setup.o
+obj-$(CONFIG_MACH_WG302V1) += wg302v1-setup.o +obj-$(CONFIG_MACH_WG302V1) += wg302v1-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_FSG) += fsg-setup.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-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 --- /dev/null
+++ linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-pci.c 2008-03-12 21:21:29.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/wg302v1-pci.c
@@ -0,0 +1,63 @@ @@ -0,0 +1,63 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/wg302v1-pci.c + * 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); +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 --- /dev/null
+++ linux-2.6.24/arch/arm/mach-ixp4xx/wg302v1-setup.c 2008-03-12 21:21:29.000000000 +1030 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -0,0 +1,109 @@ @@ -0,0 +1,109 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/wg302v1-setup.c + * arch/arm/mach-ixp4xx/wg302v1-setup.c

9
target/linux/ixp4xx/patches-2.6.24/161-wg302v1_mac_plat_info.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -77,9 +77,27 @@ +++ 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, .resource = &wg302v1_uart_resource,
}; };

11
target/linux/ixp4xx/patches-2.6.24/162-wg302v1_mem_fixup.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -100,6 +100,36 @@ +++ 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], &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) static void __init wg302v1_init(void)
{ {
ixp4xx_sys_init(); ixp4xx_sys_init();
@@ -118,6 +148,7 @@ @@ -118,6 +148,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

8
target/linux/ixp4xx/patches-2.6.24/170-ixdpg425_mac_plat_info.patch
View File

@ -1,6 +1,8 @@
--- linux-2.6.24.2/arch/arm/mach-ixp4xx/coyote-setup.c 2008-02-11 06:51:11.000000000 +0100 Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/coyote-setup.c
+++ 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 @@ --- 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, .resource = &coyote_uart_resource,
}; };

43
target/linux/ixp4xx/patches-2.6.24/180-tw5334_support.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Kconfig
@@ -150,6 +150,14 @@ +++ 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 PrPCM1100 Processor Mezanine Module. For more information on
this platform, see <file:Documentation/arm/IXP4xx>. 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 config MACH_NAS100D
bool bool
prompt "NAS100D" 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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile
@@ -22,6 +22,7 @@ +++ 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_WRT300NV2) += wrt300nv2-pci.o
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-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 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_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
+obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o +obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/tw5334-setup.c
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 --- /dev/null
+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-setup.c 2008-04-09 01:58:52.000000000 +0200 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/tw5334-setup.c
@@ -0,0 +1,162 @@ @@ -0,0 +1,162 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/tw5334-setup.c + * 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, + .init_machine = tw5334_init,
+MACHINE_END +MACHINE_END
+#endif +#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 Index: linux-2.6.24.7/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 --- /dev/null
+++ linux-2.6.24.7/arch/arm/mach-ixp4xx/tw5334-pci.c
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/tw5334-pci.c + * 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); +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 Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/uncompress.h
+++ 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 @@ --- 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() || if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
machine_is_gateway7001() || machine_is_wg302v2() || machine_is_gateway7001() || machine_is_wg302v2() ||

43
target/linux/ixp4xx/patches-2.6.24/190-cambria_support.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Kconfig
@@ -25,6 +25,14 @@ +++ 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, Avila Network Platform. For more information on this platform,
see <file:Documentation/arm/IXP4xx>. 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 config MACH_LOFT
bool "Loft" bool "Loft"
depends on MACH_AVILA depends on MACH_AVILA
@@ -200,7 +208,7 @@ @@ -200,7 +208,7 @@ config CPU_IXP46X
config CPU_IXP43X config CPU_IXP43X
bool 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 default y
config MACH_GTWX5715 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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile
@@ -7,6 +7,7 @@ +++ 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_ARCH_IXDP4XX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_AVILA) += avila-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_MACH_IXDPG425) += ixdpg425-pci.o
obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o
obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-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_ARCH_IXDP4XX) += ixdp425-setup.o
obj-$(CONFIG_MACH_AVILA) += avila-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_MACH_IXDPG425) += coyote-setup.o
obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-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 Index: linux-2.6.24.7/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 --- /dev/null
+++ linux-2.6.24.7/arch/arm/mach-ixp4xx/cambria-pci.c
@@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/cambria-pci.c + * 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); +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 Index: linux-2.6.24.7/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 --- /dev/null
+++ linux-2.6.24.7/arch/arm/mach-ixp4xx/cambria-setup.c
@@ -0,0 +1,250 @@ @@ -0,0 +1,250 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/cambria-setup.c + * 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, + .init_machine = cambria_init,
+MACHINE_END +MACHINE_END
+#endif +#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 Index: linux-2.6.24.7/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 --- 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 @@ @@ -18,7 +18,7 @@
#define __ASM_ARCH_HARDWARE_H__ #define __ASM_ARCH_HARDWARE_H__

230
target/linux/ixp4xx/patches-2.6.24/200-npe_driver.patch
View File

@ -1,7 +1,7 @@
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig Index: linux-2.6.24.7/drivers/net/arm/Kconfig
index f9cc2b6..9274d3f 100644 ===================================================================
--- a/drivers/net/arm/Kconfig --- linux-2.6.24.7.orig/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig +++ linux-2.6.24.7/drivers/net/arm/Kconfig
@@ -47,3 +47,13 @@ config EP93XX_ETH @@ -47,3 +47,13 @@ config EP93XX_ETH
help help
This is a driver for the ethernet hardware included in EP93xx CPUs. This is a driver for the ethernet hardware included in EP93xx CPUs.
@ -16,20 +16,19 @@ index f9cc2b6..9274d3f 100644
+ help + help
+ Say Y here if you want to use built-in Ethernet ports + Say Y here if you want to use built-in Ethernet ports
+ on IXP4xx processor. + on IXP4xx processor.
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile Index: linux-2.6.24.7/drivers/net/arm/Makefile
index a4c8682..7c812ac 100644 ===================================================================
--- a/drivers/net/arm/Makefile --- linux-2.6.24.7.orig/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile +++ linux-2.6.24.7/drivers/net/arm/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_ARM_ETHER3) += ether3.o @@ -9,3 +9,4 @@ obj-$(CONFIG_ARM_ETHER3) += ether3.o
obj-$(CONFIG_ARM_ETHER1) += ether1.o obj-$(CONFIG_ARM_ETHER1) += ether1.o
obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o
+obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_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 Index: linux-2.6.24.7/drivers/net/arm/ixp4xx_eth.c
new file mode 100644 ===================================================================
index 0000000..98131a7
--- /dev/null --- /dev/null
+++ b/drivers/net/arm/ixp4xx_eth.c +++ linux-2.6.24.7/drivers/net/arm/ixp4xx_eth.c
@@ -0,0 +1,1261 @@ @@ -0,0 +1,1261 @@
+/* +/*
+ * Intel IXP4xx Ethernet driver for Linux + * Intel IXP4xx Ethernet driver for Linux
@ -1292,10 +1291,10 @@ index 0000000..98131a7
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
+module_init(eth_init_module); +module_init(eth_init_module);
+module_exit(eth_cleanup_module); +module_exit(eth_cleanup_module);
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig Index: linux-2.6.24.7/drivers/net/wan/Kconfig
index a3df09e..94e7aa7 100644 ===================================================================
--- a/drivers/net/wan/Kconfig --- linux-2.6.24.7.orig/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig +++ linux-2.6.24.7/drivers/net/wan/Kconfig
@@ -334,6 +334,15 @@ config DSCC4_PCI_RST @@ -334,6 +334,15 @@ config DSCC4_PCI_RST
Say Y if your card supports this feature. Say Y if your card supports this feature.
@ -1312,10 +1311,10 @@ index a3df09e..94e7aa7 100644
config DLCI config DLCI
tristate "Frame Relay DLCI support" tristate "Frame Relay DLCI support"
---help--- ---help---
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile Index: linux-2.6.24.7/drivers/net/wan/Makefile
index d61fef3..1b1d116 100644 ===================================================================
--- a/drivers/net/wan/Makefile --- linux-2.6.24.7.orig/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile +++ linux-2.6.24.7/drivers/net/wan/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_C101) += c101.o @@ -42,6 +42,7 @@ obj-$(CONFIG_C101) += c101.o
obj-$(CONFIG_WANXL) += wanxl.o obj-$(CONFIG_WANXL) += wanxl.o
obj-$(CONFIG_PCI200SYN) += pci200syn.o obj-$(CONFIG_PCI200SYN) += pci200syn.o
@ -1324,11 +1323,10 @@ index d61fef3..1b1d116 100644
clean-files := wanxlfw.inc clean-files := wanxlfw.inc
$(obj)/wanxl.o: $(obj)/wanxlfw.inc $(obj)/wanxl.o: $(obj)/wanxlfw.inc
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c Index: linux-2.6.24.7/drivers/net/wan/ixp4xx_hss.c
new file mode 100644 ===================================================================
index 0000000..c4cdace
--- /dev/null --- /dev/null
+++ b/drivers/net/wan/ixp4xx_hss.c +++ linux-2.6.24.7/drivers/net/wan/ixp4xx_hss.c
@@ -0,0 +1,1270 @@ @@ -0,0 +1,1270 @@
+/* +/*
+ * Intel IXP4xx HSS (synchronous serial port) driver for Linux + * Intel IXP4xx HSS (synchronous serial port) driver for Linux
@ -2600,26 +2598,10 @@ index 0000000..c4cdace
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
+module_init(hss_init_module); +module_init(hss_init_module);
+module_exit(hss_cleanup_module); +module_exit(hss_cleanup_module);
From: Krzysztof Halasa <khc@pm.waw.pl> Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
Subject: Adds functions to read and write IXP4xx "feature" bits ===================================================================
--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
Adds functions to read and write IXP4xx "feature" (aka "fuse") +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
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
@@ -15,10 +15,6 @@ @@ -15,10 +15,6 @@
* *
*/ */
@ -2668,10 +2650,10 @@ index 5d949d7..c704fe8 100644
+ IXP4XX_FEATURE_XSCALE_MAX_FREQ) + IXP4XX_FEATURE_XSCALE_MAX_FREQ)
+ +
#endif #endif
diff --git 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
index d2523b3..2fa3d6b 100644 ===================================================================
--- a/include/asm-arm/arch-ixp4xx/cpu.h --- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/cpu.h
+++ b/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; @@ -28,4 +28,19 @@ extern unsigned int processor_id;
#define cpu_is_ixp46x() ((processor_id & IXP4XX_PROCESSOR_ID_MASK) == \ #define cpu_is_ixp46x() ((processor_id & IXP4XX_PROCESSOR_ID_MASK) == \
IXP465_PROCESSOR_ID_VALUE) IXP465_PROCESSOR_ID_VALUE)
@ -2692,10 +2674,10 @@ index d2523b3..2fa3d6b 100644
+} +}
+ +
#endif /* _ASM_ARCH_CPU_H */ #endif /* _ASM_ARCH_CPU_H */
diff --git 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
index 297ceda..73e8dc3 100644 ===================================================================
--- a/include/asm-arm/arch-ixp4xx/hardware.h --- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/hardware.h
+++ b/include/asm-arm/arch-ixp4xx/hardware.h +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/hardware.h
@@ -27,13 +27,13 @@ @@ -27,13 +27,13 @@
#define pcibios_assign_all_busses() 1 #define pcibios_assign_all_busses() 1
@ -2713,10 +2695,10 @@ index 297ceda..73e8dc3 100644
/* Platform helper functions and definitions */ /* Platform helper functions and definitions */
#include "platform.h" #include "platform.h"
diff --git 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
index f7a35b7..34ef48f 100644 ===================================================================
--- a/include/asm-arm/arch-ixp4xx/uncompress.h --- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h
+++ b/include/asm-arm/arch-ixp4xx/uncompress.h +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
#ifndef _ARCH_UNCOMPRESS_H_ #ifndef _ARCH_UNCOMPRESS_H_
#define _ARCH_UNCOMPRESS_H_ #define _ARCH_UNCOMPRESS_H_
@ -2726,11 +2708,11 @@ index f7a35b7..34ef48f 100644
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c Index: linux-2.6.24.7/arch/arm/kernel/setup.c
index 4de432e..c4c810b 100644 ===================================================================
--- a/arch/arm/kernel/setup.c --- linux-2.6.24.7.orig/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c +++ linux-2.6.24.7/arch/arm/kernel/setup.c
@@ -61,6 +61,7 @@ extern int root_mountflags; @@ -62,6 +62,7 @@ extern int root_mountflags;
extern void _stext, _text, _etext, __data_start, _edata, _end; extern void _stext, _text, _etext, __data_start, _edata, _end;
unsigned int processor_id; unsigned int processor_id;
@ -2738,25 +2720,11 @@ index 4de432e..c4c810b 100644
unsigned int __machine_arch_type; unsigned int __machine_arch_type;
EXPORT_SYMBOL(__machine_arch_type); EXPORT_SYMBOL(__machine_arch_type);
Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig
===================================================================
From: Krzysztof Halasa <khc@pm.waw.pl> --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Kconfig
Subject: Adds drivers for IXP4xx QMgr and NPE features +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig
@@ -262,6 +262,20 @@ config IXP4XX_INDIRECT_PCI
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
need to use the indirect method instead. If you don't know need to use the indirect method instead. If you don't know
what you need, leave this option unselected. what you need, leave this option unselected.
@ -2777,21 +2745,20 @@ index 61b2dfc..e774447 100644
endmenu endmenu
endif endif
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
index 77e00ad..4bb97e1 100644 ===================================================================
--- a/arch/arm/mach-ixp4xx/Makefile --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile
+++ b/arch/arm/mach-ixp4xx/Makefile +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
@@ -30,3 +30,5 @@ obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o @@ -48,3 +48,5 @@ obj-$(CONFIG_MACH_AP1000) += ap1000-setu
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
+obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o +obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
+obj-$(CONFIG_IXP4XX_NPE) += ixp4xx_npe.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 Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/qmgr.h
new file mode 100644 ===================================================================
index 0000000..1e52b95
--- /dev/null --- /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 @@ @@ -0,0 +1,126 @@
+/* +/*
+ * Copyright (C) 2007 Krzysztof Halasa <khc@pm.waw.pl> + * Copyright (C) 2007 Krzysztof Halasa <khc@pm.waw.pl>
@ -2919,11 +2886,10 @@ index 0000000..1e52b95
+} +}
+ +
+#endif +#endif
diff --git a/include/asm-arm/arch-ixp4xx/npe.h b/include/asm-arm/arch-ixp4xx/npe.h Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/npe.h
new file mode 100644 ===================================================================
index 0000000..37d0511
--- /dev/null --- /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 @@ @@ -0,0 +1,39 @@
+#ifndef __IXP4XX_NPE_H +#ifndef __IXP4XX_NPE_H
+#define __IXP4XX_NPE_H +#define __IXP4XX_NPE_H
@ -2964,11 +2930,10 @@ index 0000000..37d0511
+void npe_release(struct npe *npe); +void npe_release(struct npe *npe);
+ +
+#endif /* __IXP4XX_NPE_H */ +#endif /* __IXP4XX_NPE_H */
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
new file mode 100644 ===================================================================
index 0000000..e833013
--- /dev/null --- /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 @@ @@ -0,0 +1,274 @@
+/* +/*
+ * Intel IXP4xx Queue Manager driver for Linux + * Intel IXP4xx Queue Manager driver for Linux
@ -3244,11 +3209,10 @@ index 0000000..e833013
+EXPORT_SYMBOL(qmgr_disable_irq); +EXPORT_SYMBOL(qmgr_disable_irq);
+EXPORT_SYMBOL(qmgr_request_queue); +EXPORT_SYMBOL(qmgr_request_queue);
+EXPORT_SYMBOL(qmgr_release_queue); +EXPORT_SYMBOL(qmgr_release_queue);
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/ixp4xx_npe.c
new file mode 100644 ===================================================================
index 0000000..83c137e
--- /dev/null --- /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 @@ @@ -0,0 +1,741 @@
+/* +/*
+ * Intel IXP4xx Network Processor Engine driver for Linux + * Intel IXP4xx Network Processor Engine driver for Linux
@ -3991,30 +3955,11 @@ index 0000000..83c137e
+EXPORT_SYMBOL(npe_send_message); +EXPORT_SYMBOL(npe_send_message);
+EXPORT_SYMBOL(npe_recv_message); +EXPORT_SYMBOL(npe_recv_message);
+EXPORT_SYMBOL(npe_send_recv_message); +EXPORT_SYMBOL(npe_send_recv_message);
Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/platform.h
===================================================================
From 35acb53f356e80efad803b9460986d9786dc9b96 Mon Sep 17 00:00:00 2001 --- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/platform.h
From: Krzysztof Halasa <khc@pm.waw.pl> +++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/platform.h
Date: Tue, 29 Jan 2008 10:25:57 +1030 @@ -102,6 +102,27 @@ struct ixp4xx_pata_data {
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 {
struct sys_timer; struct sys_timer;
@ -4042,29 +3987,11 @@ index 2ce28e3..a1f2b54 100644
/* /*
* Frequency of clock used for primary clocksource * Frequency of clock used for primary clocksource
*/ */
-- Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/ixdp425-setup.c
1.5.2.5 ===================================================================
--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c
From 5a5be39c6411f2d6d8cead614f3f71af9fa4b4b4 Mon Sep 17 00:00:00 2001 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/ixdp425-setup.c
From: Krzysztof Halasa <khc@pm.waw.pl> @@ -177,6 +177,31 @@ static struct platform_device ixdp425_ua
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 = {
.resource = ixdp425_uart_resources .resource = ixdp425_uart_resources
}; };
@ -4096,7 +4023,7 @@ index e89070d..44584af 100644
static struct platform_device *ixdp425_devices[] __initdata = { static struct platform_device *ixdp425_devices[] __initdata = {
&ixdp425_i2c_gpio, &ixdp425_i2c_gpio,
&ixdp425_flash, &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) defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
&ixdp425_flash_nand, &ixdp425_flash_nand,
#endif #endif
@ -4107,6 +4034,3 @@ index e89070d..44584af 100644
}; };
static void __init ixdp425_init(void) static void __init ixdp425_init(void)
--
1.5.2.5

9
target/linux/ixp4xx/patches-2.6.24/201-npe_driver_print_license_location.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -585,6 +585,8 @@ +++ 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); npe_reset(npe);
#endif #endif

12
target/linux/ixp4xx/patches-2.6.24/202-npe_driver_switch_support.patch
View File

@ -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.7.orig/drivers/net/arm/ixp4xx_eth.c
+++ linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c +++ linux-2.6.24.7/drivers/net/arm/ixp4xx_eth.c
@@ -165,14 +165,15 @@ struct port { @@ -165,14 +165,15 @@ struct port {
struct net_device *netdev; struct net_device *netdev;
struct napi_struct napi; 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); INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread);
return 0; 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.7.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/include/asm-arm/arch-ixp4xx/platform.h
@@ -106,12 +106,15 @@ struct sys_timer; @@ -106,12 +106,15 @@ struct sys_timer;
#define IXP4XX_ETH_NPEB 0x10 #define IXP4XX_ETH_NPEB 0x10
#define IXP4XX_ETH_NPEC 0x20 #define IXP4XX_ETH_NPEC 0x20

6
target/linux/ixp4xx/patches-2.6.24/203-npe_driver_phy_reset_autoneg.patch
View File

@ -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.7.orig/drivers/net/arm/ixp4xx_eth.c
+++ linux-2.6.24.2/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 @@ -322,8 +322,12 @@ static void phy_reset(struct net_device
struct port *port = netdev_priv(dev); struct port *port = netdev_priv(dev);
int phy_id = port->mii[idx].phy_id; int phy_id = port->mii[idx].phy_id;

36
target/linux/ixp4xx/patches-2.6.24/204-npe_driver_ixp43x_support.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -571,8 +571,8 @@ +++ 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++) for (i = 0; i < image->size; i++)
image->data[i] = swab32(image->data[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"); "IXP42x\n");
goto err; 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, "revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
(image->id >> 8) & 0xFF, image->id & 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) if (!npe->id)
instr_size = NPE_A_42X_INSTR_SIZE; instr_size = NPE_A_42X_INSTR_SIZE;
else 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 Index: linux-2.6.24.7/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 --- 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 @@ @@ -32,6 +32,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mii.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/npe.h>
#include <asm/arch/qmgr.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) 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); __raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control);
return platform_driver_register(&drv); 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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/cpu.h
@@ -34,6 +34,8 @@ +++ 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; val &= ~IXP4XX_FEATURE_RESERVED;
if (!cpu_is_ixp46x()) if (!cpu_is_ixp46x())
val &= ~IXP4XX_FEATURE_IXP46X_ONLY; 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; 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 Index: linux-2.6.24.7/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 --- 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 @@ @@ -628,11 +628,12 @@
#define IXP4XX_FEATURE_XSCALE_MAX_FREQ (3 << 22) #define IXP4XX_FEATURE_XSCALE_MAX_FREQ (3 << 22)
#define IXP4XX_FEATURE_RESERVED (0xFF << 24) #define IXP4XX_FEATURE_RESERVED (0xFF << 24)

6
target/linux/ixp4xx/patches-2.6.24/250-compex_switch_support.patch
View File

@ -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.7.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/arch/arm/mach-ixp4xx/compex-setup.c
@@ -93,7 +93,8 @@ static struct platform_device compex_uar @@ -93,7 +93,8 @@ static struct platform_device compex_uar
/* Built-in 10/100 Ethernet MAC interfaces */ /* Built-in 10/100 Ethernet MAC interfaces */
static struct eth_plat_info compex_plat_eth[] = { static struct eth_plat_info compex_plat_eth[] = {

33
target/linux/ixp4xx/patches-2.6.24/294-eeprom_new_notifier.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- 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 @@ @@ -33,6 +33,8 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/i2c.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_attach_adapter(struct i2c_adapter *adapter);
static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind); 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; data->valid = 0;
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
data->nature = UNKNOWN; 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 */ /* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client))) 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) if (err)
goto exit_detach; 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; return 0;
exit_detach: 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; 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) static int __init eeprom_init(void)
{ {
return i2c_add_driver(&eeprom_driver); 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 Index: linux-2.6.24.7/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 --- /dev/null
+++ linux-2.6.24.7/include/linux/eeprom.h
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+#ifndef _LINUX_EEPROM_H +#ifndef _LINUX_EEPROM_H
+#define _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); +extern int unregister_eeprom_notifier(struct notifier_block *nb);
+ +
+#endif /* _LINUX_EEPROM_H */ +#endif /* _LINUX_EEPROM_H */
diff -uprN linux-2.6.23.orig/include/linux/notifier.h linux-2.6.23/include/linux/notifier.h Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/include/linux/notifier.h
@@ -231,5 +231,8 @@ static inline int notifier_to_errno(int +++ linux-2.6.24.7/include/linux/notifier.h
#define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */ @@ -248,5 +248,8 @@ extern struct blocking_notifier_head reb
#define PM_POST_SUSPEND 0x0004 /* Suspend finished */ #define VT_WRITE 0x0003 /* A char got output */
#define VT_UPDATE 0x0004 /* A bigger update occurred */
+/* eeprom notifier chain */ +/* eeprom notifier chain */
+#define EEPROM_REGISTER 0x0001 +#define EEPROM_REGISTER 0x0001

6
target/linux/ixp4xx/patches-2.6.24/296-avila_mac_plat_info.patch
View File

@ -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.7.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/arch/arm/mach-ixp4xx/avila-setup.c
@@ -132,6 +132,31 @@ static struct platform_device avila_pata @@ -132,6 +132,31 @@ static struct platform_device avila_pata
.resource = avila_pata_resources, .resource = avila_pata_resources,
}; };

14
target/linux/ixp4xx/patches-2.6.24/300-avila_fetch_mac.patch
View File

@ -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.7.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/arch/arm/mach-ixp4xx/avila-setup.c
@@ -14,10 +14,18 @@ @@ -14,10 +14,18 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.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 = { static struct flash_platform_data avila_flash_data = {
.map_name = "cfi_probe", .map_name = "cfi_probe",
.width = 2, .width = 2,
@@ -192,10 +207,160 @@ static void __init avila_fixup(struct ma @@ -163,10 +178,160 @@ static struct platform_device *avila_dev
t->hdr.size = 0; &avila_uart
} };
+static void __init avila_gw23xx_setup(void) +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.start = IXP4XX_EXP_BUS_BASE(0);
avila_flash_resource.end = avila_flash_resource.end =
IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; 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); platform_device_register(&avila_pata);

22
target/linux/ixp4xx/patches-2.6.24/301-avila_led.patch
View File

@ -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.7.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/include/asm-arm/arch-ixp4xx/avila.h
@@ -36,4 +36,6 @@ @@ -36,4 +36,6 @@
#define AVILA_PCI_INTC_PIN 9 #define AVILA_PCI_INTC_PIN 9
#define AVILA_PCI_INTD_PIN 8 #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 */ +/* User LEDs */
+#define AVILA_GW23XX_LED_USER_GPIO 3 +#define AVILA_GW23XX_LED_USER_GPIO 3
+#define AVILA_GW23X7_LED_USER_GPIO 4 +#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.7.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/arch/arm/mach-ixp4xx/avila-setup.c
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
# include <linux/eeprom.h> # include <linux/eeprom.h>
#endif #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 = { static struct platform_device *avila_devices[] __initdata = {
&avila_i2c_gpio, &avila_i2c_gpio,
&avila_flash, &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_npeb_device);
platform_device_register(&avila_npec_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 #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_npeb_device);
platform_device_register(&avila_npec_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) 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 */ avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */
platform_device_register(&avila_npec_device); 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) 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_npec_device);
+ +
+ platform_device_register(&avila_leds_device); + platform_device_register(&avila_leds_device);

14
target/linux/ixp4xx/patches-2.6.24/302-avila_gpio_device.patch
View File

@ -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.7.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/arch/arm/mach-ixp4xx/avila-setup.c
@@ -192,10 +192,28 @@ static struct platform_device avila_leds @@ -192,10 +192,28 @@ static struct platform_device avila_leds
.dev.platform_data = &avila_leds_data, .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, + &avila_gpio,
}; };
static char avila_rtc_probe[] __initdata = "rtc-ds1672.probe=0,0x68 "; static void __init avila_gw23xx_setup(void)
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.7.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/include/asm-arm/arch-ixp4xx/avila.h
@@ -39,3 +39,6 @@ @@ -39,3 +39,6 @@
/* User LEDs */ /* User LEDs */
#define AVILA_GW23XX_LED_USER_GPIO 3 #define AVILA_GW23XX_LED_USER_GPIO 3

24
target/linux/ixp4xx/patches-2.6.24/303-avila_gw23x7_phy_quirk.patch
View File

@ -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.7.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/arch/arm/mach-ixp4xx/avila-setup.c
@@ -276,6 +276,7 @@ static void __init avila_gw2345_setup(vo @@ -247,6 +247,7 @@ static void __init avila_gw2345_setup(vo
static void __init avila_gw2347_setup(void) 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); platform_device_register(&avila_npeb_device);
avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO; 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) 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); platform_device_register(&avila_npeb_device);
avila_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO; 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.7.orig/drivers/net/arm/ixp4xx_eth.c
+++ linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c +++ linux-2.6.24.7/drivers/net/arm/ixp4xx_eth.c
@@ -347,6 +347,14 @@ static void phy_reset(struct net_device @@ -348,6 +348,14 @@ static void phy_reset(struct net_device
return; return;
} }
@ -37,10 +37,10 @@ Index: linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c
/* restart auto negotiation */ /* restart auto negotiation */
bmcr = mdio_read(dev, phy_id, MII_BMCR); bmcr = mdio_read(dev, phy_id, MII_BMCR);
bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART); 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.7.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/include/asm-arm/arch-ixp4xx/platform.h
@@ -115,6 +115,8 @@ struct eth_plat_info { @@ -115,6 +115,8 @@ struct eth_plat_info {
u8 txreadyq; u8 txreadyq;
u8 hwaddr[6]; u8 hwaddr[6];

16
target/linux/ixp4xx/patches-2.6.24/400-dmabounce.patch
View File

@ -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.24.7.orig/arch/arm/common/dmabounce.c
+++ linux-2.6.23.14/arch/arm/common/dmabounce.c 2008-01-24 22:17:36.415822168 +0100 +++ linux-2.6.24.7/arch/arm/common/dmabounce.c
@@ -116,6 +116,10 @@ @@ -117,6 +117,10 @@ alloc_safe_buffer(struct dmabounce_devic
} else if (size <= device_info->large.size) { } else if (size <= device_info->large.size) {
pool = &device_info->large; pool = &device_info->large;
} else { } else {
@ -13,11 +13,11 @@ Index: linux-2.6.23.14/arch/arm/common/dmabounce.c
pool = NULL; 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.24.7.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.23.14/arch/arm/mach-ixp4xx/Kconfig 2008-01-24 22:11:42.891675973 +0100 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig
@@ -220,6 +220,11 @@ @@ -236,6 +236,11 @@ config DMABOUNCE
default y default y
depends on PCI depends on PCI

6
target/linux/ixp4xx/patches-2.6.24/401-avila_pci_dev.patch
View File

@ -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.24.7.orig/include/asm-arm/arch-ixp4xx/avila.h
+++ 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/include/asm-arm/arch-ixp4xx/avila.h
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
/* /*
* AVILA PCI IRQs * AVILA PCI IRQs

43
target/linux/ixp4xx/patches-2.6.24/402-ixp4xx_ehci_backport.patch
View File

@ -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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/drivers/usb/host/ehci.h
@@ -730,6 +730,11 @@ +++ 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) #define writel_be(val, addr) out_be32((__force unsigned *)addr, val)
#endif #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, static inline unsigned int ehci_readl(const struct ehci_hcd *ehci,
__u32 __iomem * regs) __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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/drivers/usb/host/ehci-hcd.c
@@ -964,6 +964,11 @@ +++ 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 #define PLATFORM_DRIVER ehci_ppc_soc_driver
#endif #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) && \ #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
!defined(PS3_SYSTEM_BUS_DRIVER) !defined(PS3_SYSTEM_BUS_DRIVER)
#error "missing bus glue for ehci-hcd" #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 Index: linux-2.6.24.7/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 --- /dev/null
+++ linux-2.6.24.7/drivers/usb/host/ehci-ixp4xx.c
@@ -0,0 +1,152 @@ @@ -0,0 +1,152 @@
+/* +/*
+ * IXP4XX EHCI Host Controller Driver + * 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 +// .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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/drivers/usb/host/Kconfig
@@ -69,12 +69,12 @@ +++ linux-2.6.24.7/drivers/usb/host/Kconfig
@@ -69,12 +69,12 @@ config USB_EHCI_TT_NEWSCHED
config USB_EHCI_BIG_ENDIAN_MMIO config USB_EHCI_BIG_ENDIAN_MMIO
bool 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 default y
config USB_EHCI_FSL config USB_EHCI_FSL
diff -Nur linux-2.6.24.2/drivers/usb/Kconfig linux-2.6.24.2-owrt/drivers/usb/Kconfig Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/drivers/usb/Kconfig
@@ -49,6 +49,7 @@ +++ linux-2.6.24.7/drivers/usb/Kconfig
@@ -49,6 +49,7 @@ config USB_ARCH_HAS_EHCI
boolean boolean
default y if PPC_83xx default y if PPC_83xx
default y if SOC_AU1200 default y if SOC_AU1200

6
target/linux/ixp4xx/patches-2.6.24/900-include_bitops_h_from_arch_io_h.patch
View File

@ -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.7.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/include/asm-arm/arch-ixp4xx/io.h
@@ -13,6 +13,8 @@ @@ -13,6 +13,8 @@
#ifndef __ASM_ARM_ARCH_IO_H #ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H

6
target/linux/ixp4xx/patches-2.6.25/010-rtc_isl1208_new_style.patch
View File

@ -2,10 +2,10 @@
drivers/rtc/rtc-isl1208.c | 357 +++++++++++++++++++++------------------------- drivers/rtc/rtc-isl1208.c | 357 +++++++++++++++++++++-------------------------
1 file changed, 170 insertions(+), 187 deletions(-) 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.4.orig/drivers/rtc/rtc-isl1208.c
+++ linux-2.6.25.1/drivers/rtc/rtc-isl1208.c +++ linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
@@ -15,16 +15,15 @@ @@ -15,16 +15,15 @@
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/rtc.h> #include <linux/rtc.h>

6
target/linux/ixp4xx/patches-2.6.25/011-rtc_pcf8563_new_style.patch
View File

@ -2,10 +2,10 @@
drivers/rtc/rtc-pcf8563.c | 109 +++++++++++++--------------------------------- drivers/rtc/rtc-pcf8563.c | 109 +++++++++++++---------------------------------
1 file changed, 32 insertions(+), 77 deletions(-) 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.4.orig/drivers/rtc/rtc-pcf8563.c
+++ linux-2.6.25.1/drivers/rtc/rtc-pcf8563.c +++ linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c
@@ -18,17 +18,7 @@ @@ -18,17 +18,7 @@
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/rtc.h> #include <linux/rtc.h>

6
target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch
View File

@ -2,10 +2,10 @@
drivers/rtc/rtc-x1205.c | 128 ++++++++++++++++-------------------------------- drivers/rtc/rtc-x1205.c | 128 ++++++++++++++++--------------------------------
1 file changed, 43 insertions(+), 85 deletions(-) 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.4.orig/drivers/rtc/rtc-x1205.c
+++ linux-2.6.25.1/drivers/rtc/rtc-x1205.c +++ linux-2.6.25.4/drivers/rtc/rtc-x1205.c
@@ -22,20 +22,7 @@ @@ -22,20 +22,7 @@
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/delay.h> #include <linux/delay.h>

42
target/linux/ixp4xx/patches-2.6.25/030-ixp4xx_fsg_board_support.patch
View File

@ -45,10 +45,10 @@ now calls machine_restart() directly.
create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c
create mode 100644 include/asm-arm/arch-ixp4xx/fsg.h 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.4.orig/arch/arm/configs/ixp4xx_defconfig
+++ linux-2.6.25.1/arch/arm/configs/ixp4xx_defconfig +++ linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
@@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y @@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y
CONFIG_MACH_NAS100D=y CONFIG_MACH_NAS100D=y
CONFIG_MACH_DSMG600=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_X1205=y
CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_PCF8563=y
# CONFIG_RTC_DRV_PCF8583 is not set # 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.4.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -125,6 +125,15 @@ config ARCH_IXDP4XX @@ -125,6 +125,15 @@ config ARCH_IXDP4XX
depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435 depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
default y 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 # 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.4.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/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 @@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas10
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-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_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.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 --- /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 @@ @@ -0,0 +1,71 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/fsg-pci.c + * 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); +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 --- /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 @@ @@ -0,0 +1,276 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/fsg-setup.c + * 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, + .init_machine = fsg_init,
+MACHINE_END +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 --- /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 @@ @@ -0,0 +1,50 @@
+/* +/*
+ * include/asm-arm/arch-ixp4xx/fsg.h + * 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_USB_BIT 4
+#define FSG_LED_RING_BIT 5 +#define FSG_LED_RING_BIT 5
+#define FSG_LED_SYNC_BIT 7 +#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.4.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/include/asm-arm/arch-ixp4xx/hardware.h
@@ -45,5 +45,6 @@ @@ -45,5 +45,6 @@
#include "nslu2.h" #include "nslu2.h"
#include "nas100d.h" #include "nas100d.h"
@ -557,10 +557,10 @@ Index: linux-2.6.25.1/include/asm-arm/arch-ixp4xx/hardware.h
+#include "fsg.h" +#include "fsg.h"
#endif /* _ASM_ARCH_HARDWARE_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.4.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/include/asm-arm/arch-ixp4xx/irqs.h
@@ -128,4 +128,11 @@ @@ -128,4 +128,11 @@
#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7 #define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6 #define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6

16
target/linux/ixp4xx/patches-2.6.25/031-ixp4xx_fsg_led_driver.patch
View File

@ -18,10 +18,10 @@ KernelVersion: v2.6.25-rc6-117-g457fb60
3 files changed, 268 insertions(+), 0 deletions(-) 3 files changed, 268 insertions(+), 0 deletions(-)
create mode 100644 drivers/leds/leds-fsg.c 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.4.orig/drivers/leds/Kconfig
+++ linux-2.6.25.1/drivers/leds/Kconfig +++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -46,6 +46,12 @@ config LEDS_SPITZ @@ -46,6 +46,12 @@ config LEDS_SPITZ
This option enables support for the LEDs on Sharp Zaurus This option enables support for the LEDs on Sharp Zaurus
SL-Cxx00 series (C1000, C3000, C3100). SL-Cxx00 series (C1000, C3000, C3100).
@ -35,10 +35,10 @@ Index: linux-2.6.25.1/drivers/leds/Kconfig
config LEDS_TOSA config LEDS_TOSA
tristate "LED Support for the Sharp SL-6000 series" tristate "LED Support for the Sharp SL-6000 series"
depends on LEDS_CLASS && PXA_SHARPSL 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.4.orig/drivers/leds/Makefile
+++ linux-2.6.25.1/drivers/leds/Makefile +++ linux-2.6.25.4/drivers/leds/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o @@ -22,6 +22,7 @@ obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o
obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.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 # LED Triggers
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o 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 --- /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 @@ @@ -0,0 +1,261 @@
+/* +/*
+ * LED Driver for the Freecom FSG-3 + * LED Driver for the Freecom FSG-3

6
target/linux/ixp4xx/patches-2.6.25/090-increase_entropy_pools.patch
View File

@ -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.4.orig/drivers/char/random.c
+++ linux-2.6.25.1/drivers/char/random.c +++ linux-2.6.25.4/drivers/char/random.c
@@ -248,9 +248,9 @@ @@ -248,9 +248,9 @@
/* /*
* Configuration information * Configuration information

6
target/linux/ixp4xx/patches-2.6.25/100-gateway7001_mac_plat_info.patch
View File

@ -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.4.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/arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -76,9 +76,36 @@ static struct platform_device gateway700 @@ -76,9 +76,36 @@ static struct platform_device gateway700
.resource = &gateway7001_uart_resource, .resource = &gateway7001_uart_resource,
}; };

6
target/linux/ixp4xx/patches-2.6.25/101-wg302_mac_plat_info.patch
View File

@ -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.4.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/arch/arm/mach-ixp4xx/wg302v2-setup.c
@@ -77,9 +77,27 @@ static struct platform_device wg302v2_ua @@ -77,9 +77,27 @@ static struct platform_device wg302v2_ua
.resource = &wg302v2_uart_resource, .resource = &wg302v2_uart_resource,
}; };

32
target/linux/ixp4xx/patches-2.6.25/110-pronghorn_metro_support.patch
View File

@ -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.4.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -57,6 +57,14 @@ config MACH_WG302V2 @@ -57,6 +57,14 @@ config MACH_WG302V2
WG302 v2 or WAG302 v2 Access Points. For more information WG302 v2 or WAG302 v2 Access Points. For more information
on this platform, see http://openwrt.org 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 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help 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.4.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/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 @@ -16,6 +16,7 @@ obj-pci-$(CONFIG_MACH_DSMG600) += dsmg6
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-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_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.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 --- /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 @@ @@ -0,0 +1,74 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c + * 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); +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 --- /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 @@ @@ -0,0 +1,147 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/pronghornmetro-setup.c + * 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, + .init_machine = pronghornmetro_init,
+MACHINE_END +MACHINE_END
+#endif +#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.4.orig/Documentation/arm/IXP4xx
+++ linux-2.6.25.1/Documentation/arm/IXP4xx +++ linux-2.6.25.4/Documentation/arm/IXP4xx
@@ -111,6 +111,9 @@ http://www.adiengineering.com/productsCo @@ -111,6 +111,9 @@ http://www.adiengineering.com/productsCo
the platform has two mini-PCI slots used for 802.11[bga] cards. the platform has two mini-PCI slots used for 802.11[bga] cards.
Finally, there is an IDE port hanging off the expansion bus. 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 Gateworks Avila Network Platform
http://www.gateworks.com/avila_sbc.htm 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.4.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/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_set @@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_set
* Some boards are using UART2 as console * Some boards are using UART2 as console
*/ */

6
target/linux/ixp4xx/patches-2.6.25/111-pronghorn_metro_mac_plat_info.patch
View File

@ -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.4.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/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -104,9 +104,36 @@ static struct platform_device pronghornm @@ -104,9 +104,36 @@ static struct platform_device pronghornm
.resource = pronghornmetro_pata_resources, .resource = pronghornmetro_pata_resources,
}; };

28
target/linux/ixp4xx/patches-2.6.25/120-compex_support.patch
View File

@ -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.4.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO @@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>. 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 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help 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.4.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/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 @@ -17,6 +17,7 @@ obj-pci-$(CONFIG_MACH_GATEWAY7001) += ga
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-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_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.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 --- /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 @@ @@ -0,0 +1,120 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/compex-setup.c + * 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, + .init_machine = compex_init,
+MACHINE_END +MACHINE_END
+#endif +#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.4.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/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = { @@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = {
int __init ixdp425_pci_init(void) 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); pci_common_init(&ixdp425_pci);
return 0; 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.4.orig/arch/arm/tools/mach-types
+++ linux-2.6.25.1/arch/arm/tools/mach-types +++ linux-2.6.25.4/arch/arm/tools/mach-types
@@ -1276,7 +1276,7 @@ oiab MACH_OIAB OIAB 1269 @@ -1276,7 +1276,7 @@ oiab MACH_OIAB OIAB 1269
smdk6400 MACH_SMDK6400 SMDK6400 1270 smdk6400 MACH_SMDK6400 SMDK6400 1270
nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271 nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271

6
target/linux/ixp4xx/patches-2.6.25/121-compex_mac_plat_info.patch
View File

@ -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.4.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/arch/arm/mach-ixp4xx/compex-setup.c
@@ -90,9 +90,36 @@ static struct platform_device compex_uar @@ -90,9 +90,36 @@ static struct platform_device compex_uar
.resource = compex_uart_resources, .resource = compex_uart_resources,
}; };

26
target/linux/ixp4xx/patches-2.6.25/130-wrt300nv2_support.patch
View File

@ -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.4.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -73,6 +73,14 @@ config MACH_COMPEX @@ -73,6 +73,14 @@ config MACH_COMPEX
WP18 or NP18A boards. For more information on this WP18 or NP18A boards. For more information on this
platform, see http://openwrt.org platform, see http://openwrt.org
@ -17,10 +17,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help 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.4.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/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 @@ -18,6 +18,7 @@ obj-pci-$(CONFIG_MACH_WG302V2) += wg302
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-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_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.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 --- /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 @@ @@ -0,0 +1,65 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/wrt300nv2-pci.c + * 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); +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 --- /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 @@ @@ -0,0 +1,108 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c + * 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, + .init_machine = wrt300nv2_init,
+MACHINE_END +MACHINE_END
+#endif +#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.4.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/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -42,7 +42,7 @@ static __inline__ void __arch_decomp_set @@ -42,7 +42,7 @@ static __inline__ void __arch_decomp_set
*/ */
if (machine_is_adi_coyote() || machine_is_gtwx5715() || if (machine_is_adi_coyote() || machine_is_gtwx5715() ||

6
target/linux/ixp4xx/patches-2.6.25/131-wrt300nv2_mac_plat_info.patch
View File

@ -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.4.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/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -76,9 +76,36 @@ static struct platform_device wrt300nv2_ @@ -76,9 +76,36 @@ static struct platform_device wrt300nv2_
.resource = &wrt300nv2_uart_resource, .resource = &wrt300nv2_uart_resource,
}; };

20
target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
View File

@ -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.4.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO @@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>. 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 default y
config CPU_IXP43X 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.4.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/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 @@ -19,6 +19,7 @@ obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-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_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.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 --- /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 @@ @@ -0,0 +1,71 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c + * 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); +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 --- /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 @@ @@ -0,0 +1,115 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/sidewinder-setup.c + * arch/arm/mach-ixp4xx/sidewinder-setup.c

22
target/linux/ixp4xx/patches-2.6.25/150-lanready_ap1000_support.patch
View File

@ -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 --- /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 @@ @@ -0,0 +1,151 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/ap1000-setup.c + * 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, + .init_machine = ap1000_init,
+MACHINE_END +MACHINE_END
+#endif +#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.4.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/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,8 @@ struct hw_pci ixdp425_pci __initdata = { @@ -66,7 +66,8 @@ struct hw_pci ixdp425_pci __initdata = {
int __init ixdp425_pci_init(void) 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); pci_common_init(&ixdp425_pci);
return 0; 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.4.orig/arch/arm/mach-ixp4xx/Kconfig
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig +++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -89,6 +89,14 @@ config MACH_WRT300NV2 @@ -89,6 +89,14 @@ config MACH_WRT300NV2
WRT300N v2 router. For more information on this WRT300N v2 router. For more information on this
platform, see http://openwrt.org platform, see http://openwrt.org
@ -187,10 +187,10 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help 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.4.orig/arch/arm/mach-ixp4xx/Makefile
+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/Makefile +++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += @@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) +=
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o

6
target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
View File

@ -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.4.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/arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -90,9 +90,37 @@ static struct platform_device ap1000_uar @@ -90,9 +90,37 @@ static struct platform_device ap1000_uar
.resource = ap1000_uart_resources .resource = ap1000_uart_resources
}; };

Some files were not shown because too many files have changed in this diff Show More