aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ixp4xx/patches')
-rw-r--r--target/linux/ixp4xx/patches/050-dsmg600_upstream_support.patch48
-rw-r--r--target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch36
-rw-r--r--target/linux/ixp4xx/patches/080-trivial_nslu2_nas100d_cleanup.patch30
-rw-r--r--target/linux/ixp4xx/patches/100-npe_driver.patch155
-rw-r--r--target/linux/ixp4xx/patches/110-ixp4xx_net_driver_fix_mac_handling.patch8
-rw-r--r--target/linux/ixp4xx/patches/139-ixp4xx_net_driver_mtd_load_fw.patch54
-rw-r--r--target/linux/ixp4xx/patches/140-ixp4xx_net_driver_no_phy.patch17
-rw-r--r--target/linux/ixp4xx/patches/141-nslu2_setup_mac.patch10
-rw-r--r--target/linux/ixp4xx/patches/142-nas100d_setup_mac.patch6
-rw-r--r--target/linux/ixp4xx/patches/143-nslu2_mtd_microcode.patch10
-rw-r--r--target/linux/ixp4xx/patches/144-nas100d_mtd_microcode.patch8
-rw-r--r--target/linux/ixp4xx/patches/152-nas100d_mtd_load_mac.patch10
-rw-r--r--target/linux/ixp4xx/patches/153-nslu2_mtd_load_mac.patch10
-rw-r--r--target/linux/ixp4xx/patches/160-nas100d_artop_temp_fix.patch6
-rw-r--r--target/linux/ixp4xx/patches/178-via_velocity_bigendian.patch120
-rw-r--r--target/linux/ixp4xx/patches/185-nslu2_rtc_fixup.patch10
-rw-r--r--target/linux/ixp4xx/patches/186-nas100d_rtc_fixup.patch8
-rw-r--r--target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch10
-rw-r--r--target/linux/ixp4xx/patches/200-gateway_7001.patch52
-rw-r--r--target/linux/ixp4xx/patches/210-gateway_7001_setup_mac.patch9
-rw-r--r--target/linux/ixp4xx/patches/212-gateway_7001_mtd_microcode.patch10
-rw-r--r--target/linux/ixp4xx/patches/300-wg302v2.patch47
-rw-r--r--target/linux/ixp4xx/patches/310-wg302v2_setup_mac.patch9
-rw-r--r--target/linux/ixp4xx/patches/400-pronghorn_metro.patch56
-rw-r--r--target/linux/ixp4xx/patches/410-pronghorn_metro_setup_mac.patch9
-rw-r--r--target/linux/ixp4xx/patches/420-pronghorn_metro_mtd_microcode.patch11
-rw-r--r--target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch11
-rw-r--r--target/linux/ixp4xx/patches/500-compex.patch45
-rw-r--r--target/linux/ixp4xx/patches/510-compex_setup_mac.patch9
-rw-r--r--target/linux/ixp4xx/patches/520-compex_mtd_microcode.patch13
-rw-r--r--target/linux/ixp4xx/patches/600-wrt300nv2.patch43
-rw-r--r--target/linux/ixp4xx/patches/610-wrt300nv2_setup_mac.patch9
-rw-r--r--target/linux/ixp4xx/patches/720-avila_setup_mac.patch10
-rw-r--r--target/linux/ixp4xx/patches/740-avila_loft_mac_platform.patch10
-rw-r--r--target/linux/ixp4xx/patches/750-avila_mtd_microcode.patch9
-rw-r--r--target/linux/ixp4xx/patches/800-eeprom_new_notifier.patch28
-rw-r--r--target/linux/ixp4xx/patches/900-no_loader_workaround.patch11
-rw-r--r--target/linux/ixp4xx/patches/996-fsg3_support.patch42
-rw-r--r--target/linux/ixp4xx/patches/997-fsg3_buttons.patch12
-rw-r--r--target/linux/ixp4xx/patches/998-VT6421.patch12
40 files changed, 533 insertions, 490 deletions
diff --git a/target/linux/ixp4xx/patches/050-dsmg600_upstream_support.patch b/target/linux/ixp4xx/patches/050-dsmg600_upstream_support.patch
index b214ef2b5f..5f27aa7999 100644
--- a/target/linux/ixp4xx/patches/050-dsmg600_upstream_support.patch
+++ b/target/linux/ixp4xx/patches/050-dsmg600_upstream_support.patch
@@ -24,11 +24,11 @@ Signed-off-by: Michael Westerhof <mwester@dls.net>
include/asm-arm/arch-ixp4xx/irqs.h | 10 +
8 files changed, 458 insertions(+)
-Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/Kconfig
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
===================================================================
---- linux-2.6.21.1-armeb.orig/arch/arm/mach-ixp4xx/Kconfig
-+++ linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/Kconfig
-@@ -89,6 +89,15 @@
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+@@ -89,6 +89,15 @@ config MACH_NAS100D
NAS 100d device. For more information on this platform,
see http://www.nslu2-linux.org/wiki/NAS100d/HomePage
@@ -44,11 +44,11 @@ Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/Kconfig
#
# Avila and IXDP share the same source for now. Will change in future
#
-Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
===================================================================
---- linux-2.6.21.1-armeb.orig/arch/arm/mach-ixp4xx/Makefile
-+++ linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/Makefile
-@@ -12,6 +12,7 @@
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+@@ -12,6 +12,7 @@ obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coy
obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o
obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-pci.o
obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
@@ -56,17 +56,17 @@ Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/Makefile
obj-y += common.o
-@@ -22,5 +23,6 @@
+@@ -22,5 +23,6 @@ obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-
obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o
obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o
obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o
+obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
-Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-pci.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-pci.c
===================================================================
--- /dev/null
-+++ linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-pci.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-pci.c
@@ -0,0 +1,74 @@
+/*
+ * DSM-G600 board-level PCI initialization
@@ -142,10 +142,10 @@ Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-pci.c
+}
+
+subsys_initcall(dsmg600_pci_init);
-Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-power.c
===================================================================
--- /dev/null
-+++ linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-power.c
@@ -0,0 +1,130 @@
+/*
+ * arch/arm/mach-ixp4xx/dsmg600-power.c
@@ -277,10 +277,10 @@ Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-power.c
+MODULE_AUTHOR("Michael Westerhof <mwester@dls.net>");
+MODULE_DESCRIPTION("DSM-G600 Power/Reset driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
===================================================================
--- /dev/null
-+++ linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -0,0 +1,175 @@
+/*
+ * DSM-G600 board-setup
@@ -457,10 +457,10 @@ Index: linux-2.6.21.1-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c
+ .timer = &ixp4xx_timer,
+ .init_machine = dsmg600_init,
+MACHINE_END
-Index: linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/dsmg600.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/dsmg600.h
===================================================================
--- /dev/null
-+++ linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/dsmg600.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/dsmg600.h
@@ -0,0 +1,57 @@
+/*
+ * DSM-G600 platform specific definitions
@@ -519,21 +519,21 @@ Index: linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/dsmg600.h
+
+#define DSMG600_LED_WLAN_GPIO 14
+#define DSMG600_LED_WLAN_BM (1L << DSMG600_LED_WLAN_GPIO)
-Index: linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/hardware.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/hardware.h
===================================================================
---- linux-2.6.21.1-armeb.orig/include/asm-arm/arch-ixp4xx/hardware.h
-+++ linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/hardware.h
-@@ -47,5 +47,6 @@
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/hardware.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/hardware.h
+@@ -47,5 +47,6 @@ extern unsigned int processor_id;
#include "prpmc1100.h"
#include "nslu2.h"
#include "nas100d.h"
+#include "dsmg600.h"
#endif /* _ASM_ARCH_HARDWARE_H */
-Index: linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/irqs.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/irqs.h
===================================================================
---- linux-2.6.21.1-armeb.orig/include/asm-arm/arch-ixp4xx/irqs.h
-+++ linux-2.6.21.1-armeb/include/asm-arm/arch-ixp4xx/irqs.h
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/irqs.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/irqs.h
@@ -118,4 +118,14 @@
#define IRQ_NAS100D_PCI_INTD IRQ_IXP4XX_GPIO8
#define IRQ_NAS100D_PCI_INTE IRQ_IXP4XX_GPIO7
diff --git a/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch b/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch
index 5b406a7bc7..297571283d 100644
--- a/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch
+++ b/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch
@@ -5,10 +5,10 @@ that a 'fixup' routine is avoided.
Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk>
-Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c
===================================================================
---- linux-2.6.21-arm.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-05-07 12:05:40.000000000 -0700
-+++ linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-05-07 12:15:56.000000000 -0700
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -22,6 +22,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -17,7 +17,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c
static struct flash_platform_data nslu2_flash_data = {
.map_name = "cfi_probe",
-@@ -157,10 +158,21 @@
+@@ -157,10 +158,21 @@ static void nslu2_power_off(void)
gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH);
}
@@ -41,7 +41,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c
ixp4xx_sys_init();
nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
-@@ -185,6 +197,6 @@
+@@ -185,6 +197,6 @@ MACHINE_START(NSLU2, "Linksys NSLU2")
.boot_params = 0x00000100,
.map_io = ixp4xx_map_io,
.init_irq = ixp4xx_init_irq,
@@ -49,11 +49,11 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/nslu2-setup.c
+ .timer = &nslu2_timer,
.init_machine = nslu2_init,
MACHINE_END
-Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/common.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/common.c
===================================================================
---- linux-2.6.21-arm.orig/arch/arm/mach-ixp4xx/common.c 2007-05-07 12:05:40.000000000 -0700
-+++ linux-2.6.21-arm/arch/arm/mach-ixp4xx/common.c 2007-05-07 12:15:16.000000000 -0700
-@@ -269,7 +269,7 @@
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/common.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/common.c
+@@ -269,7 +269,7 @@ static struct irqaction ixp4xx_timer_irq
.handler = ixp4xx_timer_interrupt,
};
@@ -62,11 +62,11 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/common.c
{
/* Clear Pending Interrupt by writing '1' to it */
*IXP4XX_OSST = IXP4XX_OSST_TIMER_1_PEND;
-Index: linux-2.6.21-arm/include/asm-arm/arch-ixp4xx/platform.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h
===================================================================
---- linux-2.6.21-arm.orig/include/asm-arm/arch-ixp4xx/platform.h 2007-05-07 12:05:40.000000000 -0700
-+++ linux-2.6.21-arm/include/asm-arm/arch-ixp4xx/platform.h 2007-05-07 12:15:16.000000000 -0700
-@@ -113,6 +113,7 @@
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/platform.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h
+@@ -113,6 +113,7 @@ extern unsigned long ixp4xx_timer_freq;
extern void ixp4xx_map_io(void);
extern void ixp4xx_init_irq(void);
extern void ixp4xx_sys_init(void);
@@ -74,10 +74,10 @@ Index: linux-2.6.21-arm/include/asm-arm/arch-ixp4xx/platform.h
extern struct sys_timer ixp4xx_timer;
extern void ixp4xx_pci_preinit(void);
struct pci_sys_data;
-Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
===================================================================
---- linux-2.6.21-arm.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c 2007-05-07 12:05:42.000000000 -0700
-+++ linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c 2007-05-07 12:16:07.000000000 -0700
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -18,6 +18,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -86,7 +86,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c
static struct flash_platform_data dsmg600_flash_data = {
.map_name = "cfi_probe",
-@@ -128,6 +129,19 @@
+@@ -128,6 +129,19 @@ static void dsmg600_power_off(void)
gpio_line_set(DSMG600_PO_GPIO, IXP4XX_GPIO_HIGH);
}
@@ -106,7 +106,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c
static void __init dsmg600_init(void)
{
ixp4xx_sys_init();
-@@ -155,21 +169,13 @@
+@@ -155,21 +169,13 @@ static void __init dsmg600_init(void)
#endif
}
diff --git a/target/linux/ixp4xx/patches/080-trivial_nslu2_nas100d_cleanup.patch b/target/linux/ixp4xx/patches/080-trivial_nslu2_nas100d_cleanup.patch
index f0bfcdec5f..13ae639826 100644
--- a/target/linux/ixp4xx/patches/080-trivial_nslu2_nas100d_cleanup.patch
+++ b/target/linux/ixp4xx/patches/080-trivial_nslu2_nas100d_cleanup.patch
@@ -5,11 +5,11 @@ are included.
Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk>
-Index: linux-2.6.21-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c
===================================================================
---- linux-2.6.21-armeb.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-05-09 07:32:43.000000000 -0700
-+++ linux-2.6.21-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-05-09 07:32:46.000000000 -0700
-@@ -50,26 +50,26 @@
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c
+@@ -50,26 +50,26 @@ static struct ixp4xx_i2c_pins nslu2_i2c_
static struct resource nslu2_led_resources[] = {
{
.name = "ready", /* green led */
@@ -44,7 +44,7 @@ Index: linux-2.6.21-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c
.flags = IXP4XX_GPIO_LOW,
},
};
-@@ -181,7 +181,8 @@
+@@ -181,7 +181,8 @@ static void __init nslu2_init(void)
pm_power_off = nslu2_power_off;
@@ -54,10 +54,10 @@ Index: linux-2.6.21-armeb/arch/arm/mach-ixp4xx/nslu2-setup.c
* to have it first in order to see debug messages, and so that
* it does *not* get removed if platform_add_devices fails!
*/
-Index: linux-2.6.21-armeb/include/asm-arm/arch-ixp4xx/nslu2.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/nslu2.h
===================================================================
---- linux-2.6.21-armeb.orig/include/asm-arm/arch-ixp4xx/nslu2.h 2007-05-09 07:32:43.000000000 -0700
-+++ linux-2.6.21-armeb/include/asm-arm/arch-ixp4xx/nslu2.h 2007-05-09 07:32:46.000000000 -0700
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/nslu2.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/nslu2.h
@@ -9,7 +9,7 @@
* based on ixdp425.h:
* Copyright 2004 (c) MontaVista, Software, Inc.
@@ -132,10 +132,10 @@ Index: linux-2.6.21-armeb/include/asm-arm/arch-ixp4xx/nslu2.h
+#define NSLU2_LED_DISK2_BM (1L << NSLU2_LED_DISK2_GPIO)
-Index: linux-2.6.21-armeb/include/asm-arm/arch-ixp4xx/nas100d.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/nas100d.h
===================================================================
---- linux-2.6.21-armeb.orig/include/asm-arm/arch-ixp4xx/nas100d.h 2007-04-25 20:08:32.000000000 -0700
-+++ linux-2.6.21-armeb/include/asm-arm/arch-ixp4xx/nas100d.h 2007-05-09 07:34:14.000000000 -0700
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/nas100d.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/nas100d.h
@@ -10,7 +10,7 @@
* based on ixdp425.h:
* Copyright 2004 (c) MontaVista, Software, Inc.
@@ -180,11 +180,11 @@ Index: linux-2.6.21-armeb/include/asm-arm/arch-ixp4xx/nas100d.h
#define NAS100D_PB_IRQ IRQ_IXP4XX_GPIO14
#define NAS100D_RB_IRQ IRQ_IXP4XX_GPIO4
-Index: linux-2.6.21-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c
===================================================================
---- linux-2.6.21-armeb.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-05-09 07:32:43.000000000 -0700
-+++ linux-2.6.21-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-05-09 07:34:55.000000000 -0700
-@@ -155,7 +155,8 @@
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c
+@@ -155,7 +155,8 @@ static void __init nas100d_init(void)
pm_power_off = nas100d_power_off;
diff --git a/target/linux/ixp4xx/patches/100-npe_driver.patch b/target/linux/ixp4xx/patches/100-npe_driver.patch
index 78fb119bcd..987e349827 100644
--- a/target/linux/ixp4xx/patches/100-npe_driver.patch
+++ b/target/linux/ixp4xx/patches/100-npe_driver.patch
@@ -1,10 +1,7 @@
-diff --git a/Documentation/networking/ixp4xx/IxNpeMicrocode.h b/Documentation/networking/ixp4xx/IxNpeMicrocode.h
-new file mode 100644
-index 0000000..e5a4bd3
-Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/IxNpeMicrocode.h
+Index: linux-2.6.21.7/Documentation/networking/ixp4xx/IxNpeMicrocode.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/IxNpeMicrocode.h 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/Documentation/networking/ixp4xx/IxNpeMicrocode.h
@@ -0,0 +1,143 @@
+/*
+ * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file
@@ -149,10 +146,10 @@ Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/IxNpeMicrocode.h
+ close(fd);
+ return 0;
+}
-Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/README
+Index: linux-2.6.21.7/Documentation/networking/ixp4xx/README
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/README 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/Documentation/networking/ixp4xx/README
@@ -0,0 +1,62 @@
+Informations about the Networking Driver using the IXP4XX CPU internal NPEs
+and Queue manager.
@@ -216,10 +213,10 @@ Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/README
+ to grab the microcode from a binary image like the RedBoot bootloader.
+
+
-Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/mc_grab.c
+Index: linux-2.6.21.7/Documentation/networking/ixp4xx/mc_grab.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/mc_grab.c 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/Documentation/networking/ixp4xx/mc_grab.c
@@ -0,0 +1,97 @@
+/*
+ * mc_grab.c - grabs IXP4XX microcode from a binary datastream
@@ -318,11 +315,11 @@ Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/mc_grab.c
+ fprintf(stderr, "Error reading Microcode\n");
+ return ret;
+}
-Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/common.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/common.c
===================================================================
---- linux-2.6.21-rc1-arm.orig/arch/arm/mach-ixp4xx/common.c 2007-02-21 02:24:18.000000000 -0800
-+++ linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/common.c 2007-02-21 02:24:35.000000000 -0800
-@@ -357,6 +357,90 @@
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/common.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/common.c
+@@ -357,6 +357,90 @@ static struct platform_device *ixp46x_de
&ixp46x_i2c_controller
};
@@ -413,7 +410,7 @@ Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/common.c
unsigned long ixp4xx_exp_bus_size;
EXPORT_SYMBOL(ixp4xx_exp_bus_size);
-@@ -378,8 +462,19 @@
+@@ -378,8 +462,19 @@ void __init ixp4xx_sys_init(void)
break;
}
}
@@ -433,11 +430,11 @@ Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/common.c
printk("IXP4xx: Using %luMiB expansion bus window size\n",
ixp4xx_exp_bus_size >> 20);
}
-Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/ixdp425-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/ixdp425-setup.c
===================================================================
---- linux-2.6.21-rc1-arm.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-02-21 02:24:18.000000000 -0800
-+++ linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-02-21 02:24:35.000000000 -0800
-@@ -101,10 +101,59 @@
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/ixdp425-setup.c
+@@ -101,10 +101,59 @@ static struct platform_device ixdp425_ua
.resource = ixdp425_uart_resources
};
@@ -498,11 +495,11 @@ Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/ixdp425-setup.c
};
static void __init ixdp425_init(void)
-Index: linux-2.6.21-rc1-arm/drivers/net/Kconfig
+Index: linux-2.6.21.7/drivers/net/Kconfig
===================================================================
---- linux-2.6.21-rc1-arm.orig/drivers/net/Kconfig 2007-02-21 02:24:18.000000000 -0800
-+++ linux-2.6.21-rc1-arm/drivers/net/Kconfig 2007-02-21 02:24:35.000000000 -0800
-@@ -201,6 +201,8 @@
+--- linux-2.6.21.7.orig/drivers/net/Kconfig
++++ linux-2.6.21.7/drivers/net/Kconfig
+@@ -324,6 +324,8 @@ config MACB
source "drivers/net/arm/Kconfig"
@@ -511,11 +508,11 @@ Index: linux-2.6.21-rc1-arm/drivers/net/Kconfig
config MACE
tristate "MACE (Power Mac ethernet) support"
depends on NET_ETHERNET && PPC_PMAC && PPC32
-Index: linux-2.6.21-rc1-arm/drivers/net/Makefile
+Index: linux-2.6.21.7/drivers/net/Makefile
===================================================================
---- linux-2.6.21-rc1-arm.orig/drivers/net/Makefile 2007-02-21 02:24:18.000000000 -0800
-+++ linux-2.6.21-rc1-arm/drivers/net/Makefile 2007-02-21 02:24:35.000000000 -0800
-@@ -212,6 +212,7 @@
+--- linux-2.6.21.7.orig/drivers/net/Makefile
++++ linux-2.6.21.7/drivers/net/Makefile
+@@ -213,6 +213,7 @@ obj-$(CONFIG_HAMRADIO) += hamradio/
obj-$(CONFIG_IRDA) += irda/
obj-$(CONFIG_ETRAX_ETHERNET) += cris/
obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
@@ -523,10 +520,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/Makefile
obj-$(CONFIG_NETCONSOLE) += netconsole.o
-Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Kconfig
+Index: linux-2.6.21.7/drivers/net/ixp4xx/Kconfig
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Kconfig 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/drivers/net/ixp4xx/Kconfig
@@ -0,0 +1,48 @@
+config IXP4XX_QMGR
+ tristate "IXP4xx Queue Manager support"
@@ -576,10 +573,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Kconfig
+ help
+ This driver is a generic NPE-crypto access layer.
+ You need additional code in OCF for example.
-Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Makefile
+Index: linux-2.6.21.7/drivers/net/ixp4xx/Makefile
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Makefile 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/drivers/net/ixp4xx/Makefile
@@ -0,0 +1,7 @@
+obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
+obj-$(CONFIG_IXP4XX_NPE) += ixp4xx_npe.o
@@ -588,10 +585,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Makefile
+
+ixp4xx_npe-objs := ucode_dl.o npe_mh.o npe.o
+ixp4xx_mac-objs := mac_driver.o phy.o
-Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_crypto.c
+Index: linux-2.6.21.7/drivers/net/ixp4xx/ixp4xx_crypto.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_crypto.c 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/drivers/net/ixp4xx/ixp4xx_crypto.c
@@ -0,0 +1,851 @@
+/*
+ * ixp4xx_crypto.c - interface to the HW crypto
@@ -1444,10 +1441,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_crypto.c
+module_init(init_crypto);
+module_exit(finish_crypto);
+
-Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_qmgr.c
+Index: linux-2.6.21.7/drivers/net/ixp4xx/ixp4xx_qmgr.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_qmgr.c 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/drivers/net/ixp4xx/ixp4xx_qmgr.c
@@ -0,0 +1,474 @@
+/*
+ * qmgr.c - reimplementation of the queue configuration interface.
@@ -1923,10 +1920,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_qmgr.c
+EXPORT_SYMBOL(queue_set_irq_src);
+EXPORT_SYMBOL(queue_set_watermarks);
+EXPORT_SYMBOL(queue_len);
-Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac.h
+Index: linux-2.6.21.7/drivers/net/ixp4xx/mac.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac.h 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/drivers/net/ixp4xx/mac.h
@@ -0,0 +1,275 @@
+/*
+ * Copyright (C) 2002-2006 Christian Hohnstaedt <chohnstaedt@innominate.com>
@@ -2203,10 +2200,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac.h
+ {"RxInternalNPEReceiveErrors "}, \
+ {"TxInternalNPETransmitErrors "}
+
-Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac_driver.c
+Index: linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac_driver.c 2007-02-21 02:24:46.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c
@@ -0,0 +1,850 @@
+/*
+ * mac_driver.c - provide a network interface for each MAC
@@ -3058,10 +3055,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac_driver.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Hohnstaedt <chohnstaedt@innominate.com>");
+
-Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe.c
+Index: linux-2.6.21.7/drivers/net/ixp4xx/npe.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe.c 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/drivers/net/ixp4xx/npe.c
@@ -0,0 +1,291 @@
+
+#include <linux/ixp_npe.h>
@@ -3354,10 +3351,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe.c
+EXPORT_SYMBOL(npe_stop);
+EXPORT_SYMBOL(npe_start);
+EXPORT_SYMBOL(npe_reset);
-Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe_mh.c
+Index: linux-2.6.21.7/drivers/net/ixp4xx/npe_mh.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe_mh.c 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/drivers/net/ixp4xx/npe_mh.c
@@ -0,0 +1,170 @@
+/*
+ * npe_mh.c - NPE message handler.
@@ -3529,10 +3526,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe_mh.c
+EXPORT_SYMBOL(npe_mh_set_rxqid);
+EXPORT_SYMBOL(npe_mh_npe_loopback_mode);
+EXPORT_SYMBOL(npe_mh_get_stats);
-Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/phy.c
+Index: linux-2.6.21.7/drivers/net/ixp4xx/phy.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/phy.c 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/drivers/net/ixp4xx/phy.c
@@ -0,0 +1,113 @@
+/*
+ * phy.c - MDIO functions and mii initialisation
@@ -3647,10 +3644,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/phy.c
+ mac->mii.mdio_write = mdio_write_register;
+}
+
-Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ucode_dl.c
+Index: linux-2.6.21.7/drivers/net/ixp4xx/ucode_dl.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ucode_dl.c 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/drivers/net/ixp4xx/ucode_dl.c
@@ -0,0 +1,479 @@
+/*
+ * ucode_dl.c - provide an NPE device and a char-dev for microcode download
@@ -4131,10 +4128,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ucode_dl.c
+
+EXPORT_SYMBOL(get_npe_by_id);
+EXPORT_SYMBOL(return_npe_dev);
-Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
===================================================================
---- linux-2.6.21-rc1-arm.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2007-02-21 02:24:18.000000000 -0800
-+++ linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2007-02-21 02:24:35.000000000 -0800
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
@@ -22,6 +22,8 @@
#ifndef _ASM_ARM_IXP4XX_H_
#define _ASM_ARM_IXP4XX_H_
@@ -4220,7 +4217,7 @@ Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
#ifndef __ASSEMBLY__
static inline int cpu_is_ixp46x(void)
{
-@@ -620,6 +668,15 @@
+@@ -620,6 +668,15 @@ static inline int cpu_is_ixp46x(void)
#endif
return 0;
}
@@ -4236,10 +4233,10 @@ Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
#endif
#endif
-Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/npe_regs.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/npe_regs.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/npe_regs.h 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/npe_regs.h
@@ -0,0 +1,82 @@
+#ifndef NPE_REGS_H
+#define NPE_REGS_H
@@ -4323,11 +4320,11 @@ Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/npe_regs.h
+
+#endif
+
-Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/platform.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h
===================================================================
---- linux-2.6.21-rc1-arm.orig/include/asm-arm/arch-ixp4xx/platform.h 2007-02-21 02:24:18.000000000 -0800
-+++ linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/platform.h 2007-02-21 02:24:35.000000000 -0800
-@@ -86,6 +86,25 @@
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/platform.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h
+@@ -86,6 +86,25 @@ struct ixp4xx_i2c_pins {
unsigned long scl_pin;
};
@@ -4353,10 +4350,10 @@ Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/platform.h
/*
* This structure provide a means for the board setup code
* to give information to th pata_ixp4xx driver. It is
-Index: linux-2.6.21-rc1-arm/include/linux/ixp_crypto.h
+Index: linux-2.6.21.7/include/linux/ixp_crypto.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/include/linux/ixp_crypto.h 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/include/linux/ixp_crypto.h
@@ -0,0 +1,192 @@
+
+#ifndef IX_CRYPTO_H
@@ -4550,10 +4547,10 @@ Index: linux-2.6.21-rc1-arm/include/linux/ixp_crypto.h
+ const struct ix_hash_algo *auth, int len);
+
+#endif
-Index: linux-2.6.21-rc1-arm/include/linux/ixp_npe.h
+Index: linux-2.6.21.7/include/linux/ixp_npe.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/include/linux/ixp_npe.h 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/include/linux/ixp_npe.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt@innominate.com>
@@ -4672,10 +4669,10 @@ Index: linux-2.6.21-rc1-arm/include/linux/ixp_npe.h
+npe_mh_get_stats(struct npe_info *npe, struct mac_plat_info *mp, u32 phys, int reset);
+
+#endif
-Index: linux-2.6.21-rc1-arm/include/linux/ixp_qmgr.h
+Index: linux-2.6.21.7/include/linux/ixp_qmgr.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/include/linux/ixp_qmgr.h 2007-02-21 02:24:35.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/include/linux/ixp_qmgr.h
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt@innominate.com>
diff --git a/target/linux/ixp4xx/patches/110-ixp4xx_net_driver_fix_mac_handling.patch b/target/linux/ixp4xx/patches/110-ixp4xx_net_driver_fix_mac_handling.patch
index 1050702d88..6adf4995ba 100644
--- a/target/linux/ixp4xx/patches/110-ixp4xx_net_driver_fix_mac_handling.patch
+++ b/target/linux/ixp4xx/patches/110-ixp4xx_net_driver_fix_mac_handling.patch
@@ -2,11 +2,11 @@
drivers/net/ixp4xx/mac_driver.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
-Index: linux-2.6.21-rc4-git6-arm/drivers/net/ixp4xx/mac_driver.c
+Index: linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c
===================================================================
---- linux-2.6.21-rc4-git6-arm.orig/drivers/net/ixp4xx/mac_driver.c 2007-03-22 10:32:20.735684085 +0000
-+++ linux-2.6.21-rc4-git6-arm/drivers/net/ixp4xx/mac_driver.c 2007-03-22 10:33:29.355972584 +0000
-@@ -842,7 +842,7 @@
+--- linux-2.6.21.7.orig/drivers/net/ixp4xx/mac_driver.c
++++ linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c
+@@ -842,7 +842,7 @@ static void __exit finish_mac(void)
}
}
diff --git a/target/linux/ixp4xx/patches/139-ixp4xx_net_driver_mtd_load_fw.patch b/target/linux/ixp4xx/patches/139-ixp4xx_net_driver_mtd_load_fw.patch
index ef53155c03..9ed1b42fe7 100644
--- a/target/linux/ixp4xx/patches/139-ixp4xx_net_driver_mtd_load_fw.patch
+++ b/target/linux/ixp4xx/patches/139-ixp4xx_net_driver_mtd_load_fw.patch
@@ -7,11 +7,11 @@
include/linux/ixp_npe.h | 1
6 files changed, 239 insertions(+), 20 deletions(-)
-Index: linux-2.6.20-rc3/drivers/net/ixp4xx/Kconfig
+Index: linux-2.6.21.7/drivers/net/ixp4xx/Kconfig
===================================================================
---- linux-2.6.20-rc3.orig/drivers/net/ixp4xx/Kconfig
-+++ linux-2.6.20-rc3/drivers/net/ixp4xx/Kconfig
-@@ -11,6 +11,7 @@
+--- linux-2.6.21.7.orig/drivers/net/ixp4xx/Kconfig
++++ linux-2.6.21.7/drivers/net/ixp4xx/Kconfig
+@@ -11,6 +11,7 @@ config IXP4XX_NPE
tristate "IXP4xx NPE support"
depends on ARCH_IXP4XX
depends on NET_ETHERNET
@@ -19,7 +19,7 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/Kconfig
help
The IXP4XX NPE driver supports the 3 CPU co-processors called
"Network Processing Engines" (NPE). It adds support fo downloading
-@@ -18,7 +19,7 @@
+@@ -18,7 +19,7 @@ config IXP4XX_NPE
More about this at: Documentation/networking/ixp4xx/README.
You can either use this OR the Intel Access Library (IAL)
@@ -28,7 +28,7 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/Kconfig
bool "Use Firmware hotplug for Microcode download"
depends on IXP4XX_NPE
select HOTPLUG
-@@ -28,6 +29,13 @@
+@@ -28,6 +29,13 @@ config IXP4XX_FW_LOAD
/usr/lib/hotplug/firmware/NPE-[ABC]
see Documentation/firmware_class/hotplug-script
@@ -42,10 +42,10 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/Kconfig
config IXP4XX_MAC
tristate "IXP4xx MAC support"
depends on IXP4XX_NPE
-Index: linux-2.6.20-rc3/drivers/net/ixp4xx/Makefile
+Index: linux-2.6.21.7/drivers/net/ixp4xx/Makefile
===================================================================
---- linux-2.6.20-rc3.orig/drivers/net/ixp4xx/Makefile
-+++ linux-2.6.20-rc3/drivers/net/ixp4xx/Makefile
+--- linux-2.6.21.7.orig/drivers/net/ixp4xx/Makefile
++++ linux-2.6.21.7/drivers/net/ixp4xx/Makefile
@@ -1,5 +1,6 @@
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
obj-$(CONFIG_IXP4XX_NPE) += ixp4xx_npe.o
@@ -53,10 +53,10 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/Makefile
obj-$(CONFIG_IXP4XX_MAC) += ixp4xx_mac.o
obj-$(CONFIG_IXP4XX_CRYPTO) += ixp4xx_crypto.o
-Index: linux-2.6.20-rc3/drivers/net/ixp4xx/npe_ucode.c
+Index: linux-2.6.21.7/drivers/net/ixp4xx/npe_ucode.c
===================================================================
--- /dev/null
-+++ linux-2.6.20-rc3/drivers/net/ixp4xx/npe_ucode.c
++++ linux-2.6.21.7/drivers/net/ixp4xx/npe_ucode.c
@@ -0,0 +1,185 @@
+/*
+ * Provide an NPE platform device for microcode handling
@@ -243,10 +243,10 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/npe_ucode.c
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
-Index: linux-2.6.20-rc3/drivers/net/ixp4xx/ucode_dl.c
+Index: linux-2.6.21.7/drivers/net/ixp4xx/ucode_dl.c
===================================================================
---- linux-2.6.20-rc3.orig/drivers/net/ixp4xx/ucode_dl.c
-+++ linux-2.6.20-rc3/drivers/net/ixp4xx/ucode_dl.c
+--- linux-2.6.21.7.orig/drivers/net/ixp4xx/ucode_dl.c
++++ linux-2.6.21.7/drivers/net/ixp4xx/ucode_dl.c
@@ -16,6 +16,7 @@
#include <linux/firmware.h>
#include <linux/dma-mapping.h>
@@ -268,7 +268,7 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/ucode_dl.c
#define EOF_BLOCK 0xf
#define IMG_SIZE(image) (((image)->size * sizeof(u32)) + \
sizeof(struct dl_image))
-@@ -38,21 +45,6 @@
+@@ -38,21 +45,6 @@ enum blk_type {
data,
};
@@ -290,7 +290,7 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/ucode_dl.c
struct dl_codeblock {
u32 npe_addr;
u32 size;
-@@ -127,20 +119,33 @@
+@@ -127,20 +119,33 @@ download_block(struct npe_info *npe, str
return 0;
}
@@ -326,7 +326,7 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/ucode_dl.c
npe = dev_get_drvdata(dev);
if (npe->loaded && (npe->usage > 0)) {
printk(KERN_INFO "Cowardly refusing to reload an Image "
-@@ -267,8 +272,7 @@
+@@ -267,8 +272,7 @@ static ssize_t ucode_write(struct file *
static void npe_firmware_probe(struct device *dev)
{
@@ -336,16 +336,16 @@ Index: linux-2.6.20-rc3/drivers/net/ixp4xx/ucode_dl.c
const struct firmware *fw_entry;
struct npe_info *npe = dev_get_drvdata(dev);
struct dl_image *image;
-@@ -477,3 +481,4 @@
+@@ -477,3 +481,4 @@ MODULE_AUTHOR("Christian Hohnstaedt <cho
EXPORT_SYMBOL(get_npe_by_id);
EXPORT_SYMBOL(return_npe_dev);
+EXPORT_SYMBOL(store_npe_image);
-Index: linux-2.6.20-rc3/include/asm-arm/arch-ixp4xx/platform.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h
===================================================================
---- linux-2.6.20-rc3.orig/include/asm-arm/arch-ixp4xx/platform.h
-+++ linux-2.6.20-rc3/include/asm-arm/arch-ixp4xx/platform.h
-@@ -86,6 +86,21 @@
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/platform.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h
+@@ -86,6 +86,21 @@ struct ixp4xx_i2c_pins {
unsigned long scl_pin;
};
@@ -367,7 +367,7 @@ Index: linux-2.6.20-rc3/include/asm-arm/arch-ixp4xx/platform.h
struct npe_plat_data {
const char *name;
int data_size;
-@@ -105,6 +120,10 @@
+@@ -105,6 +120,10 @@ struct mac_plat_info {
};
@@ -378,11 +378,11 @@ Index: linux-2.6.20-rc3/include/asm-arm/arch-ixp4xx/platform.h
/*
* This structure provide a means for the board setup code
* to give information to th pata_ixp4xx driver. It is
-Index: linux-2.6.20-rc3/include/linux/ixp_npe.h
+Index: linux-2.6.21.7/include/linux/ixp_npe.h
===================================================================
---- linux-2.6.20-rc3.orig/include/linux/ixp_npe.h
-+++ linux-2.6.20-rc3/include/linux/ixp_npe.h
-@@ -99,6 +99,7 @@
+--- linux-2.6.21.7.orig/include/linux/ixp_npe.h
++++ linux-2.6.21.7/include/linux/ixp_npe.h
+@@ -99,6 +99,7 @@ extern void npe_reset(struct npe_info *n
extern struct device *get_npe_by_id(int id);
extern void return_npe_dev(struct device *dev);
diff --git a/target/linux/ixp4xx/patches/140-ixp4xx_net_driver_no_phy.patch b/target/linux/ixp4xx/patches/140-ixp4xx_net_driver_no_phy.patch
index 4bd6875e9d..fcff63a19a 100644
--- a/target/linux/ixp4xx/patches/140-ixp4xx_net_driver_no_phy.patch
+++ b/target/linux/ixp4xx/patches/140-ixp4xx_net_driver_no_phy.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.19.2/drivers/net/ixp4xx/mac_driver.c linux-2.6.19.2-owrt/drivers/net/ixp4xx/mac_driver.c
---- linux-2.6.19.2/drivers/net/ixp4xx/mac_driver.c 2007-04-15 14:26:54.000000000 +0200
-+++ linux-2.6.19.2-owrt/drivers/net/ixp4xx/mac_driver.c 2007-04-15 14:33:44.000000000 +0200
-@@ -161,6 +161,16 @@
+Index: linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/net/ixp4xx/mac_driver.c
++++ linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c
+@@ -161,6 +161,16 @@ static int media_check(struct net_device
{
struct mac_info *mac = netdev_priv(dev);
@@ -18,7 +19,7 @@ diff -Nur linux-2.6.19.2/drivers/net/ixp4xx/mac_driver.c linux-2.6.19.2-owrt/dri
if (mii_check_media(&mac->mii, netif_msg_link(mac), init)) {
update_duplex_mode(dev);
return 1;
-@@ -458,7 +468,12 @@
+@@ -448,7 +458,12 @@ static int ixmac_ioctl(struct net_device
return -EINVAL;
if (!try_module_get(THIS_MODULE))
return -ENODEV;
@@ -32,7 +33,7 @@ diff -Nur linux-2.6.19.2/drivers/net/ixp4xx/mac_driver.c linux-2.6.19.2-owrt/dri
module_put(THIS_MODULE);
if (duplex_changed)
update_duplex_mode(dev);
-@@ -488,6 +503,9 @@
+@@ -478,6 +493,9 @@ static void ixmac_get_drvinfo(struct net
static int ixmac_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct mac_info *mac = netdev_priv(dev);
@@ -42,7 +43,7 @@ diff -Nur linux-2.6.19.2/drivers/net/ixp4xx/mac_driver.c linux-2.6.19.2-owrt/dri
mii_ethtool_gset(&mac->mii, cmd);
return 0;
}
-@@ -496,6 +514,9 @@
+@@ -486,6 +504,9 @@ static int ixmac_set_settings(struct net
{
struct mac_info *mac = netdev_priv(dev);
int rc;
@@ -52,7 +53,7 @@ diff -Nur linux-2.6.19.2/drivers/net/ixp4xx/mac_driver.c linux-2.6.19.2-owrt/dri
rc = mii_ethtool_sset(&mac->mii, cmd);
return rc;
}
-@@ -503,12 +524,18 @@
+@@ -493,12 +514,18 @@ static int ixmac_set_settings(struct net
static int ixmac_nway_reset(struct net_device *dev)
{
struct mac_info *mac = netdev_priv(dev);
diff --git a/target/linux/ixp4xx/patches/141-nslu2_setup_mac.patch b/target/linux/ixp4xx/patches/141-nslu2_setup_mac.patch
index cada1bd544..5d72f06987 100644
--- a/target/linux/ixp4xx/patches/141-nslu2_setup_mac.patch
+++ b/target/linux/ixp4xx/patches/141-nslu2_setup_mac.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c
===================================================================
---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
-+++ linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
-@@ -137,6 +137,29 @@ static struct platform_device nslu2_uart
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c
+@@ -138,6 +138,29 @@ static struct platform_device nslu2_uart
.resource = nslu2_uart_resources,
};
@@ -32,7 +32,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
static struct platform_device *nslu2_devices[] __initdata = {
&nslu2_i2c_controller,
&nslu2_flash,
-@@ -144,6 +166,7 @@ static struct platform_device *nslu2_dev
+@@ -145,6 +168,7 @@ static struct platform_device *nslu2_dev
#ifdef CONFIG_LEDS_IXP4XX
&nslu2_leds,
#endif
diff --git a/target/linux/ixp4xx/patches/142-nas100d_setup_mac.patch b/target/linux/ixp4xx/patches/142-nas100d_setup_mac.patch
index 9256324b10..023dd6c52b 100644
--- a/target/linux/ixp4xx/patches/142-nas100d_setup_mac.patch
+++ b/target/linux/ixp4xx/patches/142-nas100d_setup_mac.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c
===================================================================
---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
-+++ linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -123,12 +123,36 @@ static struct platform_device nas100d_ua
.resource = nas100d_uart_resources,
};
diff --git a/target/linux/ixp4xx/patches/143-nslu2_mtd_microcode.patch b/target/linux/ixp4xx/patches/143-nslu2_mtd_microcode.patch
index adf91891f8..764254486c 100644
--- a/target/linux/ixp4xx/patches/143-nslu2_mtd_microcode.patch
+++ b/target/linux/ixp4xx/patches/143-nslu2_mtd_microcode.patch
@@ -2,11 +2,11 @@
arch/arm/mach-ixp4xx/nslu2-setup.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
-Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c
===================================================================
---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
-+++ linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
-@@ -159,6 +159,16 @@ static struct platform_device mac0 = {
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c
+@@ -161,6 +161,16 @@ static struct platform_device mac0 = {
.resource = &res_mac0,
};
@@ -23,7 +23,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
static struct platform_device *nslu2_devices[] __initdata = {
&nslu2_i2c_controller,
&nslu2_flash,
-@@ -166,7 +176,8 @@ static struct platform_device *nslu2_dev
+@@ -168,7 +178,8 @@ static struct platform_device *nslu2_dev
#ifdef CONFIG_LEDS_IXP4XX
&nslu2_leds,
#endif
diff --git a/target/linux/ixp4xx/patches/144-nas100d_mtd_microcode.patch b/target/linux/ixp4xx/patches/144-nas100d_mtd_microcode.patch
index 0794e6fd72..836ed412a3 100644
--- a/target/linux/ixp4xx/patches/144-nas100d_mtd_microcode.patch
+++ b/target/linux/ixp4xx/patches/144-nas100d_mtd_microcode.patch
@@ -2,11 +2,11 @@
arch/arm/mach-ixp4xx/nas100d-setup.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
-Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c
===================================================================
---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
-+++ linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c
-@@ -145,13 +145,24 @@ static struct platform_device mac0 = {
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c
+@@ -146,13 +146,24 @@ static struct platform_device mac0 = {
.resource = &res_mac0,
};
diff --git a/target/linux/ixp4xx/patches/152-nas100d_mtd_load_mac.patch b/target/linux/ixp4xx/patches/152-nas100d_mtd_load_mac.patch
index 37368861bd..1adb3fdb96 100644
--- a/target/linux/ixp4xx/patches/152-nas100d_mtd_load_mac.patch
+++ b/target/linux/ixp4xx/patches/152-nas100d_mtd_load_mac.patch
@@ -2,10 +2,10 @@
arch/arm/mach-ixp4xx/nas100d-setup.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
-Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c
===================================================================
---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
-+++ linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -16,6 +16,7 @@
#include <linux/serial.h>
#include <linux/serial_8250.h>
@@ -14,7 +14,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-@@ -165,6 +166,30 @@ static struct platform_device *nas100d_d
+@@ -166,6 +167,30 @@ static struct platform_device *nas100d_d
&nas100d_npe_ucode,
};
@@ -45,7 +45,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c
static void nas100d_power_off(void)
{
/* This causes the box to drop the power and go dead. */
-@@ -196,6 +221,8 @@ static void __init nas100d_init(void)
+@@ -198,6 +223,8 @@ static void __init nas100d_init(void)
(void)platform_device_register(&nas100d_uart);
platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices));
diff --git a/target/linux/ixp4xx/patches/153-nslu2_mtd_load_mac.patch b/target/linux/ixp4xx/patches/153-nslu2_mtd_load_mac.patch
index 21fe29a88d..a290cf6709 100644
--- a/target/linux/ixp4xx/patches/153-nslu2_mtd_load_mac.patch
+++ b/target/linux/ixp4xx/patches/153-nslu2_mtd_load_mac.patch
@@ -2,10 +2,10 @@
arch/arm/mach-ixp4xx/nslu2-setup.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
-Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c
===================================================================
---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
-+++ linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -18,6 +18,7 @@
#include <linux/serial.h>
#include <linux/serial_8250.h>
@@ -14,7 +14,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-@@ -180,6 +181,30 @@ static struct platform_device *nslu2_dev
+@@ -182,6 +183,30 @@ static struct platform_device *nslu2_dev
&nslu2_npe_ucode,
};
@@ -45,7 +45,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
static void nslu2_power_off(void)
{
/* This causes the box to drop the power and go dead. */
-@@ -210,6 +235,8 @@ static void __init nslu2_init(void)
+@@ -224,6 +249,8 @@ static void __init nslu2_init(void)
(void)platform_device_register(&nslu2_uart);
platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices));
diff --git a/target/linux/ixp4xx/patches/160-nas100d_artop_temp_fix.patch b/target/linux/ixp4xx/patches/160-nas100d_artop_temp_fix.patch
index b7ac4d94c6..e93600e5f1 100644
--- a/target/linux/ixp4xx/patches/160-nas100d_artop_temp_fix.patch
+++ b/target/linux/ixp4xx/patches/160-nas100d_artop_temp_fix.patch
@@ -23,10 +23,10 @@ not to go poking at pata ports if the ret is 0xFF
drivers/ata/pata_artop.c | 6 ++++++
1 file changed, 6 insertions(+)
-Index: linux-2.6.19/drivers/ata/pata_artop.c
+Index: linux-2.6.21.7/drivers/ata/pata_artop.c
===================================================================
---- linux-2.6.19.orig/drivers/ata/pata_artop.c
-+++ linux-2.6.19/drivers/ata/pata_artop.c
+--- linux-2.6.21.7.orig/drivers/ata/pata_artop.c
++++ linux-2.6.21.7/drivers/ata/pata_artop.c
@@ -26,6 +26,7 @@
#include <scsi/scsi_host.h>
#include <linux/libata.h>
diff --git a/target/linux/ixp4xx/patches/178-via_velocity_bigendian.patch b/target/linux/ixp4xx/patches/178-via_velocity_bigendian.patch
index bfff465227..169a53703c 100644
--- a/target/linux/ixp4xx/patches/178-via_velocity_bigendian.patch
+++ b/target/linux/ixp4xx/patches/178-via_velocity_bigendian.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
+Index: linux-2.6.21.7/drivers/net/via-velocity.c
===================================================================
---- linux-2.6.20-rc3.orig/drivers/net/via-velocity.c 2007-01-02 10:30:25.892465963 +0000
-+++ linux-2.6.20-rc3/drivers/net/via-velocity.c 2007-01-02 10:30:36.261113964 +0000
-@@ -96,11 +96,31 @@
+--- linux-2.6.21.7.orig/drivers/net/via-velocity.c
++++ linux-2.6.21.7/drivers/net/via-velocity.c
+@@ -96,11 +96,31 @@ MODULE_AUTHOR("VIA Networking Technologi
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("VIA Networking Velocity Family Gigabit Ethernet Adapter Driver");
@@ -34,7 +34,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
#define RX_DESC_MIN 64
#define RX_DESC_MAX 255
#define RX_DESC_DEF 64
-@@ -385,12 +405,12 @@
+@@ -385,12 +405,12 @@ static void __devinit velocity_set_int_o
if (val == -1)
*opt = def;
else if (val < min || val > max) {
@@ -51,7 +51,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
*opt = val;
}
}
-@@ -415,12 +435,12 @@
+@@ -415,12 +435,12 @@ static void __devinit velocity_set_bool_
if (val == -1)
*opt |= (def ? flag : 0);
else if (val < 0 || val > 1) {
@@ -68,7 +68,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
*opt |= (val ? flag : 0);
}
}
-@@ -438,6 +458,7 @@
+@@ -438,6 +458,7 @@ static void __devinit velocity_set_bool_
static void __devinit velocity_get_options(struct velocity_opt *opts, int index, char *devname)
{
@@ -76,7 +76,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
velocity_set_int_opt(&opts->rx_thresh, rx_thresh[index], RX_THRESH_MIN, RX_THRESH_MAX, RX_THRESH_DEF, "rx_thresh", devname);
velocity_set_int_opt(&opts->DMA_length, DMA_length[index], DMA_LENGTH_MIN, DMA_LENGTH_MAX, DMA_LENGTH_DEF, "DMA_length", devname);
velocity_set_int_opt(&opts->numrx, RxDescriptors[index], RX_DESC_MIN, RX_DESC_MAX, RX_DESC_DEF, "RxDescriptors", devname);
-@@ -452,6 +473,7 @@
+@@ -452,6 +473,7 @@ static void __devinit velocity_get_optio
velocity_set_int_opt((int *) &opts->wol_opts, wol_opts[index], WOL_OPT_MIN, WOL_OPT_MAX, WOL_OPT_DEF, "Wake On Lan options", devname);
velocity_set_int_opt((int *) &opts->int_works, int_works[index], INT_WORKS_MIN, INT_WORKS_MAX, INT_WORKS_DEF, "Interrupt service works", devname);
opts->numrx = (opts->numrx & ~3);
@@ -84,7 +84,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
}
/**
-@@ -466,6 +488,8 @@
+@@ -466,6 +488,8 @@ static void velocity_init_cam_filter(str
{
struct mac_regs __iomem * regs = vptr->mac_regs;
@@ -93,7 +93,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
/* Turn on MCFG_PQEN, turn off MCFG_RTGOPT */
WORD_REG_BITS_SET(MCFG_PQEN, MCFG_RTGOPT, &regs->MCFG);
WORD_REG_BITS_ON(MCFG_VIDFR, &regs->MCFG);
-@@ -484,14 +508,12 @@
+@@ -484,14 +508,12 @@ static void velocity_init_cam_filter(str
WORD_REG_BITS_ON(MCFG_RTGOPT, &regs->MCFG);
mac_set_cam(regs, 0, (u8 *) & (vptr->options.vid), VELOCITY_VLAN_ID_CAM);
@@ -110,7 +110,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
}
/**
-@@ -508,13 +530,15 @@
+@@ -508,13 +530,15 @@ static void velocity_rx_reset(struct vel
struct mac_regs __iomem * regs = vptr->mac_regs;
int i;
@@ -127,7 +127,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
writew(vptr->options.numrx, &regs->RBRDU);
writel(vptr->rd_pool_dma, &regs->RDBaseLo);
-@@ -537,12 +561,15 @@
+@@ -537,12 +561,15 @@ static void velocity_init_registers(stru
struct mac_regs __iomem * regs = vptr->mac_regs;
int i, mii_status;
@@ -143,7 +143,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
netif_stop_queue(vptr->dev);
/*
-@@ -570,12 +597,13 @@
+@@ -570,12 +597,13 @@ static void velocity_init_registers(stru
case VELOCITY_INIT_COLD:
default:
@@ -158,7 +158,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
mac_eeprom_reload(regs);
for (i = 0; i < 6; i++) {
writeb(vptr->dev->dev_addr[i], &(regs->PAR[i]));
-@@ -593,11 +621,16 @@
+@@ -593,11 +621,16 @@ static void velocity_init_registers(stru
*/
BYTE_REG_BITS_SET(CFGB_OFSET, (CFGB_CRANDOM | CFGB_CAP | CFGB_MBA | CFGB_BAKOPT), &regs->CFGB);
@@ -175,7 +175,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
/*
* Set packet filter: Receive directed and broadcast address
*/
-@@ -607,10 +640,12 @@
+@@ -607,10 +640,12 @@ static void velocity_init_registers(stru
* Enable MII auto-polling
*/
enable_mii_autopoll(regs);
@@ -189,7 +189,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
writew(vptr->options.numrx - 1, &regs->RDCSize);
mac_rx_queue_run(regs);
mac_rx_queue_wake(regs);
-@@ -618,10 +653,13 @@
+@@ -618,10 +653,13 @@ static void velocity_init_registers(stru
writew(vptr->options.numtx - 1, &regs->TDCSize);
for (i = 0; i < vptr->num_txq; i++) {
@@ -204,7 +204,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
init_flow_control_register(vptr);
writel(CR0_STOP, &regs->CR0Clr);
-@@ -640,8 +678,10 @@
+@@ -640,8 +678,10 @@ static void velocity_init_registers(stru
enable_flow_control_ability(vptr);
mac_hw_mibs_init(regs);
@@ -215,7 +215,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
}
}
-@@ -659,6 +699,7 @@
+@@ -659,6 +699,7 @@ static int velocity_soft_reset(struct ve
struct mac_regs __iomem * regs = vptr->mac_regs;
int i = 0;
@@ -223,7 +223,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
writel(CR0_SFRST, &regs->CR0Set);
for (i = 0; i < W_MAX_TIMEOUT; i++) {
-@@ -722,6 +763,7 @@
+@@ -722,6 +763,7 @@ static int __devinit velocity_found1(str
VELOCITY_FULL_DRV_NAM, VELOCITY_VERSION);
printk(KERN_INFO "Copyright (c) 2002, 2003 VIA Networking Technologies, Inc.\n");
printk(KERN_INFO "Copyright (c) 2004 Red Hat Inc.\n");
@@ -231,7 +231,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
first = 0;
}
-@@ -935,6 +977,7 @@
+@@ -935,6 +977,7 @@ static int velocity_init_rings(struct ve
dma_addr_t pool_dma;
u8 *pool;
@@ -239,7 +239,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
/*
* Allocate all RD/TD rings a single pool
*/
-@@ -997,6 +1040,7 @@
+@@ -997,6 +1040,7 @@ static int velocity_init_rings(struct ve
static void velocity_free_rings(struct velocity_info *vptr)
{
int size;
@@ -247,7 +247,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
size = vptr->options.numrx * sizeof(struct rx_desc) +
vptr->options.numtx * sizeof(struct tx_desc) * vptr->num_txq;
-@@ -1013,6 +1057,7 @@
+@@ -1013,6 +1057,7 @@ static inline void velocity_give_many_rx
struct mac_regs __iomem *regs = vptr->mac_regs;
int avail, dirty, unusable;
@@ -255,7 +255,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
/*
* RD number must be equal to 4X per hardware spec
* (programming guide rev 1.20, p.13)
-@@ -1026,7 +1071,8 @@
+@@ -1026,7 +1071,8 @@ static inline void velocity_give_many_rx
dirty = vptr->rd_dirty - unusable;
for (avail = vptr->rd_filled & 0xfffc; avail; avail--) {
dirty = (dirty > 0) ? dirty - 1 : vptr->options.numrx - 1;
@@ -265,7 +265,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
}
writew(vptr->rd_filled & 0xfffc, &regs->RBRDU);
-@@ -1036,12 +1082,14 @@
+@@ -1036,12 +1082,14 @@ static inline void velocity_give_many_rx
static int velocity_rx_refill(struct velocity_info *vptr)
{
int dirty = vptr->rd_dirty, done = 0, ret = 0;
@@ -281,7 +281,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
break;
if (!vptr->rd_info[dirty].skb) {
-@@ -1076,6 +1124,7 @@
+@@ -1076,6 +1124,7 @@ static int velocity_init_rd_ring(struct
unsigned int rsize = sizeof(struct velocity_rd_info) *
vptr->options.numrx;
@@ -289,7 +289,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
vptr->rd_info = kmalloc(rsize, GFP_KERNEL);
if(vptr->rd_info == NULL)
goto out;
-@@ -1105,6 +1154,7 @@
+@@ -1105,6 +1154,7 @@ static void velocity_free_rd_ring(struct
{
int i;
@@ -297,7 +297,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
if (vptr->rd_info == NULL)
return;
-@@ -1146,6 +1196,7 @@
+@@ -1146,6 +1196,7 @@ static int velocity_init_td_ring(struct
unsigned int tsize = sizeof(struct velocity_td_info) *
vptr->options.numtx;
@@ -305,7 +305,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
/* Init the TD ring entries */
for (j = 0; j < vptr->num_txq; j++) {
curr = vptr->td_pool_dma[j];
-@@ -1182,6 +1233,7 @@
+@@ -1182,6 +1233,7 @@ static void velocity_free_td_ring_entry(
struct velocity_td_info * td_info = &(vptr->td_infos[q][n]);
int i;
@@ -313,7 +313,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
if (td_info == NULL)
return;
-@@ -1211,6 +1263,7 @@
+@@ -1211,6 +1263,7 @@ static void velocity_free_td_ring(struct
{
int i, j;
@@ -321,7 +321,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
for (j = 0; j < vptr->num_txq; j++) {
if (vptr->td_infos[j] == NULL)
continue;
-@@ -1238,34 +1291,42 @@
+@@ -1238,34 +1291,42 @@ static int velocity_rx_srv(struct veloci
struct net_device_stats *stats = &vptr->stats;
int rd_curr = vptr->rd_curr;
int works = 0;
@@ -369,7 +369,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
vptr->dev->last_rx = jiffies;
-@@ -1296,13 +1357,21 @@
+@@ -1296,13 +1357,21 @@ static int velocity_rx_srv(struct veloci
static inline void velocity_rx_csum(struct rx_desc *rd, struct sk_buff *skb)
{
@@ -396,7 +396,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
return;
}
}
-@@ -1328,9 +1397,11 @@
+@@ -1328,9 +1397,11 @@ static inline int velocity_rx_copy(struc
{
int ret = -1;
@@ -408,7 +408,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
new_skb = dev_alloc_skb(pkt_size + 2);
if (new_skb) {
new_skb->dev = vptr->dev;
-@@ -1360,10 +1431,12 @@
+@@ -1360,10 +1431,12 @@ static inline int velocity_rx_copy(struc
static inline void velocity_iph_realign(struct velocity_info *vptr,
struct sk_buff *skb, int pkt_size)
{
@@ -421,7 +421,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
for (i = pkt_size; i >= 0; i--)
*(skb->data + i + 2) = *(skb->data + i);
skb_reserve(skb, 2);
-@@ -1382,19 +1455,27 @@
+@@ -1382,19 +1455,27 @@ static inline void velocity_iph_realign(
static int velocity_receive_frame(struct velocity_info *vptr, int idx)
{
void (*pci_action)(struct pci_dev *, dma_addr_t, size_t, int);
@@ -453,7 +453,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
vptr->stats.multicast++;
skb = rd_info->skb;
-@@ -1408,7 +1489,8 @@
+@@ -1408,7 +1489,8 @@ static int velocity_receive_frame(struct
*/
if (vptr->flags & VELOCITY_FLAGS_VAL_PKT_LEN) {
@@ -463,7 +463,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
stats->rx_length_errors++;
return -EINVAL;
}
-@@ -1452,6 +1534,7 @@
+@@ -1452,6 +1534,7 @@ static int velocity_alloc_rx_buf(struct
struct rx_desc *rd = &(vptr->rd_ring[idx]);
struct velocity_rd_info *rd_info = &(vptr->rd_info[idx]);
@@ -471,7 +471,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
rd_info->skb = dev_alloc_skb(vptr->rx_buf_sz + 64);
if (rd_info->skb == NULL)
return -ENOMEM;
-@@ -1469,10 +1552,14 @@
+@@ -1469,10 +1552,14 @@ static int velocity_alloc_rx_buf(struct
*/
*((u32 *) & (rd->rdesc0)) = 0;
@@ -489,7 +489,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
return 0;
}
-@@ -1493,9 +1580,11 @@
+@@ -1493,9 +1580,11 @@ static int velocity_tx_srv(struct veloci
int full = 0;
int idx;
int works = 0;
@@ -501,7 +501,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
for (qnum = 0; qnum < vptr->num_txq; qnum++) {
for (idx = vptr->td_tail[qnum]; vptr->td_used[qnum] > 0;
idx = (idx + 1) % vptr->options.numtx) {
-@@ -1506,22 +1595,29 @@
+@@ -1506,22 +1595,29 @@ static int velocity_tx_srv(struct veloci
td = &(vptr->td_rings[qnum][idx]);
tdinfo = &(vptr->td_infos[qnum][idx]);
@@ -537,7 +537,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
stats->tx_window_errors++;
} else {
stats->tx_packets++;
-@@ -1610,6 +1706,7 @@
+@@ -1610,6 +1706,7 @@ static void velocity_print_link_status(s
static void velocity_error(struct velocity_info *vptr, int status)
{
@@ -545,7 +545,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
if (status & ISR_TXSTLI) {
struct mac_regs __iomem * regs = vptr->mac_regs;
-@@ -1699,6 +1796,7 @@
+@@ -1699,6 +1796,7 @@ static void velocity_free_tx_buf(struct
struct sk_buff *skb = tdinfo->skb;
int i;
@@ -553,7 +553,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
/*
* Don't unmap the pre-allocated tx_bufs
*/
-@@ -1902,6 +2000,7 @@
+@@ -1902,6 +2000,7 @@ static int velocity_xmit(struct sk_buff
struct velocity_td_info *tdinfo;
unsigned long flags;
int index;
@@ -561,7 +561,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
int pktlen = skb->len;
-@@ -1918,9 +2017,18 @@
+@@ -1918,9 +2017,18 @@ static int velocity_xmit(struct sk_buff
td_ptr = &(vptr->td_rings[qnum][index]);
tdinfo = &(vptr->td_infos[qnum][index]);
@@ -583,7 +583,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
/*
* Pad short frames.
-@@ -1932,20 +2040,35 @@
+@@ -1932,20 +2040,35 @@ static int velocity_xmit(struct sk_buff
memset(tdinfo->buf + skb->len, 0, ETH_ZLEN - skb->len);
tdinfo->skb = skb;
tdinfo->skb_dma[0] = tdinfo->buf_dma;
@@ -623,7 +623,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
td_ptr->tdesc0.pktsize =
td_ptr->td_buf[0].pa_low = cpu_to_le32(tdinfo->skb_dma[0]);
td_ptr->td_buf[0].pa_high = 0;
-@@ -1962,6 +2085,7 @@
+@@ -1962,6 +2085,7 @@ static int velocity_xmit(struct sk_buff
/* FIXME: support 48bit DMA later */
td_ptr->td_buf[i].pa_low = cpu_to_le32(tdinfo->skb_dma);
td_ptr->td_buf[i].pa_high = 0;
@@ -631,7 +631,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
td_ptr->td_buf[i].bufsize = skb->len->skb->data_len;
for (i = 0; i < nfrags; i++) {
-@@ -1979,7 +2103,7 @@
+@@ -1979,7 +2103,7 @@ static int velocity_xmit(struct sk_buff
}
} else
@@ -640,7 +640,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
{
/*
* Map the linear network buffer into PCI space and
-@@ -1987,19 +2111,30 @@
+@@ -1987,19 +2111,30 @@ static int velocity_xmit(struct sk_buff
*/
tdinfo->skb = skb;
tdinfo->skb_dma[0] = pci_map_single(vptr->pdev, skb->data, pktlen, PCI_DMA_TODEVICE);
@@ -679,7 +679,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
}
/*
-@@ -2009,26 +2144,34 @@
+@@ -2009,26 +2144,34 @@ static int velocity_xmit(struct sk_buff
&& (skb->ip_summed == CHECKSUM_PARTIAL)) {
struct iphdr *ip = skb->nh.iph;
if (ip->protocol == IPPROTO_TCP)
@@ -721,7 +721,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
mac_tx_queue_wake(vptr->mac_regs, qnum);
}
dev->trans_start = jiffies;
-@@ -2054,7 +2197,7 @@
+@@ -2054,7 +2197,7 @@ static int velocity_intr(int irq, void *
u32 isr_status;
int max_count = 0;
@@ -730,7 +730,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
spin_lock(&vptr->lock);
isr_status = mac_read_isr(vptr->mac_regs);
-@@ -2073,7 +2216,10 @@
+@@ -2073,7 +2216,10 @@ static int velocity_intr(int irq, void *
while (isr_status != 0) {
mac_write_isr(vptr->mac_regs, isr_status);
@@ -742,7 +742,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
velocity_error(vptr, isr_status);
if (isr_status & (ISR_PRXI | ISR_PPRXI))
max_count += velocity_rx_srv(vptr, isr_status);
-@@ -2111,6 +2257,7 @@
+@@ -2111,6 +2257,7 @@ static void velocity_set_multi(struct ne
int i;
struct dev_mc_list *mclist;
@@ -750,7 +750,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
writel(0xffffffff, &regs->MARCAM[0]);
writel(0xffffffff, &regs->MARCAM[4]);
-@@ -2154,6 +2301,7 @@
+@@ -2154,6 +2301,7 @@ static struct net_device_stats *velocity
{
struct velocity_info *vptr = netdev_priv(dev);
@@ -758,7 +758,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
/* If the hardware is down, don't touch MII */
if(!netif_running(dev))
return &vptr->stats;
-@@ -2198,6 +2346,7 @@
+@@ -2198,6 +2346,7 @@ static int velocity_ioctl(struct net_dev
struct velocity_info *vptr = netdev_priv(dev);
int ret;
@@ -766,7 +766,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
/* If we are asked for information and the device is power
saving then we need to bring the device back up to talk to it */
-@@ -2416,6 +2565,7 @@
+@@ -2416,6 +2565,7 @@ static int velocity_mii_read(struct mac_
{
u16 ww;
@@ -774,7 +774,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
/*
* Disable MIICR_MAUTO, so that mii addr can be set normally
*/
-@@ -2452,6 +2602,7 @@
+@@ -2452,6 +2602,7 @@ static int velocity_mii_write(struct mac
{
u16 ww;
@@ -782,10 +782,10 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.c
/*
* Disable MIICR_MAUTO, so that mii addr can be set normally
*/
-Index: linux-2.6.20-rc3/drivers/net/via-velocity.h
+Index: linux-2.6.21.7/drivers/net/via-velocity.h
===================================================================
---- linux-2.6.20-rc3.orig/drivers/net/via-velocity.h 2006-11-29 21:57:37.000000000 +0000
-+++ linux-2.6.20-rc3/drivers/net/via-velocity.h 2007-01-02 10:30:36.265114211 +0000
+--- linux-2.6.21.7.orig/drivers/net/via-velocity.h
++++ linux-2.6.21.7/drivers/net/via-velocity.h
@@ -196,64 +196,70 @@
* Receive descriptor
*/
@@ -900,7 +900,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.h
struct td_buf td_buf[7];
};
-@@ -279,6 +285,16 @@
+@@ -279,6 +285,16 @@ enum velocity_owner {
OWNED_BY_NIC = 1
};
@@ -917,7 +917,7 @@ Index: linux-2.6.20-rc3/drivers/net/via-velocity.h
/*
* MAC registers and macros.
-@@ -1698,6 +1714,7 @@
+@@ -1698,6 +1714,7 @@ enum velocity_flow_cntl_type {
};
struct velocity_opt {
diff --git a/target/linux/ixp4xx/patches/185-nslu2_rtc_fixup.patch b/target/linux/ixp4xx/patches/185-nslu2_rtc_fixup.patch
index 2c379d2648..59d3e702fb 100644
--- a/target/linux/ixp4xx/patches/185-nslu2_rtc_fixup.patch
+++ b/target/linux/ixp4xx/patches/185-nslu2_rtc_fixup.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c
===================================================================
---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
-+++ linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nslu2-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -20,6 +20,7 @@
#include <linux/leds.h>
#include <linux/mtd/mtd.h>
@@ -10,7 +10,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
-@@ -239,11 +240,41 @@ static void __init nslu2_init(void)
+@@ -253,11 +254,41 @@ static void __init nslu2_init(void)
register_mtd_user(&nslu2_flash_notifier);
}
@@ -51,4 +51,4 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nslu2-setup.c
+ .fixup = nslu2_fixup,
.map_io = ixp4xx_map_io,
.init_irq = ixp4xx_init_irq,
- .timer = &ixp4xx_timer,
+ .timer = &nslu2_timer,
diff --git a/target/linux/ixp4xx/patches/186-nas100d_rtc_fixup.patch b/target/linux/ixp4xx/patches/186-nas100d_rtc_fixup.patch
index f594802d2f..f15b64f5f4 100644
--- a/target/linux/ixp4xx/patches/186-nas100d_rtc_fixup.patch
+++ b/target/linux/ixp4xx/patches/186-nas100d_rtc_fixup.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c
===================================================================
---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
-+++ linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -18,6 +18,7 @@
#include <linux/leds.h>
#include <linux/mtd/mtd.h>
@@ -10,7 +10,7 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/nas100d-setup.c
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
-@@ -225,11 +226,42 @@ static void __init nas100d_init(void)
+@@ -227,11 +228,42 @@ static void __init nas100d_init(void)
register_mtd_user(&nas100d_flash_notifier);
}
diff --git a/target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch b/target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch
index 04e51cd0c3..8993a9e17b 100644
--- a/target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch
+++ b/target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
===================================================================
---- linux-2.6.21-arm.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c 2007-05-07 11:29:44.000000000 -0700
-+++ linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c 2007-05-07 11:31:15.000000000 -0700
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -15,6 +15,7 @@
#include <linux/serial.h>
#include <linux/serial_8250.h>
@@ -10,7 +10,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
-@@ -142,6 +143,36 @@
+@@ -142,6 +143,36 @@ static struct sys_timer dsmg600_timer =
.init = dsmg600_timer_init,
};
@@ -47,7 +47,7 @@ Index: linux-2.6.21-arm/arch/arm/mach-ixp4xx/dsmg600-setup.c
static void __init dsmg600_init(void)
{
ixp4xx_sys_init();
-@@ -174,6 +205,7 @@
+@@ -174,6 +205,7 @@ MACHINE_START(DSMG600, "D-Link DSM-G600
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC,
.boot_params = 0x00000100,
diff --git a/target/linux/ixp4xx/patches/200-gateway_7001.patch b/target/linux/ixp4xx/patches/200-gateway_7001.patch
index 80cf000796..509b24a248 100644
--- a/target/linux/ixp4xx/patches/200-gateway_7001.patch
+++ b/target/linux/ixp4xx/patches/200-gateway_7001.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.19.2/arch/arm/boot/compressed/head-xscale.S linux-2.6.19.2-owrt/arch/arm/boot/compressed/head-xscale.S
---- linux-2.6.19.2/arch/arm/boot/compressed/head-xscale.S 2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2-owrt/arch/arm/boot/compressed/head-xscale.S 2007-04-02 15:39:28.000000000 +0200
-@@ -46,6 +46,11 @@
+Index: linux-2.6.21.7/arch/arm/boot/compressed/head-xscale.S
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/boot/compressed/head-xscale.S
++++ linux-2.6.21.7/arch/arm/boot/compressed/head-xscale.S
+@@ -46,6 +46,11 @@ __XScale_start:
orr r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00)
#endif
@@ -13,9 +14,10 @@ diff -Nur linux-2.6.19.2/arch/arm/boot/compressed/head-xscale.S linux-2.6.19.2-o
#ifdef CONFIG_ARCH_IXP2000
mov r1, #-1
mov r0, #0xd6000000
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c 2007-04-02 15:39:28.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-pci.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-pci.c
@@ -0,0 +1,68 @@
+/*
+ * arch/arch/mach-ixp4xx/gateway7001-pci.c
@@ -85,9 +87,10 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-pci.c linux-2.6.19.2-o
+}
+
+subsys_initcall(gateway7001_pci_init);
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-04-02 15:49:28.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-setup.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -0,0 +1,108 @@
+/*
+ * arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -197,10 +200,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.19.2
+ .init_machine = gateway7001_init,
+MACHINE_END
+#endif
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig 2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-04-02 15:39:28.000000000 +0200
-@@ -33,6 +33,14 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+@@ -41,6 +41,14 @@ config ARCH_ADI_COYOTE
Engineering Coyote Gateway Reference Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>.
@@ -215,10 +219,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/a
config ARCH_IXDP425
bool "IXDP425"
help
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile 2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile 2007-04-02 15:49:49.000000000 +0200
-@@ -11,6 +11,7 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+@@ -13,6 +13,7 @@ obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx
obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-pci.o
obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
@@ -226,17 +231,18 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/
obj-y += common.o
-@@ -20,5 +21,6 @@
+@@ -24,5 +25,6 @@ obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-
obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o
obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o
obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o
+obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
-diff -Nur linux-2.6.19.2/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.19.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h
---- linux-2.6.19.2/include/asm-arm/arch-ixp4xx/uncompress.h 2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2007-04-02 15:42:04.000000000 +0200
-@@ -38,9 +38,9 @@
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h
+@@ -38,9 +38,9 @@ static void flush(void)
static __inline__ void __arch_decomp_setup(unsigned long arch_id)
{
/*
diff --git a/target/linux/ixp4xx/patches/210-gateway_7001_setup_mac.patch b/target/linux/ixp4xx/patches/210-gateway_7001_setup_mac.patch
index 8b3f4b92c5..fb84d51376 100644
--- a/target/linux/ixp4xx/patches/210-gateway_7001_setup_mac.patch
+++ b/target/linux/ixp4xx/patches/210-gateway_7001_setup_mac.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-04-02 15:56:39.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-04-02 15:57:38.000000000 +0200
-@@ -76,9 +76,57 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-setup.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-setup.c
+@@ -76,9 +76,57 @@ static struct platform_device gateway700
.resource = &gateway7001_uart_resource,
};
diff --git a/target/linux/ixp4xx/patches/212-gateway_7001_mtd_microcode.patch b/target/linux/ixp4xx/patches/212-gateway_7001_mtd_microcode.patch
index c15c5f66a8..2e24f6cead 100644
--- a/target/linux/ixp4xx/patches/212-gateway_7001_mtd_microcode.patch
+++ b/target/linux/ixp4xx/patches/212-gateway_7001_mtd_microcode.patch
@@ -1,5 +1,7 @@
---- linux-2.6.21.5/arch/arm/mach-ixp4xx/gateway7001-setup.c.orig 2007-06-19 18:03:37.202848276 +0100
-+++ linux-2.6.21.5/arch/arm/mach-ixp4xx/gateway7001-setup.c 2007-06-19 18:09:04.152969985 +0100
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-setup.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -16,6 +16,7 @@
#include <linux/device.h>
#include <linux/serial.h>
@@ -8,7 +10,7 @@
#include <linux/serial_8250.h>
#include <linux/slab.h>
-@@ -122,11 +123,48 @@
+@@ -122,11 +123,48 @@ static struct platform_device mac1 = {
.resource = &res_mac1,
};
@@ -57,7 +59,7 @@
};
static void __init gateway7001_init(void)
-@@ -140,6 +178,7 @@
+@@ -140,6 +178,7 @@ static void __init gateway7001_init(void
*IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
platform_add_devices(gateway7001_devices, ARRAY_SIZE(gateway7001_devices));
diff --git a/target/linux/ixp4xx/patches/300-wg302v2.patch b/target/linux/ixp4xx/patches/300-wg302v2.patch
index 8dc1d72d9e..e0f0c21f69 100644
--- a/target/linux/ixp4xx/patches/300-wg302v2.patch
+++ b/target/linux/ixp4xx/patches/300-wg302v2.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig 2007-04-02 16:09:06.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-04-02 16:01:25.000000000 +0200
-@@ -41,6 +41,14 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+@@ -49,6 +49,14 @@ config MACH_GATEWAY7001
7001 Access Point. For more information on this platform,
see http://openwrt.org
@@ -16,27 +17,29 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/a
config ARCH_IXDP425
bool "IXDP425"
help
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile 2007-04-02 16:09:06.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile 2007-04-02 16:09:25.000000000 +0200
-@@ -12,6 +12,7 @@
- obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-pci.o
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+@@ -14,6 +14,7 @@ obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-p
obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
+ obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
+obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-y += common.o
-@@ -22,5 +23,6 @@
- obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o
+@@ -26,5 +27,6 @@ obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.
obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o
+ obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
+obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wg302v2-pci.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wg302v2-pci.c 2007-04-02 16:00:12.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/wg302v2-pci.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/wg302v2-pci.c
@@ -0,0 +1,68 @@
+/*
+ * arch/arch/mach-ixp4xx/wg302v2-pci.c
@@ -106,9 +109,10 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-pci.c linux-2.6.19.2-owrt/
+}
+
+subsys_initcall(wg302v2_pci_init);
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c 2007-04-02 16:08:57.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/wg302v2-setup.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/wg302v2-setup.c
@@ -0,0 +1,107 @@
+/*
+ * arch/arm/mach-ixp4xx/wg302-setup.c
@@ -217,10 +221,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-setup.c linux-2.6.19.2-owr
+ .init_machine = wg302v2_init,
+MACHINE_END
+#endif
-diff -Nur linux-2.6.19.2/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.19.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h
---- linux-2.6.19.2/include/asm-arm/arch-ixp4xx/uncompress.h 2007-04-02 16:09:06.000000000 +0200
-+++ linux-2.6.19.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2007-04-02 16:02:04.000000000 +0200
-@@ -40,7 +40,7 @@
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h
+@@ -40,7 +40,7 @@ static __inline__ void __arch_decomp_set
/*
* Some boards are using UART2 as console
*/
diff --git a/target/linux/ixp4xx/patches/310-wg302v2_setup_mac.patch b/target/linux/ixp4xx/patches/310-wg302v2_setup_mac.patch
index 27616e15b3..c12c5fe771 100644
--- a/target/linux/ixp4xx/patches/310-wg302v2_setup_mac.patch
+++ b/target/linux/ixp4xx/patches/310-wg302v2_setup_mac.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/wg302v2-setup.c 2007-04-02 16:06:02.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wg302v2-setup.c 2007-03-05 11:57:24.000000000 +0100
-@@ -75,9 +75,33 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/wg302v2-setup.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/wg302v2-setup.c
+@@ -75,9 +75,33 @@ static struct platform_device wg302v2_ua
.resource = &wg302v2_uart_resource,
};
diff --git a/target/linux/ixp4xx/patches/400-pronghorn_metro.patch b/target/linux/ixp4xx/patches/400-pronghorn_metro.patch
index 8b88e106e1..035ccf6bd1 100644
--- a/target/linux/ixp4xx/patches/400-pronghorn_metro.patch
+++ b/target/linux/ixp4xx/patches/400-pronghorn_metro.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.21.1/Documentation/arm/IXP4xx linux-2.6.21.1-owrt/Documentation/arm/IXP4xx
---- linux-2.6.21.1/Documentation/arm/IXP4xx 2007-06-10 13:54:49.000000000 +0200
-+++ linux-2.6.21.1-owrt/Documentation/arm/IXP4xx 2007-06-10 13:46:37.000000000 +0200
-@@ -111,6 +111,9 @@
+Index: linux-2.6.21.7/Documentation/arm/IXP4xx
+===================================================================
+--- linux-2.6.21.7.orig/Documentation/arm/IXP4xx
++++ linux-2.6.21.7/Documentation/arm/IXP4xx
+@@ -111,6 +111,9 @@ http://www.adiengineering.com/productsCo
the platform has two mini-PCI slots used for 802.11[bga] cards.
Finally, there is an IDE port hanging off the expansion bus.
@@ -11,10 +12,11 @@ diff -Nur linux-2.6.21.1/Documentation/arm/IXP4xx linux-2.6.21.1-owrt/Documentat
Gateworks Avila Network Platform
http://www.gateworks.com/avila_sbc.htm
-diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/Kconfig linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.21.1/arch/arm/mach-ixp4xx/Kconfig 2007-06-10 13:54:47.000000000 +0200
-+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-06-10 13:46:37.000000000 +0200
-@@ -57,6 +57,14 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+@@ -57,6 +57,14 @@ config MACH_WG302V2
WG302 v2 or WAG302 v2 Access Points. For more information
on this platform, see http://openwrt.org
@@ -29,27 +31,29 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/Kconfig linux-2.6.21.1-owrt/arch/a
config ARCH_IXDP425
bool "IXDP425"
help
-diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/Makefile linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.21.1/arch/arm/mach-ixp4xx/Makefile 2007-06-10 13:54:47.000000000 +0200
-+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/Makefile 2007-06-10 13:46:37.000000000 +0200
-@@ -14,6 +14,7 @@
- obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas10
+ obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
+obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-y += common.o
-@@ -26,5 +27,6 @@
- obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o
+@@ -28,5 +29,6 @@ obj-$(CONFIG_MACH_NAS100D) += nas100d-se
+ obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
+obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
-diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
---- linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-pci.c 2007-06-10 13:50:08.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
@@ -0,0 +1,74 @@
+/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
@@ -125,9 +129,10 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-pci.c linux-2.6.21.
+}
+
+subsys_initcall(pronghornmetro_pci_init);
-diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
---- linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 13:51:51.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -0,0 +1,108 @@
+/*
+ * arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -237,10 +242,11 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.2
+ .init_machine = pronghornmetro_init,
+MACHINE_END
+#endif
-diff -Nur linux-2.6.21.1/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.21.1-owrt/include/asm-arm/arch-ixp4xx/uncompress.h
---- linux-2.6.21.1/include/asm-arm/arch-ixp4xx/uncompress.h 2007-06-10 13:54:52.000000000 +0200
-+++ linux-2.6.21.1-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2007-06-10 13:49:37.000000000 +0200
-@@ -40,7 +40,7 @@
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h
+@@ -40,7 +40,7 @@ static __inline__ void __arch_decomp_set
/*
* Some boards are using UART2 as console
*/
diff --git a/target/linux/ixp4xx/patches/410-pronghorn_metro_setup_mac.patch b/target/linux/ixp4xx/patches/410-pronghorn_metro_setup_mac.patch
index 54621d6c3e..146baa464c 100644
--- a/target/linux/ixp4xx/patches/410-pronghorn_metro_setup_mac.patch
+++ b/target/linux/ixp4xx/patches/410-pronghorn_metro_setup_mac.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
---- linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:05:47.000000000 +0200
-+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:05:38.000000000 +0200
-@@ -76,9 +76,57 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+@@ -76,9 +76,57 @@ static struct platform_device pronghornm
.resource = &pronghornmetro_uart_resource,
};
diff --git a/target/linux/ixp4xx/patches/420-pronghorn_metro_mtd_microcode.patch b/target/linux/ixp4xx/patches/420-pronghorn_metro_mtd_microcode.patch
index 0c304c78ff..1308fc1e05 100644
--- a/target/linux/ixp4xx/patches/420-pronghorn_metro_mtd_microcode.patch
+++ b/target/linux/ixp4xx/patches/420-pronghorn_metro_mtd_microcode.patch
@@ -1,6 +1,7 @@
-diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
---- linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:10:24.000000000 +0200
-+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:10:15.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -17,6 +17,7 @@
#include <linux/serial.h>
#include <linux/tty.h>
@@ -9,7 +10,7 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.2
#include <linux/slab.h>
#include <asm/types.h>
-@@ -122,11 +123,34 @@
+@@ -122,11 +123,34 @@ static struct platform_device mac1 = {
.resource = &res_mac1,
};
@@ -44,7 +45,7 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.2
};
static void __init pronghornmetro_init(void)
-@@ -140,6 +164,8 @@
+@@ -140,6 +164,8 @@ static void __init pronghornmetro_init(v
*IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
platform_add_devices(pronghornmetro_devices, ARRAY_SIZE(pronghornmetro_devices));
diff --git a/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch b/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch
index d2982bc954..be5e7a5f98 100644
--- a/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch
+++ b/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
---- linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:31:27.000000000 +0200
-+++ linux-2.6.21.1-owrt/arch/arm/mach-ixp4xx/pronghornmetro-setup.c 2007-06-10 14:36:23.000000000 +0200
-@@ -77,6 +77,35 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+@@ -77,6 +77,35 @@ static struct platform_device pronghornm
.resource = &pronghornmetro_uart_resource,
};
@@ -37,7 +38,7 @@ diff -Nur linux-2.6.21.1/arch/arm/mach-ixp4xx/pronghornmetro-setup.c linux-2.6.2
static struct resource res_mac0 = {
.start = IXP4XX_EthB_BASE_PHYS,
.end = IXP4XX_EthB_BASE_PHYS + 0x1ff,
-@@ -165,6 +194,17 @@
+@@ -165,6 +194,17 @@ static void __init pronghornmetro_init(v
platform_add_devices(pronghornmetro_devices, ARRAY_SIZE(pronghornmetro_devices));
diff --git a/target/linux/ixp4xx/patches/500-compex.patch b/target/linux/ixp4xx/patches/500-compex.patch
index 854194b35f..284a892a51 100644
--- a/target/linux/ixp4xx/patches/500-compex.patch
+++ b/target/linux/ixp4xx/patches/500-compex.patch
@@ -1,6 +1,7 @@
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-10 01:56:21.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c
@@ -0,0 +1,120 @@
+/*
+ * arch/arm/mach-ixp4xx/compex-setup.c
@@ -122,10 +123,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt
+ .init_machine = compex_init,
+MACHINE_END
+#endif
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-04-10 00:22:16.000000000 +0200
-@@ -66,7 +66,7 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/ixdp425-pci.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/ixdp425-pci.c
+@@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = {
int __init ixdp425_pci_init(void)
{
if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
@@ -134,10 +136,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.19.2-owrt/
pci_common_init(&ixdp425_pci);
return 0;
}
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig 2007-04-10 00:33:31.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-04-10 00:48:37.000000000 +0200
-@@ -57,6 +57,14 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>.
@@ -152,10 +155,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/a
config ARCH_IXDP425
bool "IXDP425"
help
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile 2007-04-10 00:33:39.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile 2007-04-09 20:23:06.000000000 +0200
-@@ -14,6 +14,7 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+@@ -16,6 +16,7 @@ obj-pci-$(CONFIG_MACH_DSMG600) += dsmg6
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
@@ -163,17 +167,18 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/
obj-y += common.o
-@@ -26,5 +27,6 @@
+@@ -30,5 +31,6 @@ obj-$(CONFIG_MACH_DSMG600) += dsmg6
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
+obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
-diff -Nur linux-2.6.19.2/arch/arm/tools/mach-types linux-2.6.19.2-owrt/arch/arm/tools/mach-types
---- linux-2.6.19.2/arch/arm/tools/mach-types 2007-04-10 01:27:55.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/tools/mach-types 2007-04-09 20:22:33.000000000 +0200
-@@ -1278,7 +1278,7 @@
+Index: linux-2.6.21.7/arch/arm/tools/mach-types
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/tools/mach-types
++++ linux-2.6.21.7/arch/arm/tools/mach-types
+@@ -1278,7 +1278,7 @@ oiab MACH_OIAB OIAB 1269
smdk6400 MACH_SMDK6400 SMDK6400 1270
nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271
greenphone MACH_GREENPHONE GREENPHONE 1272
diff --git a/target/linux/ixp4xx/patches/510-compex_setup_mac.patch b/target/linux/ixp4xx/patches/510-compex_setup_mac.patch
index ed85df0818..d8f73852b8 100644
--- a/target/linux/ixp4xx/patches/510-compex_setup_mac.patch
+++ b/target/linux/ixp4xx/patches/510-compex_setup_mac.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-09 20:30:37.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-09 20:36:23.000000000 +0200
-@@ -90,9 +90,57 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/compex-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c
+@@ -90,9 +90,57 @@ static struct platform_device compex_uar
.resource = compex_uart_resources
};
diff --git a/target/linux/ixp4xx/patches/520-compex_mtd_microcode.patch b/target/linux/ixp4xx/patches/520-compex_mtd_microcode.patch
index 90842239c0..c330ed1908 100644
--- a/target/linux/ixp4xx/patches/520-compex_mtd_microcode.patch
+++ b/target/linux/ixp4xx/patches/520-compex_mtd_microcode.patch
@@ -1,6 +1,7 @@
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-09 20:51:57.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-09 21:48:22.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/compex-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c
@@ -17,6 +17,7 @@
#include <linux/serial.h>
#include <linux/tty.h>
@@ -9,7 +10,7 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt
#include <linux/slab.h>
#include <asm/types.h>
-@@ -136,11 +137,34 @@
+@@ -136,11 +137,34 @@ static struct platform_device mac1 = {
.resource = &res_mac1,
};
@@ -44,7 +45,7 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt
};
static void __init compex_init(void)
-@@ -152,6 +176,8 @@
+@@ -152,6 +176,8 @@ static void __init compex_init(void)
IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
platform_add_devices(compex_devices, ARRAY_SIZE(compex_devices));
@@ -52,4 +53,4 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt
+ register_mtd_user(&compex_flash_notifier);
}
- #ifdef CONFIG_ARCH_COMPEX
+ #ifdef CONFIG_MACH_COMPEX
diff --git a/target/linux/ixp4xx/patches/600-wrt300nv2.patch b/target/linux/ixp4xx/patches/600-wrt300nv2.patch
index 9697e5d5f2..39e1dd0b9e 100644
--- a/target/linux/ixp4xx/patches/600-wrt300nv2.patch
+++ b/target/linux/ixp4xx/patches/600-wrt300nv2.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig 2007-05-03 23:17:47.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-04-24 14:25:02.000000000 +0200
-@@ -65,6 +65,14 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+@@ -73,6 +73,14 @@ config MACH_COMPEX
WP18 or NP18A boards. For more information on this
platform, see http://openwrt.org
@@ -16,10 +17,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/a
config ARCH_IXDP425
bool "IXDP425"
help
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile 2007-05-03 23:17:47.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Makefile 2007-04-24 14:25:02.000000000 +0200
-@@ -15,6 +15,7 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+@@ -17,6 +17,7 @@ obj-pci-$(CONFIG_MACH_GATEWAY7001) += ga
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
@@ -27,16 +29,17 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.19.2-owrt/arch/
obj-y += common.o
-@@ -28,5 +29,6 @@
+@@ -32,5 +33,6 @@ obj-$(CONFIG_MACH_GATEWAY7001) += gatewa
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
+obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wrt300nv2-pci.c 2007-05-10 10:40:54.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
@@ -0,0 +1,65 @@
+/*
+ * arch/arch/mach-ixp4xx/wrt300nv2-pci.c
@@ -103,9 +106,10 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-pci.c linux-2.6.19.2-owr
+}
+
+subsys_initcall(wrt300nv2_pci_init);
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-05-03 23:16:53.000000000 +0200
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -0,0 +1,108 @@
+/*
+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -215,10 +219,11 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-setup.c linux-2.6.19.2-o
+ .init_machine = wrt300nv2_init,
+MACHINE_END
+#endif
-diff -Nur linux-2.6.19.2/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.19.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h
---- linux-2.6.19.2/include/asm-arm/arch-ixp4xx/uncompress.h 2007-05-03 23:17:48.000000000 +0200
-+++ linux-2.6.19.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 2007-04-24 14:25:02.000000000 +0200
-@@ -40,7 +40,7 @@
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h
+===================================================================
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/uncompress.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/uncompress.h
+@@ -40,7 +40,7 @@ static __inline__ void __arch_decomp_set
/*
* Some boards are using UART2 as console
*/
diff --git a/target/linux/ixp4xx/patches/610-wrt300nv2_setup_mac.patch b/target/linux/ixp4xx/patches/610-wrt300nv2_setup_mac.patch
index 145ad76ef7..bbc76072ce 100644
--- a/target/linux/ixp4xx/patches/610-wrt300nv2_setup_mac.patch
+++ b/target/linux/ixp4xx/patches/610-wrt300nv2_setup_mac.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-04-24 14:25:02.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 2007-04-24 14:31:09.000000000 +0200
-@@ -76,9 +76,57 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+@@ -76,9 +76,57 @@ static struct platform_device wrt300nv2_
.resource = &wrt300nv2_uart_resource,
};
diff --git a/target/linux/ixp4xx/patches/720-avila_setup_mac.patch b/target/linux/ixp4xx/patches/720-avila_setup_mac.patch
index 3784852e31..66270f0735 100644
--- a/target/linux/ixp4xx/patches/720-avila_setup_mac.patch
+++ b/target/linux/ixp4xx/patches/720-avila_setup_mac.patch
@@ -2,12 +2,12 @@
arch/arm/mach-ixp4xx/avila-setup.c | 50 ++++++++++++++++++++++++++++++++++++-
1 file changed, 49 insertions(+), 1 deletion(-)
-Index: linux-2.6.19/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/avila-setup.c
-+++ linux-2.6.19/arch/arm/mach-ixp4xx/avila-setup.c
-@@ -104,10 +104,60 @@ static struct platform_device avila_uart
- .resource = avila_uart_resources
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/avila-setup.c
+@@ -132,10 +132,60 @@ static struct platform_device avila_pata
+ .resource = avila_pata_resources,
};
+/* MACs */
diff --git a/target/linux/ixp4xx/patches/740-avila_loft_mac_platform.patch b/target/linux/ixp4xx/patches/740-avila_loft_mac_platform.patch
index 952a05506e..87d0892ec8 100644
--- a/target/linux/ixp4xx/patches/740-avila_loft_mac_platform.patch
+++ b/target/linux/ixp4xx/patches/740-avila_loft_mac_platform.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.19/arch/arm/mach-ixp4xx/avila-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/avila-setup.c
===================================================================
---- linux-2.6.19.orig/arch/arm/mach-ixp4xx/avila-setup.c 2007-01-23 03:12:36.000000000 -0800
-+++ linux-2.6.19/arch/arm/mach-ixp4xx/avila-setup.c 2007-01-23 03:12:47.000000000 -0800
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/avila-setup.c
@@ -18,6 +18,10 @@
#include <linux/tty.h>
#include <linux/serial_8250.h>
@@ -13,8 +13,8 @@ Index: linux-2.6.19/arch/arm/mach-ixp4xx/avila-setup.c
#include <asm/types.h>
#include <asm/setup.h>
-@@ -198,9 +202,34 @@
- &avila_npe_ucode,
+@@ -188,9 +192,34 @@ static struct platform_device *avila_dev
+
};
+#ifdef CONFIG_SENSORS_EEPROM
diff --git a/target/linux/ixp4xx/patches/750-avila_mtd_microcode.patch b/target/linux/ixp4xx/patches/750-avila_mtd_microcode.patch
index 0ecd3a5617..2973a22835 100644
--- a/target/linux/ixp4xx/patches/750-avila_mtd_microcode.patch
+++ b/target/linux/ixp4xx/patches/750-avila_mtd_microcode.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/avila-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/avila-setup.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/avila-setup.c 2007-05-10 12:30:54.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/avila-setup.c 2007-05-10 12:33:08.000000000 +0200
-@@ -155,13 +155,23 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/avila-setup.c
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/avila-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/avila-setup.c
+@@ -183,13 +183,23 @@ static struct platform_device mac1 = {
.resource = &res_mac1,
};
diff --git a/target/linux/ixp4xx/patches/800-eeprom_new_notifier.patch b/target/linux/ixp4xx/patches/800-eeprom_new_notifier.patch
index 79a097128c..d10153ef81 100644
--- a/target/linux/ixp4xx/patches/800-eeprom_new_notifier.patch
+++ b/target/linux/ixp4xx/patches/800-eeprom_new_notifier.patch
@@ -9,10 +9,10 @@ the 'maclist' code and read out by the ethernet config.
Signed-off-by: John Bowler <jbowler@acm.org>
-Index: linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c
+Index: linux-2.6.21.7/drivers/i2c/chips/eeprom.c
===================================================================
---- linux-2.6.21-rc1-arm.orig/drivers/i2c/chips/eeprom.c 2007-02-21 02:24:14.000000000 -0800
-+++ linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c 2007-02-21 02:25:01.000000000 -0800
+--- linux-2.6.21.7.orig/drivers/i2c/chips/eeprom.c
++++ linux-2.6.21.7/drivers/i2c/chips/eeprom.c
@@ -33,6 +33,8 @@
#include <linux/jiffies.h>
#include <linux/i2c.h>
@@ -22,7 +22,7 @@ Index: linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c
/* Addresses to scan */
static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
-@@ -41,26 +43,7 @@
+@@ -41,26 +43,7 @@ static unsigned short normal_i2c[] = { 0
/* Insmod parameters */
I2C_CLIENT_INSMOD_1(eeprom);
@@ -50,7 +50,7 @@ Index: linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c
static int eeprom_attach_adapter(struct i2c_adapter *adapter);
static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind);
-@@ -189,6 +172,7 @@
+@@ -189,6 +172,7 @@ static int eeprom_detect(struct i2c_adap
data->valid = 0;
mutex_init(&data->update_lock);
data->nature = UNKNOWN;
@@ -58,7 +58,7 @@ Index: linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c
/* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client)))
-@@ -212,6 +196,9 @@
+@@ -212,6 +196,9 @@ static int eeprom_detect(struct i2c_adap
if (err)
goto exit_detach;
@@ -68,7 +68,7 @@ Index: linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c
return 0;
exit_detach:
-@@ -237,6 +224,41 @@
+@@ -237,6 +224,41 @@ static int eeprom_detach_client(struct i
return 0;
}
@@ -110,10 +110,10 @@ Index: linux-2.6.21-rc1-arm/drivers/i2c/chips/eeprom.c
static int __init eeprom_init(void)
{
return i2c_add_driver(&eeprom_driver);
-Index: linux-2.6.21-rc1-arm/include/linux/eeprom.h
+Index: linux-2.6.21.7/include/linux/eeprom.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21-rc1-arm/include/linux/eeprom.h 2007-02-21 02:25:01.000000000 -0800
+--- /dev/null
++++ linux-2.6.21.7/include/linux/eeprom.h
@@ -0,0 +1,71 @@
+#ifndef _LINUX_EEPROM_H
+#define _LINUX_EEPROM_H
@@ -186,11 +186,11 @@ Index: linux-2.6.21-rc1-arm/include/linux/eeprom.h
+extern int unregister_eeprom_notifier(struct notifier_block *nb);
+
+#endif /* _LINUX_EEPROM_H */
-Index: linux-2.6.21-rc1-arm/include/linux/notifier.h
+Index: linux-2.6.21.7/include/linux/notifier.h
===================================================================
---- linux-2.6.21-rc1-arm.orig/include/linux/notifier.h 2007-02-21 02:24:14.000000000 -0800
-+++ linux-2.6.21-rc1-arm/include/linux/notifier.h 2007-02-21 02:25:01.000000000 -0800
-@@ -187,5 +187,8 @@
+--- linux-2.6.21.7.orig/include/linux/notifier.h
++++ linux-2.6.21.7/include/linux/notifier.h
+@@ -187,5 +187,8 @@ extern int srcu_notifier_call_chain(stru
#define CPU_DOWN_FAILED 0x0006 /* CPU (unsigned)v NOT going down */
#define CPU_DEAD 0x0007 /* CPU (unsigned)v dead */
diff --git a/target/linux/ixp4xx/patches/900-no_loader_workaround.patch b/target/linux/ixp4xx/patches/900-no_loader_workaround.patch
index f84f15b09e..cb6a531759 100644
--- a/target/linux/ixp4xx/patches/900-no_loader_workaround.patch
+++ b/target/linux/ixp4xx/patches/900-no_loader_workaround.patch
@@ -1,7 +1,8 @@
-diff -Nur linux-2.6.19/arch/arm/boot/compressed/head-xscale.S linux-2.6.19-owrt/arch/arm/boot/compressed/head-xscale.S
---- linux-2.6.19/arch/arm/boot/compressed/head-xscale.S 2006-12-19 12:56:21.000000000 +0100
-+++ linux-2.6.19-owrt/arch/arm/boot/compressed/head-xscale.S 2006-12-19 12:58:15.000000000 +0100
-@@ -41,6 +41,7 @@
+Index: linux-2.6.21.7/arch/arm/boot/compressed/head-xscale.S
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/boot/compressed/head-xscale.S
++++ linux-2.6.21.7/arch/arm/boot/compressed/head-xscale.S
+@@ -41,6 +41,7 @@ __XScale_start:
mov r7, #MACH_TYPE_COTULLA_IDP
#endif
@@ -9,7 +10,7 @@ diff -Nur linux-2.6.19/arch/arm/boot/compressed/head-xscale.S linux-2.6.19-owrt/
#ifdef CONFIG_MACH_GTWX5715
mov r7, #(MACH_TYPE_GTWX5715 & 0xff)
orr r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00)
-@@ -50,6 +51,7 @@
+@@ -50,6 +51,7 @@ __XScale_start:
mov r7, #(MACH_TYPE_GATEWAY7001 & 0xff)
orr r7, r7, #(MACH_TYPE_GATEWAY7001 & 0xff00)
#endif
diff --git a/target/linux/ixp4xx/patches/996-fsg3_support.patch b/target/linux/ixp4xx/patches/996-fsg3_support.patch
index ecf5d750a5..987abdfc71 100644
--- a/target/linux/ixp4xx/patches/996-fsg3_support.patch
+++ b/target/linux/ixp4xx/patches/996-fsg3_support.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-pci.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/fsg-pci.c
===================================================================
--- /dev/null
-+++ linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-pci.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/fsg-pci.c
@@ -0,0 +1,71 @@
+/*
+ * arch/arch/mach-ixp4xx/fsg-pci.c
@@ -74,10 +74,10 @@ Index: linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-pci.c
+}
+
+subsys_initcall(fsg_pci_init);
-Index: linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-setup.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/fsg-setup.c
===================================================================
--- /dev/null
-+++ linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-setup.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/fsg-setup.c
@@ -0,0 +1,223 @@
+/*
+ * arch/arm/mach-ixp4xx/fsg-setup.c
@@ -302,10 +302,10 @@ Index: linux-2.6.21.5-armeb/arch/arm/mach-ixp4xx/fsg-setup.c
+ .init_machine = fsg_init,
+MACHINE_END
+
-Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/fsg.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/fsg.h
===================================================================
--- /dev/null
-+++ linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/fsg.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/fsg.h
@@ -0,0 +1,58 @@
+/*
+ * include/asm-arm/arch-ixp4xx/fsg.h
@@ -365,10 +365,10 @@ Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/fsg.h
+#define FSG_LED_SATA_BIT 3
+#define FSG_LED_WAN_BIT 4
+#define FSG_LED_WLAN_BIT 5
-Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/hardware.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/hardware.h
===================================================================
---- linux-2.6.21.5-armeb.orig/include/asm-arm/arch-ixp4xx/hardware.h
-+++ linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/hardware.h
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/hardware.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/hardware.h
@@ -48,5 +48,6 @@ extern unsigned int processor_id;
#include "nslu2.h"
#include "nas100d.h"
@@ -376,10 +376,10 @@ Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/hardware.h
+#include "fsg.h"
#endif /* _ASM_ARCH_HARDWARE_H */
-Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/irqs.h
+Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/irqs.h
===================================================================
---- linux-2.6.21.5-armeb.orig/include/asm-arm/arch-ixp4xx/irqs.h
-+++ linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/irqs.h
+--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/irqs.h
++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/irqs.h
@@ -128,4 +128,11 @@
#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6
@@ -392,9 +392,11 @@ Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/irqs.h
+#define IRQ_FSG_PCI_INTC IRQ_IXP4XX_GPIO5
+
#endif
---- linux-2.6.21.6/arch/arm/mach-ixp4xx/Makefile~ 2007-07-11 22:20:52.000000000 +0930
-+++ linux-2.6.21.6/arch/arm/mach-ixp4xx/Makefile 2007-07-11 22:22:02.000000000 +0930
-@@ -13,6 +13,7 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+@@ -13,6 +13,7 @@ obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx
obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-pci.o
obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
@@ -402,7 +404,7 @@ Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/irqs.h
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
-@@ -29,6 +30,7 @@
+@@ -29,6 +30,7 @@ obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-
obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o
obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o
obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o
@@ -410,9 +412,11 @@ Index: linux-2.6.21.5-armeb/include/asm-arm/arch-ixp4xx/irqs.h
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
---- linux-2.6.21.6/arch/arm/mach-ixp4xx/Kconfig~ 2007-07-11 22:23:24.000000000 +0930
-+++ linux-2.6.21.6/arch/arm/mach-ixp4xx/Kconfig 2007-07-11 22:23:47.000000000 +0930
-@@ -138,6 +138,14 @@
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+===================================================================
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Kconfig
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Kconfig
+@@ -138,6 +138,14 @@ config MACH_DSMG600
DSM-G600 RevA device. For more information on this platform,
see http://www.nslu2-linux.org/wiki/DSMG600/HomePage
diff --git a/target/linux/ixp4xx/patches/997-fsg3_buttons.patch b/target/linux/ixp4xx/patches/997-fsg3_buttons.patch
index b9f589d529..1b8d8cf5ff 100644
--- a/target/linux/ixp4xx/patches/997-fsg3_buttons.patch
+++ b/target/linux/ixp4xx/patches/997-fsg3_buttons.patch
@@ -3,10 +3,10 @@
arch/arm/mach-ixp4xx/fsg-power.c | 168 +++++++++++++++++++++++++++++++++++++++
2 files changed, 169 insertions(+), 1 deletion(-)
-Index: linux-2.6.21.6-armeb/arch/arm/mach-ixp4xx/fsg-power.c
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/fsg-power.c
===================================================================
--- /dev/null
-+++ linux-2.6.21.6-armeb/arch/arm/mach-ixp4xx/fsg-power.c
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/fsg-power.c
@@ -0,0 +1,168 @@
+/*
+ * arch/arm/mach-ixp4xx/fsg-power.c
@@ -176,11 +176,11 @@ Index: linux-2.6.21.6-armeb/arch/arm/mach-ixp4xx/fsg-power.c
+MODULE_AUTHOR("Zintis Petersons <Zintis.Petersons@e-mail.lv>");
+MODULE_DESCRIPTION("FSG buttons driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.21.6-armeb/arch/arm/mach-ixp4xx/Makefile
+Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
===================================================================
---- linux-2.6.21.6-armeb.orig/arch/arm/mach-ixp4xx/Makefile
-+++ linux-2.6.21.6-armeb/arch/arm/mach-ixp4xx/Makefile
-@@ -30,7 +30,7 @@
+--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/Makefile
++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/Makefile
+@@ -30,7 +30,7 @@ obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-
obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o
obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o
obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o
diff --git a/target/linux/ixp4xx/patches/998-VT6421.patch b/target/linux/ixp4xx/patches/998-VT6421.patch
index 805880f363..a7f28e9355 100644
--- a/target/linux/ixp4xx/patches/998-VT6421.patch
+++ b/target/linux/ixp4xx/patches/998-VT6421.patch
@@ -6,14 +6,16 @@ PATA_UDMA_TIMING register.
This patch fixes a copy/paste bug that breaks DMA modes on VT6421 PATA port.
Signed-off-by: Ondrej Zary <linux@rain...>
-diff -Nur linux-2.6.21.6/drivers/ata/sata_via.c linux-2.6.21.6-new/drivers/ata/sata_via.c
---- linux-2.6.21.6/drivers/ata/sata_via.c 2007-07-07 06:47:55.000000000 +0200
-+++ linux-2.6.21.6-new/drivers/ata/sata_via.c 2007-09-29 11:05:07.000000000 +0200
-@@ -380,6 +380,6 @@
+Index: linux-2.6.21.7/drivers/ata/sata_via.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/ata/sata_via.c
++++ linux-2.6.21.7/drivers/ata/sata_via.c
+@@ -380,7 +380,7 @@ static void vt6421_set_dma_mode(struct a
{
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
static const u8 udma_bits[] = { 0xEE, 0xE8, 0xE6, 0xE4, 0xE2, 0xE1, 0xE0, 0xE0 };
- pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->pio_mode - XFER_UDMA_0]);
+ pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->dma_mode - XFER_UDMA_0]);
}
-
+
+ static int vt6421_port_start(struct ata_port *ap)