qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-09-12 06:26:47 +03:00
Code

refresh ixp4xx patches to match upstream style

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11297 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz 2008-05-30 16:32:35 +00:00
parent 48983d35d7
commit 30d336cfc5
40 changed files with 300 additions and 498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,8 @@
drivers/rtc/rtc-isl1208.c | 357 +++++++++++++++++++++------------------------- drivers/rtc/rtc-isl1208.c | 357 +++++++++++++++++++++-------------------------
1 file changed, 170 insertions(+), 187 deletions(-) 1 file changed, 170 insertions(+), 187 deletions(-)
Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c --- a/drivers/rtc/rtc-isl1208.c
=================================================================== +++ b/drivers/rtc/rtc-isl1208.c
--- linux-2.6.25.4.orig/drivers/rtc/rtc-isl1208.c
+++ linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
@@ -15,16 +15,15 @@ @@ -15,16 +15,15 @@
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/rtc.h> #include <linux/rtc.h>
@ -93,7 +91,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
BUG_ON(reg > ISL1208_REG_USR2); BUG_ON(reg > ISL1208_REG_USR2);
BUG_ON(reg + len > ISL1208_REG_USR2 + 1); BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
@@ -103,15 +84,14 @@ isl1208_i2c_read_regs(struct i2c_client @@ -103,15 +84,14 @@
/* block write */ /* block write */
static int static int
isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[], isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],
@ -111,7 +109,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
BUG_ON(reg > ISL1208_REG_USR2); BUG_ON(reg > ISL1208_REG_USR2);
BUG_ON(reg + len > ISL1208_REG_USR2 + 1); BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
@@ -125,7 +105,8 @@ isl1208_i2c_set_regs(struct i2c_client * @@ -125,7 +105,8 @@
} }
/* simple check to see wether we have a isl1208 */ /* simple check to see wether we have a isl1208 */
@ -121,7 +119,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
{ {
u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, }; u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
u8 zero_mask[ISL1208_RTC_SECTION_LEN] = { u8 zero_mask[ISL1208_RTC_SECTION_LEN] = {
@@ -139,24 +120,29 @@ static int isl1208_i2c_validate_client(s @@ -139,24 +120,29 @@
return ret; return ret;
for (i = 0; i < ISL1208_RTC_SECTION_LEN; ++i) { for (i = 0; i < ISL1208_RTC_SECTION_LEN; ++i) {
@ -157,7 +155,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
/* The 6bit value in the ATR register controls the load /* The 6bit value in the ATR register controls the load
* capacitance C_load * in steps of 0.25pF * capacitance C_load * in steps of 0.25pF
@@ -169,51 +155,54 @@ static int isl1208_i2c_get_atr(struct i2 @@ -169,51 +155,54 @@
* *
*/ */
@ -225,7 +223,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
{ {
struct i2c_client *const client = to_i2c_client(dev); struct i2c_client *const client = to_i2c_client(dev);
int sr, dtr, atr, usr; int sr, dtr, atr, usr;
@@ -230,20 +219,19 @@ static int isl1208_rtc_proc(struct devic @@ -230,20 +219,19 @@
(sr & ISL1208_REG_SR_ALM) ? " ALM" : "", (sr & ISL1208_REG_SR_ALM) ? " ALM" : "",
(sr & ISL1208_REG_SR_WRTC) ? " WRTC" : "", (sr & ISL1208_REG_SR_WRTC) ? " WRTC" : "",
(sr & ISL1208_REG_SR_XTOSCB) ? " XTOSCB" : "", (sr & ISL1208_REG_SR_XTOSCB) ? " XTOSCB" : "",
@ -249,7 +247,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
usr = isl1208_i2c_get_usr(client); usr = isl1208_i2c_get_usr(client);
if (usr >= 0) if (usr >= 0)
@@ -252,9 +240,8 @@ static int isl1208_rtc_proc(struct devic @@ -252,9 +240,8 @@
return 0; return 0;
} }
@ -261,7 +259,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
{ {
int sr; int sr;
u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, }; u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
@@ -274,27 +261,30 @@ static int isl1208_i2c_read_time(struct @@ -274,27 +261,30 @@
tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SC]); tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SC]);
tm->tm_min = BCD2BIN(regs[ISL1208_REG_MN]); tm->tm_min = BCD2BIN(regs[ISL1208_REG_MN]);
@ -299,7 +297,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
{ {
struct rtc_time *const tm = &alarm->time; struct rtc_time *const tm = &alarm->time;
u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, }; u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, };
@@ -307,7 +297,7 @@ static int isl1208_i2c_read_alarm(struct @@ -307,7 +297,7 @@
} }
sr = isl1208_i2c_read_regs(client, ISL1208_REG_SCA, regs, sr = isl1208_i2c_read_regs(client, ISL1208_REG_SCA, regs,
@ -308,7 +306,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
if (sr < 0) { if (sr < 0) {
dev_err(&client->dev, "%s: reading alarm section failed\n", dev_err(&client->dev, "%s: reading alarm section failed\n",
__func__); __func__);
@@ -315,23 +305,25 @@ static int isl1208_i2c_read_alarm(struct @@ -315,23 +305,25 @@
} }
/* MSB of each alarm register is an enable bit */ /* MSB of each alarm register is an enable bit */
@ -343,7 +341,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
{ {
int sr; int sr;
u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, }; u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
@@ -353,7 +345,7 @@ static int isl1208_i2c_set_time(struct i @@ -353,7 +345,7 @@
} }
/* set WRTC */ /* set WRTC */
@ -352,7 +350,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
sr | ISL1208_REG_SR_WRTC); sr | ISL1208_REG_SR_WRTC);
if (sr < 0) { if (sr < 0) {
dev_err(&client->dev, "%s: writing SR failed\n", __func__); dev_err(&client->dev, "%s: writing SR failed\n", __func__);
@@ -369,7 +361,7 @@ static int isl1208_i2c_set_time(struct i @@ -369,7 +361,7 @@
} }
/* clear WRTC again */ /* clear WRTC again */
@ -361,7 +359,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
sr & ~ISL1208_REG_SR_WRTC); sr & ~ISL1208_REG_SR_WRTC);
if (sr < 0) { if (sr < 0) {
dev_err(&client->dev, "%s: writing SR failed\n", __func__); dev_err(&client->dev, "%s: writing SR failed\n", __func__);
@@ -380,70 +372,69 @@ static int isl1208_i2c_set_time(struct i @@ -380,70 +372,69 @@
} }
@ -460,7 +458,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-isl1208.c
{ {
int usr = -1; int usr = -1;
@@ -460,124 +451,116 @@ static ssize_t isl1208_sysfs_store_usr(s @@ -460,124 +451,116 @@
return isl1208_i2c_set_usr(to_i2c_client(dev), usr) ? -EIO : count; return isl1208_i2c_set_usr(to_i2c_client(dev), usr) ? -EIO : count;
} }

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

@ -2,10 +2,8 @@
drivers/rtc/rtc-pcf8563.c | 109 +++++++++++++--------------------------------- drivers/rtc/rtc-pcf8563.c | 109 +++++++++++++---------------------------------
1 file changed, 32 insertions(+), 77 deletions(-) 1 file changed, 32 insertions(+), 77 deletions(-)
Index: linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c --- a/drivers/rtc/rtc-pcf8563.c
=================================================================== +++ b/drivers/rtc/rtc-pcf8563.c
--- linux-2.6.25.4.orig/drivers/rtc/rtc-pcf8563.c
+++ linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c
@@ -18,17 +18,7 @@ @@ -18,17 +18,7 @@
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/rtc.h> #include <linux/rtc.h>
@ -25,7 +23,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c
#define PCF8563_REG_ST1 0x00 /* status */ #define PCF8563_REG_ST1 0x00 /* status */
#define PCF8563_REG_ST2 0x01 #define PCF8563_REG_ST2 0x01
@@ -53,8 +43,10 @@ I2C_CLIENT_INSMOD; @@ -53,8 +43,10 @@
#define PCF8563_SC_LV 0x80 /* low voltage */ #define PCF8563_SC_LV 0x80 /* low voltage */
#define PCF8563_MO_C 0x80 /* century */ #define PCF8563_MO_C 0x80 /* century */
@ -37,7 +35,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c
/* /*
* The meaning of MO_C bit varies by the chip type. * The meaning of MO_C bit varies by the chip type.
* From PCF8563 datasheet: this bit is toggled when the years * From PCF8563 datasheet: this bit is toggled when the years
@@ -72,16 +64,13 @@ struct pcf8563 { @@ -72,16 +64,13 @@
int c_polarity; /* 0: MO_C=1 means 19xx, otherwise MO_C=1 means 20xx */ int c_polarity; /* 0: MO_C=1 means 19xx, otherwise MO_C=1 means 20xx */
}; };
@ -55,7 +53,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c
unsigned char buf[13] = { PCF8563_REG_ST1 }; unsigned char buf[13] = { PCF8563_REG_ST1 };
struct i2c_msg msgs[] = { struct i2c_msg msgs[] = {
@@ -138,7 +127,7 @@ static int pcf8563_get_datetime(struct i @@ -138,7 +127,7 @@
static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm) static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)
{ {
@ -64,7 +62,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-pcf8563.c
int i, err; int i, err;
unsigned char buf[9]; unsigned char buf[9];
@@ -257,100 +246,66 @@ static const struct rtc_class_ops pcf856 @@ -257,100 +246,66 @@
.set_time = pcf8563_rtc_set_time, .set_time = pcf8563_rtc_set_time,
}; };

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

@ -2,10 +2,8 @@
drivers/rtc/rtc-x1205.c | 128 ++++++++++++++++-------------------------------- drivers/rtc/rtc-x1205.c | 128 ++++++++++++++++--------------------------------
1 file changed, 43 insertions(+), 85 deletions(-) 1 file changed, 43 insertions(+), 85 deletions(-)
Index: linux-2.6.25.4/drivers/rtc/rtc-x1205.c --- a/drivers/rtc/rtc-x1205.c
=================================================================== +++ b/drivers/rtc/rtc-x1205.c
--- linux-2.6.25.4.orig/drivers/rtc/rtc-x1205.c
+++ linux-2.6.25.4/drivers/rtc/rtc-x1205.c
@@ -22,20 +22,7 @@ @@ -22,20 +22,7 @@
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -28,7 +26,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-x1205.c
/* offsets into CCR area */ /* offsets into CCR area */
@@ -91,19 +78,7 @@ I2C_CLIENT_INSMOD; @@ -91,19 +78,7 @@
#define X1205_HR_MIL 0x80 /* Set in ccr.hour for 24 hr mode */ #define X1205_HR_MIL 0x80 /* Set in ccr.hour for 24 hr mode */
@ -49,7 +47,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-x1205.c
/* /*
* In the routines that deal directly with the x1205 hardware, we use * In the routines that deal directly with the x1205 hardware, we use
@@ -497,58 +472,51 @@ static ssize_t x1205_sysfs_show_dtrim(st @@ -497,58 +472,51 @@
} }
static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL); static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL);
@ -135,7 +133,7 @@ Index: linux-2.6.25.4/drivers/rtc/rtc-x1205.c
i2c_set_clientdata(client, rtc); i2c_set_clientdata(client, rtc);
@@ -565,45 +533,35 @@ static int x1205_probe(struct i2c_adapte @@ -565,45 +533,35 @@
else else
dev_err(&client->dev, "couldn't read status\n"); dev_err(&client->dev, "couldn't read status\n");

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

@ -45,11 +45,9 @@ now calls machine_restart() directly.
create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c
create mode 100644 include/asm-arm/arch-ixp4xx/fsg.h create mode 100644 include/asm-arm/arch-ixp4xx/fsg.h
Index: linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig --- a/arch/arm/configs/ixp4xx_defconfig
=================================================================== +++ b/arch/arm/configs/ixp4xx_defconfig
--- linux-2.6.25.4.orig/arch/arm/configs/ixp4xx_defconfig @@ -165,6 +165,7 @@
+++ linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
@@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y
CONFIG_MACH_NAS100D=y CONFIG_MACH_NAS100D=y
CONFIG_MACH_DSMG600=y CONFIG_MACH_DSMG600=y
CONFIG_ARCH_IXDP4XX=y CONFIG_ARCH_IXDP4XX=y
@ -57,7 +55,7 @@ Index: linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
CONFIG_CPU_IXP46X=y CONFIG_CPU_IXP46X=y
CONFIG_CPU_IXP43X=y CONFIG_CPU_IXP43X=y
CONFIG_MACH_GTWX5715=y CONFIG_MACH_GTWX5715=y
@@ -770,7 +771,7 @@ CONFIG_ATA=y @@ -770,7 +771,7 @@
# CONFIG_SATA_SIL24 is not set # CONFIG_SATA_SIL24 is not set
# CONFIG_SATA_SIS is not set # CONFIG_SATA_SIS is not set
# CONFIG_SATA_ULI is not set # CONFIG_SATA_ULI is not set
@ -66,7 +64,7 @@ Index: linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
# CONFIG_SATA_VITESSE is not set # CONFIG_SATA_VITESSE is not set
# CONFIG_SATA_INIC162X is not set # CONFIG_SATA_INIC162X is not set
# CONFIG_PATA_ALI is not set # CONFIG_PATA_ALI is not set
@@ -1143,7 +1144,7 @@ CONFIG_HWMON=y @@ -1143,7 +1144,7 @@
# CONFIG_SENSORS_VIA686A is not set # CONFIG_SENSORS_VIA686A is not set
# CONFIG_SENSORS_VT1211 is not set # CONFIG_SENSORS_VT1211 is not set
# CONFIG_SENSORS_VT8231 is not set # CONFIG_SENSORS_VT8231 is not set
@ -75,7 +73,7 @@ Index: linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
# CONFIG_SENSORS_W83791D is not set # CONFIG_SENSORS_W83791D is not set
# CONFIG_SENSORS_W83792D is not set # CONFIG_SENSORS_W83792D is not set
# CONFIG_SENSORS_W83793 is not set # CONFIG_SENSORS_W83793 is not set
@@ -1334,8 +1335,8 @@ CONFIG_LEDS_CLASS=y @@ -1334,8 +1335,8 @@
# #
# LED drivers # LED drivers
# #
@ -85,7 +83,7 @@ Index: linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
# #
# LED Triggers # LED Triggers
@@ -1367,7 +1368,7 @@ CONFIG_RTC_INTF_DEV=y @@ -1367,7 +1368,7 @@
# CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_DS1672 is not set
# CONFIG_RTC_DRV_MAX6900 is not set # CONFIG_RTC_DRV_MAX6900 is not set
# CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_RS5C372 is not set
@ -94,11 +92,9 @@ Index: linux-2.6.25.4/arch/arm/configs/ixp4xx_defconfig
CONFIG_RTC_DRV_X1205=y CONFIG_RTC_DRV_X1205=y
CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_PCF8563=y
# CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_PCF8583 is not set
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig --- a/arch/arm/mach-ixp4xx/Kconfig
=================================================================== +++ b/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig @@ -125,6 +125,15 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -125,6 +125,15 @@ config ARCH_IXDP4XX
depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435 depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
default y default y
@ -114,11 +110,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
# #
# Certain registers and IRQs are only enabled if supporting IXP465 CPUs # Certain registers and IRQs are only enabled if supporting IXP465 CPUs
# #
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile --- a/arch/arm/mach-ixp4xx/Makefile
=================================================================== +++ b/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile @@ -15,6 +15,7 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas10
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
@ -126,7 +120,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-y += common.o obj-y += common.o
@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D) += nas100d-se @@ -28,6 +29,7 @@
obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
@ -134,10 +128,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-pci.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-pci.c +++ b/arch/arm/mach-ixp4xx/fsg-pci.c
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/fsg-pci.c + * arch/arch/mach-ixp4xx/fsg-pci.c
@ -210,10 +202,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-pci.c
+} +}
+ +
+subsys_initcall(fsg_pci_init); +subsys_initcall(fsg_pci_init);
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-setup.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-setup.c +++ b/arch/arm/mach-ixp4xx/fsg-setup.c
@@ -0,0 +1,276 @@ @@ -0,0 +1,276 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/fsg-setup.c + * arch/arm/mach-ixp4xx/fsg-setup.c
@ -491,10 +481,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/fsg-setup.c
+ .init_machine = fsg_init, + .init_machine = fsg_init,
+MACHINE_END +MACHINE_END
+ +
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/fsg.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/fsg.h +++ b/include/asm-arm/arch-ixp4xx/fsg.h
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+/* +/*
+ * include/asm-arm/arch-ixp4xx/fsg.h + * include/asm-arm/arch-ixp4xx/fsg.h
@ -546,10 +534,8 @@ Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/fsg.h
+#define FSG_LED_USB_BIT 4 +#define FSG_LED_USB_BIT 4
+#define FSG_LED_RING_BIT 5 +#define FSG_LED_RING_BIT 5
+#define FSG_LED_SYNC_BIT 7 +#define FSG_LED_SYNC_BIT 7
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h --- a/include/asm-arm/arch-ixp4xx/hardware.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/hardware.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/hardware.h
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h
@@ -45,5 +45,6 @@ @@ -45,5 +45,6 @@
#include "nslu2.h" #include "nslu2.h"
#include "nas100d.h" #include "nas100d.h"
@ -557,10 +543,8 @@ Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h
+#include "fsg.h" +#include "fsg.h"
#endif /* _ASM_ARCH_HARDWARE_H */ #endif /* _ASM_ARCH_HARDWARE_H */
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/irqs.h --- a/include/asm-arm/arch-ixp4xx/irqs.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/irqs.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/irqs.h
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/irqs.h
@@ -128,4 +128,11 @@ @@ -128,4 +128,11 @@
#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7 #define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6 #define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6

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

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

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

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/drivers/char/random.c --- a/drivers/char/random.c
=================================================================== +++ b/drivers/char/random.c
--- linux-2.6.25.4.orig/drivers/char/random.c
+++ linux-2.6.25.4/drivers/char/random.c
@@ -248,9 +248,9 @@ @@ -248,9 +248,9 @@
/* /*
* Configuration information * Configuration information

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/gateway7001-setup.c --- a/arch/arm/mach-ixp4xx/gateway7001-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/gateway7001-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/gateway7001-setup.c @@ -76,9 +76,36 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -76,9 +76,36 @@ static struct platform_device gateway700
.resource = &gateway7001_uart_resource, .resource = &gateway7001_uart_resource,
}; };

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v2-setup.c --- a/arch/arm/mach-ixp4xx/wg302v2-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/wg302v2-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/wg302v2-setup.c @@ -77,9 +77,27 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v2-setup.c
@@ -77,9 +77,27 @@ static struct platform_device wg302v2_ua
.resource = &wg302v2_uart_resource, .resource = &wg302v2_uart_resource,
}; };

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig --- a/arch/arm/mach-ixp4xx/Kconfig
=================================================================== +++ b/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig @@ -57,6 +57,14 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -57,6 +57,14 @@ config MACH_WG302V2
WG302 v2 or WAG302 v2 Access Points. For more information WG302 v2 or WAG302 v2 Access Points. For more information
on this platform, see http://openwrt.org on this platform, see http://openwrt.org
@ -17,11 +15,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help help
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile --- a/arch/arm/mach-ixp4xx/Makefile
=================================================================== +++ b/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile @@ -16,6 +16,7 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -16,6 +16,7 @@ obj-pci-$(CONFIG_MACH_DSMG600) += dsmg6
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
@ -29,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-y += common.o obj-y += common.o
@@ -30,6 +31,7 @@ obj-$(CONFIG_MACH_DSMG600) += dsmg6 @@ -30,6 +31,7 @@
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_FSG) += fsg-setup.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o
@ -37,10 +33,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-pci.c +++ b/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
@@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
@ -116,10 +110,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-pci.c
+} +}
+ +
+subsys_initcall(pronghornmetro_pci_init); +subsys_initcall(pronghornmetro_pci_init);
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c +++ b/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -0,0 +1,147 @@ @@ -0,0 +1,147 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/pronghornmetro-setup.c + * arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@ -268,11 +260,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
+ .init_machine = pronghornmetro_init, + .init_machine = pronghornmetro_init,
+MACHINE_END +MACHINE_END
+#endif +#endif
Index: linux-2.6.25.4/Documentation/arm/IXP4xx --- a/Documentation/arm/IXP4xx
=================================================================== +++ b/Documentation/arm/IXP4xx
--- linux-2.6.25.4.orig/Documentation/arm/IXP4xx @@ -111,6 +111,9 @@
+++ linux-2.6.25.4/Documentation/arm/IXP4xx
@@ -111,6 +111,9 @@ http://www.adiengineering.com/productsCo
the platform has two mini-PCI slots used for 802.11[bga] cards. the platform has two mini-PCI slots used for 802.11[bga] cards.
Finally, there is an IDE port hanging off the expansion bus. Finally, there is an IDE port hanging off the expansion bus.
@ -282,11 +272,9 @@ Index: linux-2.6.25.4/Documentation/arm/IXP4xx
Gateworks Avila Network Platform Gateworks Avila Network Platform
http://www.gateworks.com/avila_sbc.htm http://www.gateworks.com/avila_sbc.htm
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h --- a/include/asm-arm/arch-ixp4xx/uncompress.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/uncompress.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/uncompress.h @@ -41,7 +41,8 @@
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_set
* Some boards are using UART2 as console * Some boards are using UART2 as console
*/ */
if (machine_is_adi_coyote() || machine_is_gtwx5715() || if (machine_is_adi_coyote() || machine_is_gtwx5715() ||

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c --- a/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/pronghornmetro-setup.c @@ -104,9 +104,36 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/pronghornmetro-setup.c
@@ -104,9 +104,36 @@ static struct platform_device pronghornm
.resource = pronghornmetro_pata_resources, .resource = pronghornmetro_pata_resources,
}; };

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig --- a/arch/arm/mach-ixp4xx/Kconfig
=================================================================== +++ b/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig @@ -65,6 +65,14 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>. information on this platform, see <file:Documentation/arm/IXP4xx>.
@ -17,11 +15,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help help
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile --- a/arch/arm/mach-ixp4xx/Makefile
=================================================================== +++ b/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile @@ -17,6 +17,7 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -17,6 +17,7 @@ obj-pci-$(CONFIG_MACH_GATEWAY7001) += ga
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
@ -29,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-y += common.o obj-y += common.o
@@ -32,6 +33,7 @@ obj-$(CONFIG_MACH_GATEWAY7001) += gatewa @@ -32,6 +33,7 @@
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_FSG) += fsg-setup.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
@ -37,10 +33,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c +++ b/arch/arm/mach-ixp4xx/compex-setup.c
@@ -0,0 +1,120 @@ @@ -0,0 +1,120 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/compex-setup.c + * arch/arm/mach-ixp4xx/compex-setup.c
@ -162,11 +156,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c
+ .init_machine = compex_init, + .init_machine = compex_init,
+MACHINE_END +MACHINE_END
+#endif +#endif
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c @@ -66,7 +66,7 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = {
int __init ixdp425_pci_init(void) int __init ixdp425_pci_init(void)
{ {
if (machine_is_ixdp425() || machine_is_ixcdp1100() || if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
@ -175,11 +167,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c
pci_common_init(&ixdp425_pci); pci_common_init(&ixdp425_pci);
return 0; return 0;
} }
Index: linux-2.6.25.4/arch/arm/tools/mach-types --- a/arch/arm/tools/mach-types
=================================================================== +++ b/arch/arm/tools/mach-types
--- linux-2.6.25.4.orig/arch/arm/tools/mach-types @@ -1276,7 +1276,7 @@
+++ linux-2.6.25.4/arch/arm/tools/mach-types
@@ -1276,7 +1276,7 @@ oiab MACH_OIAB OIAB 1269
smdk6400 MACH_SMDK6400 SMDK6400 1270 smdk6400 MACH_SMDK6400 SMDK6400 1270
nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271 nokia_n800 MACH_NOKIA_N800 NOKIA_N800 1271
greenphone MACH_GREENPHONE GREENPHONE 1272 greenphone MACH_GREENPHONE GREENPHONE 1272

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c --- a/arch/arm/mach-ixp4xx/compex-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/compex-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/compex-setup.c @@ -90,9 +90,36 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/compex-setup.c
@@ -90,9 +90,36 @@ static struct platform_device compex_uar
.resource = compex_uart_resources, .resource = compex_uart_resources,
}; };

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig --- a/arch/arm/mach-ixp4xx/Kconfig
=================================================================== +++ b/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig @@ -73,6 +73,14 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -73,6 +73,14 @@ config MACH_COMPEX
WP18 or NP18A boards. For more information on this WP18 or NP18A boards. For more information on this
platform, see http://openwrt.org platform, see http://openwrt.org
@ -17,11 +15,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help help
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile --- a/arch/arm/mach-ixp4xx/Makefile
=================================================================== +++ b/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile @@ -18,6 +18,7 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -18,6 +18,7 @@ obj-pci-$(CONFIG_MACH_WG302V2) += wg302
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
@ -29,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-y += common.o obj-y += common.o
@@ -34,6 +35,7 @@ obj-$(CONFIG_MACH_WG302V2) += wg302v2-se @@ -34,6 +35,7 @@
obj-$(CONFIG_MACH_FSG) += fsg-setup.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
@ -37,10 +33,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-pci.c +++ b/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/wrt300nv2-pci.c + * arch/arch/mach-ixp4xx/wrt300nv2-pci.c
@ -107,10 +101,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-pci.c
+} +}
+ +
+subsys_initcall(wrt300nv2_pci_init); +subsys_initcall(wrt300nv2_pci_init);
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c +++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -0,0 +1,108 @@ @@ -0,0 +1,108 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c + * arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@ -220,11 +212,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+ .init_machine = wrt300nv2_init, + .init_machine = wrt300nv2_init,
+MACHINE_END +MACHINE_END
+#endif +#endif
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h --- a/include/asm-arm/arch-ixp4xx/uncompress.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/uncompress.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/uncompress.h @@ -42,7 +42,7 @@
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -42,7 +42,7 @@ static __inline__ void __arch_decomp_set
*/ */
if (machine_is_adi_coyote() || machine_is_gtwx5715() || if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
machine_is_gateway7001() || machine_is_wg302v2() || machine_is_gateway7001() || machine_is_wg302v2() ||

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c --- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/wrt300nv2-setup.c @@ -76,9 +76,36 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
@@ -76,9 +76,36 @@ static struct platform_device wrt300nv2_
.resource = &wrt300nv2_uart_resource, .resource = &wrt300nv2_uart_resource,
}; };

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig --- a/arch/arm/mach-ixp4xx/Kconfig
=================================================================== +++ b/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig @@ -65,6 +65,14 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -65,6 +65,14 @@ config MACH_PRONGHORNMETRO
Engineering Pronghorn Metro Platform. For more Engineering Pronghorn Metro Platform. For more
information on this platform, see <file:Documentation/arm/IXP4xx>. information on this platform, see <file:Documentation/arm/IXP4xx>.
@ -17,7 +15,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
config MACH_COMPEX config MACH_COMPEX
bool "Compex WP18 / NP18A" bool "Compex WP18 / NP18A"
select PCI select PCI
@@ -163,7 +171,7 @@ config MACH_FSG @@ -163,7 +171,7 @@
# #
config CPU_IXP46X config CPU_IXP46X
bool bool
@ -26,11 +24,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
default y default y
config CPU_IXP43X config CPU_IXP43X
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile --- a/arch/arm/mach-ixp4xx/Makefile
=================================================================== +++ b/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile @@ -19,6 +19,7 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -19,6 +19,7 @@ obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
@ -38,7 +34,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-y += common.o obj-y += common.o
@@ -36,6 +37,7 @@ obj-$(CONFIG_MACH_FSG) += fsg-setup.o @@ -36,6 +37,7 @@
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
@ -46,10 +42,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-pci.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-pci.c +++ b/arch/arm/mach-ixp4xx/sidewinder-pci.c
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/pronghornmetro-pci.c + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
@ -122,10 +116,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-pci.c
+} +}
+ +
+subsys_initcall(sidewinder_pci_init); +subsys_initcall(sidewinder_pci_init);
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-setup.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/sidewinder-setup.c +++ b/arch/arm/mach-ixp4xx/sidewinder-setup.c
@@ -0,0 +1,115 @@ @@ -0,0 +1,115 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/sidewinder-setup.c + * arch/arm/mach-ixp4xx/sidewinder-setup.c

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

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c +++ b/arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -0,0 +1,151 @@ @@ -0,0 +1,151 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/ap1000-setup.c + * arch/arm/mach-ixp4xx/ap1000-setup.c
@ -154,11 +152,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c
+ .init_machine = ap1000_init, + .init_machine = ap1000_init,
+MACHINE_END +MACHINE_END
+#endif +#endif
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixdp425-pci.c @@ -66,7 +66,8 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,8 @@ struct hw_pci ixdp425_pci __initdata = {
int __init ixdp425_pci_init(void) int __init ixdp425_pci_init(void)
{ {
if (machine_is_ixdp425() || machine_is_ixcdp1100() || if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
@ -168,11 +164,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixdp425-pci.c
pci_common_init(&ixdp425_pci); pci_common_init(&ixdp425_pci);
return 0; return 0;
} }
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig --- a/arch/arm/mach-ixp4xx/Kconfig
=================================================================== +++ b/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig @@ -89,6 +89,14 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -89,6 +89,14 @@ config MACH_WRT300NV2
WRT300N v2 router. For more information on this WRT300N v2 router. For more information on this
platform, see http://openwrt.org platform, see http://openwrt.org
@ -187,11 +181,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
config ARCH_IXDP425 config ARCH_IXDP425
bool "IXDP425" bool "IXDP425"
help help
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile --- a/arch/arm/mach-ixp4xx/Makefile
=================================================================== +++ b/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile @@ -20,6 +20,7 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) +=
obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_COMPEX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
@ -199,7 +191,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-y += common.o obj-y += common.o
@@ -38,6 +39,7 @@ obj-$(CONFIG_MACH_PRONGHORNMETRO) += pro @@ -38,6 +39,7 @@
obj-$(CONFIG_MACH_COMPEX) += compex-setup.o obj-$(CONFIG_MACH_COMPEX) += compex-setup.o
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c --- a/arch/arm/mach-ixp4xx/ap1000-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/ap1000-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ap1000-setup.c @@ -90,9 +90,37 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ap1000-setup.c
@@ -90,9 +90,37 @@ static struct platform_device ap1000_uar
.resource = ap1000_uart_resources .resource = ap1000_uart_resources
}; };

26
target/linux/ixp4xx/patches-2.6.25/160-wg302v1_support.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig --- a/arch/arm/mach-ixp4xx/Kconfig
=================================================================== +++ b/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig @@ -49,6 +49,14 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -49,6 +49,14 @@ config MACH_GATEWAY7001
7001 Access Point. For more information on this platform, 7001 Access Point. For more information on this platform,
see http://openwrt.org see http://openwrt.org
@ -17,11 +15,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
config MACH_WG302V2 config MACH_WG302V2
bool "Netgear WG302 v2 / WAG302 v2" bool "Netgear WG302 v2 / WAG302 v2"
select PCI select PCI
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile --- a/arch/arm/mach-ixp4xx/Makefile
=================================================================== +++ b/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile @@ -14,6 +14,7 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -14,6 +14,7 @@ obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-p
obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
@ -29,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o
obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
@@ -33,6 +34,7 @@ obj-$(CONFIG_MACH_NSLU2) += nslu2-setup. @@ -33,6 +34,7 @@
obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o
obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
@ -37,10 +33,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
obj-$(CONFIG_MACH_FSG) += fsg-setup.o obj-$(CONFIG_MACH_FSG) += fsg-setup.o
obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o obj-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-setup.o
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-pci.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-pci.c +++ b/arch/arm/mach-ixp4xx/wg302v1-pci.c
@@ -0,0 +1,63 @@ @@ -0,0 +1,63 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/wg302v1-pci.c + * arch/arch/mach-ixp4xx/wg302v1-pci.c
@ -105,10 +99,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-pci.c
+} +}
+ +
+subsys_initcall(wg302v1_pci_init); +subsys_initcall(wg302v1_pci_init);
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c +++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -0,0 +1,109 @@ @@ -0,0 +1,109 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/wg302v1-setup.c + * arch/arm/mach-ixp4xx/wg302v1-setup.c

8
target/linux/ixp4xx/patches-2.6.25/161-wg302v1_mac_plat_info.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c --- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c @@ -77,9 +77,27 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -77,9 +77,27 @@ static struct platform_device wg302v1_ua
.resource = &wg302v1_uart_resource, .resource = &wg302v1_uart_resource,
}; };

10
target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c --- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c @@ -100,6 +100,36 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
@@ -100,6 +100,36 @@ static struct platform_device *wg302v1_d
&wg302_eth[0], &wg302_eth[0],
}; };
@ -39,7 +37,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/wg302v1-setup.c
static void __init wg302v1_init(void) static void __init wg302v1_init(void)
{ {
ixp4xx_sys_init(); ixp4xx_sys_init();
@@ -118,6 +148,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1 @@ -118,6 +148,7 @@
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/coyote-setup.c --- a/arch/arm/mach-ixp4xx/coyote-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/coyote-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/coyote-setup.c @@ -73,9 +73,37 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -73,9 +73,37 @@ static struct platform_device coyote_uar
.resource = &coyote_uart_resource, .resource = &coyote_uart_resource,
}; };

34
target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig --- a/arch/arm/mach-ixp4xx/Kconfig
=================================================================== +++ b/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig @@ -150,6 +150,14 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -150,6 +150,14 @@ config ARCH_PRPMC1100
PrPCM1100 Processor Mezanine Module. For more information on PrPCM1100 Processor Mezanine Module. For more information on
this platform, see <file:Documentation/arm/IXP4xx>. this platform, see <file:Documentation/arm/IXP4xx>.
@ -17,11 +15,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
config MACH_NAS100D config MACH_NAS100D
bool bool
prompt "NAS100D" prompt "NAS100D"
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile --- a/arch/arm/mach-ixp4xx/Makefile
=================================================================== +++ b/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile @@ -22,6 +22,7 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -22,6 +22,7 @@ obj-pci-$(CONFIG_MACH_COMPEX) += ixdp42
obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-pci.o
obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o obj-pci-$(CONFIG_MACH_SIDEWINDER) += sidewinder-pci.o
obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o
@ -29,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-y += common.o obj-y += common.o
@@ -42,6 +43,7 @@ obj-$(CONFIG_MACH_COMPEX) += compex-setu @@ -42,6 +43,7 @@
obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv2-setup.o
obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o
@ -37,10 +33,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-setup.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-setup.c +++ b/arch/arm/mach-ixp4xx/tw5334-setup.c
@@ -0,0 +1,162 @@ @@ -0,0 +1,162 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/tw5334-setup.c + * arch/arm/mach-ixp4xx/tw5334-setup.c
@ -204,10 +198,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-setup.c
+ .init_machine = tw5334_init, + .init_machine = tw5334_init,
+MACHINE_END +MACHINE_END
+#endif +#endif
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-pci.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-pci.c +++ b/arch/arm/mach-ixp4xx/tw5334-pci.c
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/tw5334-pci.c + * arch/arch/mach-ixp4xx/tw5334-pci.c
@ -278,11 +270,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/tw5334-pci.c
+} +}
+ +
+subsys_initcall(tw5334_pci_init); +subsys_initcall(tw5334_pci_init);
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h --- a/include/asm-arm/arch-ixp4xx/uncompress.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/uncompress.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/uncompress.h @@ -42,7 +42,8 @@
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/uncompress.h
@@ -42,7 +42,8 @@ static __inline__ void __arch_decomp_set
*/ */
if (machine_is_adi_coyote() || machine_is_gtwx5715() || if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
machine_is_gateway7001() || machine_is_wg302v2() || machine_is_gateway7001() || machine_is_wg302v2() ||

34
target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig --- a/arch/arm/mach-ixp4xx/Kconfig
=================================================================== +++ b/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig @@ -25,6 +25,14 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -25,6 +25,14 @@ config MACH_AVILA
Avila Network Platform. For more information on this platform, Avila Network Platform. For more information on this platform,
see <file:Documentation/arm/IXP4xx>. see <file:Documentation/arm/IXP4xx>.
@ -17,7 +15,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
config MACH_LOFT config MACH_LOFT
bool "Loft" bool "Loft"
depends on MACH_AVILA depends on MACH_AVILA
@@ -200,7 +208,7 @@ config CPU_IXP46X @@ -200,7 +208,7 @@
config CPU_IXP43X config CPU_IXP43X
bool bool
@ -26,11 +24,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
default y default y
config MACH_GTWX5715 config MACH_GTWX5715
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile --- a/arch/arm/mach-ixp4xx/Makefile
=================================================================== +++ b/arch/arm/mach-ixp4xx/Makefile
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile @@ -7,6 +7,7 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
@@ -7,6 +7,7 @@ obj-pci-n :=
obj-pci-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o obj-pci-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o
obj-pci-$(CONFIG_MACH_AVILA) += avila-pci.o obj-pci-$(CONFIG_MACH_AVILA) += avila-pci.o
@ -38,7 +34,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-pci-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o obj-pci-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o
obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o
obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o
@@ -28,6 +29,7 @@ obj-y += common.o @@ -28,6 +29,7 @@
obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-setup.o obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-setup.o
obj-$(CONFIG_MACH_AVILA) += avila-setup.o obj-$(CONFIG_MACH_AVILA) += avila-setup.o
@ -46,10 +42,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile
obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o
obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c +++ b/arch/arm/mach-ixp4xx/cambria-pci.c
@@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
+/* +/*
+ * arch/arch/mach-ixp4xx/cambria-pci.c + * arch/arch/mach-ixp4xx/cambria-pci.c
@ -125,10 +119,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c
+} +}
+ +
+subsys_initcall(cambria_pci_init); +subsys_initcall(cambria_pci_init);
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c +++ b/arch/arm/mach-ixp4xx/cambria-setup.c
@@ -0,0 +1,444 @@ @@ -0,0 +1,444 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/cambria-setup.c + * arch/arm/mach-ixp4xx/cambria-setup.c
@ -574,10 +566,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
+ .init_machine = cambria_init, + .init_machine = cambria_init,
+MACHINE_END +MACHINE_END
+#endif +#endif
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h --- a/include/asm-arm/arch-ixp4xx/hardware.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/hardware.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/hardware.h
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
#define __ASM_ARCH_HARDWARE_H__ #define __ASM_ARCH_HARDWARE_H__

38
target/linux/ixp4xx/patches-2.6.25/200-npe_driver.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/net/arm/Kconfig --- a/drivers/net/arm/Kconfig
=================================================================== +++ b/drivers/net/arm/Kconfig
--- linux-2.6.25.4.orig/drivers/net/arm/Kconfig @@ -47,3 +47,11 @@
+++ linux-2.6.25.4/drivers/net/arm/Kconfig
@@ -47,3 +47,11 @@ config EP93XX_ETH
help help
This is a driver for the ethernet hardware included in EP93xx CPUs. This is a driver for the ethernet hardware included in EP93xx CPUs.
Say Y if you are building a kernel for EP93xx based devices. Say Y if you are building a kernel for EP93xx based devices.
@ -14,19 +12,15 @@ Index: linux-2.6.25.4/drivers/net/arm/Kconfig
+ help + help
+ Say Y here if you want to use built-in Ethernet ports + Say Y here if you want to use built-in Ethernet ports
+ on IXP4xx processor. + on IXP4xx processor.
Index: linux-2.6.25.4/drivers/net/arm/Makefile --- a/drivers/net/arm/Makefile
=================================================================== +++ b/drivers/net/arm/Makefile
--- linux-2.6.25.4.orig/drivers/net/arm/Makefile @@ -9,3 +9,4 @@
+++ linux-2.6.25.4/drivers/net/arm/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_ARM_ETHER3) += ether3.o
obj-$(CONFIG_ARM_ETHER1) += ether1.o obj-$(CONFIG_ARM_ETHER1) += ether1.o
obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o
+obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o +obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o
Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c
@@ -0,0 +1,1265 @@ @@ -0,0 +1,1265 @@
+/* +/*
+ * Intel IXP4xx Ethernet driver for Linux + * Intel IXP4xx Ethernet driver for Linux
@ -1293,11 +1287,9 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
+MODULE_ALIAS("platform:ixp4xx_eth"); +MODULE_ALIAS("platform:ixp4xx_eth");
+module_init(eth_init_module); +module_init(eth_init_module);
+module_exit(eth_cleanup_module); +module_exit(eth_cleanup_module);
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c @@ -448,7 +448,9 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, co
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@ -1307,7 +1299,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
return 0; return 0;
} }
@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, vo @@ -484,7 +486,9 @@
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@ -1317,11 +1309,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
return 0; return 0;
} }
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c --- a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c @@ -184,6 +184,8 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int que
case 3: mask[0] = 0xFF; break; case 3: mask[0] = 0xFF; break;
} }

8
target/linux/ixp4xx/patches-2.6.25/201-npe_driver_print_license_location.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c @@ -592,6 +592,8 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -592,6 +592,8 @@ int npe_load_firmware(struct npe *npe, c
npe_reset(npe); npe_reset(npe);
#endif #endif

34
target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c --- a/drivers/net/arm/ixp4xx_eth.c
=================================================================== +++ b/drivers/net/arm/ixp4xx_eth.c
--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c @@ -165,14 +165,15 @@
+++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
@@ -165,14 +165,15 @@ struct port {
struct net_device *netdev; struct net_device *netdev;
struct napi_struct napi; struct napi_struct napi;
struct net_device_stats stat; struct net_device_stats stat;
@ -20,7 +18,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
}; };
/* NPE message structure */ /* NPE message structure */
@@ -316,12 +317,13 @@ static void mdio_write(struct net_device @@ -316,12 +317,13 @@
spin_unlock_irqrestore(&mdio_lock, flags); spin_unlock_irqrestore(&mdio_lock, flags);
} }
@ -36,7 +34,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
while (cycles < MAX_MII_RESET_RETRIES) { while (cycles < MAX_MII_RESET_RETRIES) {
if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) { if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {
@@ -335,12 +337,12 @@ static void phy_reset(struct net_device @@ -335,12 +337,12 @@
cycles++; cycles++;
} }
@ -52,7 +50,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
__raw_writel(DEFAULT_TX_CNTRL0 & ~TX_CNTRL0_HALFDUPLEX, __raw_writel(DEFAULT_TX_CNTRL0 & ~TX_CNTRL0_HALFDUPLEX,
&port->regs->tx_control[0]); &port->regs->tx_control[0]);
else else
@@ -348,7 +350,7 @@ static void eth_set_duplex(struct port * @@ -348,7 +350,7 @@
&port->regs->tx_control[0]); &port->regs->tx_control[0]);
} }
@ -61,7 +59,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
static void phy_check_media(struct port *port, int init) static void phy_check_media(struct port *port, int init)
{ {
if (mii_check_media(&port->mii, 1, init)) if (mii_check_media(&port->mii, 1, init))
@@ -367,7 +369,63 @@ static void phy_check_media(struct port @@ -367,7 +369,63 @@
} }
} }
} }
@ -125,7 +123,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
static void mdio_thread(struct work_struct *work) static void mdio_thread(struct work_struct *work)
{ {
@@ -792,9 +850,12 @@ static int eth_ioctl(struct net_device * @@ -792,9 +850,12 @@
if (!netif_running(dev)) if (!netif_running(dev))
return -EINVAL; return -EINVAL;
@ -140,7 +138,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
return err; return err;
} }
@@ -947,7 +1008,8 @@ static int eth_open(struct net_device *d @@ -947,7 +1008,8 @@
} }
} }
@ -150,7 +148,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
msg.cmd = NPE_VLAN_SETRXQOSENTRY; msg.cmd = NPE_VLAN_SETRXQOSENTRY;
@@ -1107,10 +1169,8 @@ static int eth_close(struct net_device * @@ -1107,10 +1169,8 @@
printk(KERN_CRIT "%s: unable to disable loopback\n", printk(KERN_CRIT "%s: unable to disable loopback\n",
dev->name); dev->name);
@ -163,7 +161,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
if (!ports_open) if (!ports_open)
qmgr_disable_irq(TXDONE_QUEUE); qmgr_disable_irq(TXDONE_QUEUE);
@@ -1120,6 +1180,42 @@ static int eth_close(struct net_device * @@ -1120,6 +1180,42 @@
return 0; return 0;
} }
@ -206,7 +204,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
static int __devinit eth_init_one(struct platform_device *pdev) static int __devinit eth_init_one(struct platform_device *pdev)
{ {
struct port *port; struct port *port;
@@ -1192,20 +1288,7 @@ static int __devinit eth_init_one(struct @@ -1192,20 +1288,7 @@
__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control); __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
udelay(50); udelay(50);
@ -228,11 +226,9 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread); INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread);
return 0; return 0;
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h --- a/include/asm-arm/arch-ixp4xx/platform.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/platform.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/platform.h @@ -95,12 +95,15 @@
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h
@@ -95,12 +95,15 @@ struct sys_timer;
#define IXP4XX_ETH_NPEB 0x10 #define IXP4XX_ETH_NPEB 0x10
#define IXP4XX_ETH_NPEC 0x20 #define IXP4XX_ETH_NPEC 0x20

10
target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c --- a/drivers/net/arm/ixp4xx_eth.c
=================================================================== +++ b/drivers/net/arm/ixp4xx_eth.c
--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c @@ -322,8 +322,12 @@
+++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
@@ -322,8 +322,12 @@ static void phy_reset(struct net_device
struct port *port = netdev_priv(dev); struct port *port = netdev_priv(dev);
int phy_id = port->mii[idx].phy_id; int phy_id = port->mii[idx].phy_id;
int cycles = 0; int cycles = 0;
@ -16,7 +14,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
while (cycles < MAX_MII_RESET_RETRIES) { while (cycles < MAX_MII_RESET_RETRIES) {
if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) { if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {
@@ -331,13 +335,23 @@ static void phy_reset(struct net_device @@ -331,13 +335,23 @@
printk(KERN_DEBUG "%s: phy_reset() took %i cycles\n", printk(KERN_DEBUG "%s: phy_reset() took %i cycles\n",
dev->name, cycles); dev->name, cycles);
#endif #endif

32
target/linux/ixp4xx/patches-2.6.25/204-npe_driver_ixp43x_support.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c @@ -575,8 +575,8 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -575,8 +575,8 @@ int npe_load_firmware(struct npe *npe, c
for (i = 0; i < image->size; i++) for (i = 0; i < image->size; i++)
image->data[i] = swab32(image->data[i]); image->data[i] = swab32(image->data[i]);
@ -13,7 +11,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
"IXP42x\n"); "IXP42x\n");
goto err; goto err;
} }
@@ -598,7 +598,7 @@ int npe_load_firmware(struct npe *npe, c @@ -598,7 +598,7 @@
"revision 0x%X:%X\n", (image->id >> 16) & 0xFF, "revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
(image->id >> 8) & 0xFF, image->id & 0xFF); (image->id >> 8) & 0xFF, image->id & 0xFF);
@ -22,10 +20,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/ixp4xx_npe.c
if (!npe->id) if (!npe->id)
instr_size = NPE_A_42X_INSTR_SIZE; instr_size = NPE_A_42X_INSTR_SIZE;
else else
Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c --- a/drivers/net/arm/ixp4xx_eth.c
=================================================================== +++ b/drivers/net/arm/ixp4xx_eth.c
--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c
+++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mii.h> #include <linux/mii.h>
@ -34,7 +30,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
#include <asm/arch/npe.h> #include <asm/arch/npe.h>
#include <asm/arch/qmgr.h> #include <asm/arch/qmgr.h>
@@ -1338,12 +1339,16 @@ static struct platform_driver drv = { @@ -1338,12 +1339,16 @@
static int __init eth_init_module(void) static int __init eth_init_module(void)
{ {
@ -55,11 +51,9 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
__raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control); __raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control);
return platform_driver_register(&drv); return platform_driver_register(&drv);
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/cpu.h --- a/include/asm-arm/arch-ixp4xx/cpu.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/cpu.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/cpu.h @@ -34,6 +34,8 @@
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/cpu.h
@@ -34,6 +34,8 @@ static inline u32 ixp4xx_read_feature_bi
val &= ~IXP4XX_FEATURE_RESERVED; val &= ~IXP4XX_FEATURE_RESERVED;
if (!cpu_is_ixp46x()) if (!cpu_is_ixp46x())
val &= ~IXP4XX_FEATURE_IXP46X_ONLY; val &= ~IXP4XX_FEATURE_IXP46X_ONLY;
@ -68,10 +62,8 @@ Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/cpu.h
return val; return val;
} }
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h --- a/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
@@ -628,11 +628,12 @@ @@ -628,11 +628,12 @@
#define IXP4XX_FEATURE_XSCALE_MAX_FREQ (3 << 22) #define IXP4XX_FEATURE_XSCALE_MAX_FREQ (3 << 22)
#define IXP4XX_FEATURE_RESERVED (0xFF << 24) #define IXP4XX_FEATURE_RESERVED (0xFF << 24)

20
target/linux/ixp4xx/patches-2.6.25/210-npe_hss.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/net/wan/Kconfig --- a/drivers/net/wan/Kconfig
=================================================================== +++ b/drivers/net/wan/Kconfig
--- linux-2.6.25.4.orig/drivers/net/wan/Kconfig @@ -338,6 +338,15 @@
+++ linux-2.6.25.4/drivers/net/wan/Kconfig
@@ -338,6 +338,15 @@ config DSCC4_PCI_RST
Say Y if your card supports this feature. Say Y if your card supports this feature.
@ -18,11 +16,9 @@ Index: linux-2.6.25.4/drivers/net/wan/Kconfig
config DLCI config DLCI
tristate "Frame Relay DLCI support" tristate "Frame Relay DLCI support"
---help--- ---help---
Index: linux-2.6.25.4/drivers/net/wan/Makefile --- a/drivers/net/wan/Makefile
=================================================================== +++ b/drivers/net/wan/Makefile
--- linux-2.6.25.4.orig/drivers/net/wan/Makefile @@ -42,6 +42,7 @@
+++ linux-2.6.25.4/drivers/net/wan/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_C101) += c101.o
obj-$(CONFIG_WANXL) += wanxl.o obj-$(CONFIG_WANXL) += wanxl.o
obj-$(CONFIG_PCI200SYN) += pci200syn.o obj-$(CONFIG_PCI200SYN) += pci200syn.o
obj-$(CONFIG_PC300TOO) += pc300too.o obj-$(CONFIG_PC300TOO) += pc300too.o
@ -30,10 +26,8 @@ Index: linux-2.6.25.4/drivers/net/wan/Makefile
clean-files := wanxlfw.inc clean-files := wanxlfw.inc
$(obj)/wanxl.o: $(obj)/wanxlfw.inc $(obj)/wanxl.o: $(obj)/wanxlfw.inc
Index: linux-2.6.25.4/drivers/net/wan/ixp4xx_hss.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/drivers/net/wan/ixp4xx_hss.c +++ b/drivers/net/wan/ixp4xx_hss.c
@@ -0,0 +1,2886 @@ @@ -0,0 +1,2886 @@
+/* +/*
+ * Intel IXP4xx HSS (synchronous serial port) driver for Linux + * Intel IXP4xx HSS (synchronous serial port) driver for Linux

26
target/linux/ixp4xx/patches-2.6.25/294-eeprom_new_notifier.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c --- a/drivers/i2c/chips/eeprom.c
=================================================================== +++ b/drivers/i2c/chips/eeprom.c
--- linux-2.6.25.4.orig/drivers/i2c/chips/eeprom.c
+++ linux-2.6.25.4/drivers/i2c/chips/eeprom.c
@@ -33,6 +33,8 @@ @@ -33,6 +33,8 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
@ -11,7 +9,7 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c
/* Addresses to scan */ /* Addresses to scan */
static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54, static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
@@ -41,26 +43,7 @@ static const unsigned short normal_i2c[] @@ -41,26 +43,7 @@
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(eeprom); I2C_CLIENT_INSMOD_1(eeprom);
@ -39,7 +37,7 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c
static int eeprom_attach_adapter(struct i2c_adapter *adapter); static int eeprom_attach_adapter(struct i2c_adapter *adapter);
static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind); static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind);
@@ -197,6 +180,7 @@ static int eeprom_detect(struct i2c_adap @@ -197,6 +180,7 @@
data->valid = 0; data->valid = 0;
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
data->nature = UNKNOWN; data->nature = UNKNOWN;
@ -47,7 +45,7 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c
/* Tell the I2C layer a new client has arrived */ /* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client))) if ((err = i2c_attach_client(new_client)))
@@ -224,6 +208,9 @@ static int eeprom_detect(struct i2c_adap @@ -224,6 +208,9 @@
if (err) if (err)
goto exit_detach; goto exit_detach;
@ -57,7 +55,7 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c
return 0; return 0;
exit_detach: exit_detach:
@@ -249,6 +236,41 @@ static int eeprom_detach_client(struct i @@ -249,6 +236,41 @@
return 0; return 0;
} }
@ -99,10 +97,8 @@ Index: linux-2.6.25.4/drivers/i2c/chips/eeprom.c
static int __init eeprom_init(void) static int __init eeprom_init(void)
{ {
return i2c_add_driver(&eeprom_driver); return i2c_add_driver(&eeprom_driver);
Index: linux-2.6.25.4/include/linux/eeprom.h
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/include/linux/eeprom.h +++ b/include/linux/eeprom.h
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+#ifndef _LINUX_EEPROM_H +#ifndef _LINUX_EEPROM_H
+#define _LINUX_EEPROM_H +#define _LINUX_EEPROM_H
@ -175,11 +171,9 @@ Index: linux-2.6.25.4/include/linux/eeprom.h
+extern int unregister_eeprom_notifier(struct notifier_block *nb); +extern int unregister_eeprom_notifier(struct notifier_block *nb);
+ +
+#endif /* _LINUX_EEPROM_H */ +#endif /* _LINUX_EEPROM_H */
Index: linux-2.6.25.4/include/linux/notifier.h --- a/include/linux/notifier.h
=================================================================== +++ b/include/linux/notifier.h
--- linux-2.6.25.4.orig/include/linux/notifier.h @@ -248,5 +248,8 @@
+++ linux-2.6.25.4/include/linux/notifier.h
@@ -248,5 +248,8 @@ extern struct blocking_notifier_head reb
#define VT_WRITE 0x0003 /* A char got output */ #define VT_WRITE 0x0003 /* A char got output */
#define VT_UPDATE 0x0004 /* A bigger update occurred */ #define VT_UPDATE 0x0004 /* A bigger update occurred */

28
target/linux/ixp4xx/patches-2.6.25/295-latch_led_driver.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
=================================================================== +++ b/drivers/leds/Kconfig
--- linux-2.6.25.4.orig/drivers/leds/Kconfig @@ -125,6 +125,12 @@
+++ linux-2.6.25.4/drivers/leds/Kconfig
@@ -125,6 +125,12 @@ config LEDS_GPIO
outputs. To be useful the particular board must have LEDs outputs. To be useful the particular board must have LEDs
and they must be connected to the GPIO lines. and they must be connected to the GPIO lines.
@ -15,10 +13,8 @@ Index: linux-2.6.25.4/drivers/leds/Kconfig
config LEDS_CM_X270 config LEDS_CM_X270
tristate "LED Support for the CM-X270 LEDs" tristate "LED Support for the CM-X270 LEDs"
depends on LEDS_CLASS && MACH_ARMCORE depends on LEDS_CLASS && MACH_ARMCORE
Index: linux-2.6.25.4/drivers/leds/leds-latch.c
===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/drivers/leds/leds-latch.c +++ b/drivers/leds/leds-latch.c
@@ -0,0 +1,141 @@ @@ -0,0 +1,141 @@
+/* +/*
+ * LEDs driver for Memory Latched Devices + * LEDs driver for Memory Latched Devices
@ -161,11 +157,9 @@ Index: linux-2.6.25.4/drivers/leds/leds-latch.c
+MODULE_AUTHOR("Chris Lang <clang@gateworks.com>"); +MODULE_AUTHOR("Chris Lang <clang@gateworks.com>");
+MODULE_DESCRIPTION("Latch LED driver"); +MODULE_DESCRIPTION("Latch LED driver");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
Index: linux-2.6.25.4/drivers/leds/Makefile --- a/drivers/leds/Makefile
=================================================================== +++ b/drivers/leds/Makefile
--- linux-2.6.25.4.orig/drivers/leds/Makefile @@ -19,6 +19,7 @@
+++ linux-2.6.25.4/drivers/leds/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_LEDS_H1940) += leds-h1940.
obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-cobalt-qube.o obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-cobalt-qube.o
obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
@ -173,11 +167,9 @@ Index: linux-2.6.25.4/drivers/leds/Makefile
obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o
obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o
obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o
Index: linux-2.6.25.4/include/linux/leds.h --- a/include/linux/leds.h
=================================================================== +++ b/include/linux/leds.h
--- linux-2.6.25.4.orig/include/linux/leds.h @@ -136,5 +136,18 @@
+++ linux-2.6.25.4/include/linux/leds.h
@@ -136,5 +136,18 @@ struct gpio_led_platform_data {
struct gpio_led *leds; struct gpio_led *leds;
}; };

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c --- a/arch/arm/mach-ixp4xx/avila-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/avila-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c @@ -132,6 +132,31 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
@@ -132,6 +132,31 @@ static struct platform_device avila_pata
.resource = avila_pata_resources, .resource = avila_pata_resources,
}; };
@ -34,7 +32,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
static struct platform_device *avila_devices[] __initdata = { static struct platform_device *avila_devices[] __initdata = {
&avila_i2c_gpio, &avila_i2c_gpio,
&avila_flash, &avila_flash,
@@ -159,6 +184,8 @@ static void __init avila_init(void) @@ -159,6 +184,8 @@
platform_device_register(&avila_pata); platform_device_register(&avila_pata);

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

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c --- a/arch/arm/mach-ixp4xx/avila-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/avila-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
@@ -14,10 +14,18 @@ @@ -14,10 +14,18 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
@ -35,7 +33,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
static struct flash_platform_data avila_flash_data = { static struct flash_platform_data avila_flash_data = {
.map_name = "cfi_probe", .map_name = "cfi_probe",
.width = 2, .width = 2,
@@ -163,10 +178,160 @@ static struct platform_device *avila_dev @@ -163,10 +178,160 @@
&avila_uart &avila_uart
}; };
@ -196,7 +194,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
avila_flash_resource.end = avila_flash_resource.end =
IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
@@ -184,9 +349,28 @@ static void __init avila_init(void) @@ -184,9 +349,28 @@
platform_device_register(&avila_pata); platform_device_register(&avila_pata);

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

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c --- a/arch/arm/mach-ixp4xx/avila-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/avila-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
# include <linux/eeprom.h> # include <linux/eeprom.h>
#endif #endif
@ -10,7 +8,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>
#include <asm/types.h> #include <asm/types.h>
@@ -172,6 +173,72 @@ static struct platform_device avila_npec @@ -172,6 +173,72 @@
.dev.platform_data = &avila_npec_data, .dev.platform_data = &avila_npec_data,
}; };
@ -83,7 +81,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
static struct platform_device *avila_devices[] __initdata = { static struct platform_device *avila_devices[] __initdata = {
&avila_i2c_gpio, &avila_i2c_gpio,
&avila_flash, &avila_flash,
@@ -182,6 +249,8 @@ static void __init avila_gw23xx_setup(vo @@ -182,6 +249,8 @@
{ {
platform_device_register(&avila_npeb_device); platform_device_register(&avila_npeb_device);
platform_device_register(&avila_npec_device); platform_device_register(&avila_npec_device);
@ -92,7 +90,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
} }
#ifdef CONFIG_SENSORS_EEPROM #ifdef CONFIG_SENSORS_EEPROM
@@ -189,6 +258,8 @@ static void __init avila_gw2342_setup(vo @@ -189,6 +258,8 @@
{ {
platform_device_register(&avila_npeb_device); platform_device_register(&avila_npeb_device);
platform_device_register(&avila_npec_device); platform_device_register(&avila_npec_device);
@ -101,7 +99,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
} }
static void __init avila_gw2345_setup(void) static void __init avila_gw2345_setup(void)
@@ -199,22 +270,30 @@ static void __init avila_gw2345_setup(vo @@ -199,22 +270,30 @@
avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */ avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */
platform_device_register(&avila_npec_device); platform_device_register(&avila_npec_device);
@ -132,7 +130,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
} }
static void __init avila_gw2355_setup(void) static void __init avila_gw2355_setup(void)
@@ -225,11 +304,29 @@ static void __init avila_gw2355_setup(vo @@ -225,11 +304,29 @@
avila_npec_data.phy = 16; avila_npec_data.phy = 16;
platform_device_register(&avila_npec_device); platform_device_register(&avila_npec_device);
@ -162,10 +160,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
} }
static struct avila_board_info avila_boards[] __initdata = { static struct avila_board_info avila_boards[] __initdata = {
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h --- a/include/asm-arm/arch-ixp4xx/avila.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/avila.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/avila.h
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h
@@ -36,4 +36,6 @@ @@ -36,4 +36,6 @@
#define AVILA_PCI_INTC_PIN 9 #define AVILA_PCI_INTC_PIN 9
#define AVILA_PCI_INTD_PIN 8 #define AVILA_PCI_INTD_PIN 8

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c --- a/arch/arm/mach-ixp4xx/avila-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/avila-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c @@ -239,10 +239,28 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
@@ -239,10 +239,28 @@ static struct platform_device avila_latc
.dev.platform_data = &avila_latch_leds_data, .dev.platform_data = &avila_latch_leds_data,
}; };
@ -32,10 +30,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
}; };
static void __init avila_gw23xx_setup(void) static void __init avila_gw23xx_setup(void)
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h --- a/include/asm-arm/arch-ixp4xx/avila.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/avila.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/avila.h
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h
@@ -39,3 +39,6 @@ @@ -39,3 +39,6 @@
/* User LEDs */ /* User LEDs */
#define AVILA_GW23XX_LED_USER_GPIO 3 #define AVILA_GW23XX_LED_USER_GPIO 3

26
target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c --- a/arch/arm/mach-ixp4xx/avila-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/avila-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c @@ -294,6 +294,7 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
@@ -294,6 +294,7 @@ static void __init avila_gw2345_setup(vo
static void __init avila_gw2347_setup(void) static void __init avila_gw2347_setup(void)
{ {
@ -10,7 +8,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
platform_device_register(&avila_npeb_device); platform_device_register(&avila_npeb_device);
avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO; avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
@@ -338,6 +339,7 @@ static void __init avila_gw2355_setup(vo @@ -338,6 +339,7 @@
static void __init avila_gw2357_setup(void) static void __init avila_gw2357_setup(void)
{ {
@ -18,11 +16,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c
platform_device_register(&avila_npeb_device); platform_device_register(&avila_npeb_device);
avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO; avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c --- a/drivers/net/arm/ixp4xx_eth.c
=================================================================== +++ b/drivers/net/arm/ixp4xx_eth.c
--- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c @@ -348,6 +348,14 @@
+++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
@@ -348,6 +348,14 @@ static void phy_reset(struct net_device
return; return;
} }
@ -37,11 +33,9 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c
/* restart auto negotiation */ /* restart auto negotiation */
bmcr = mdio_read(dev, phy_id, MII_BMCR); bmcr = mdio_read(dev, phy_id, MII_BMCR);
bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART); bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h --- a/include/asm-arm/arch-ixp4xx/platform.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/platform.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/platform.h @@ -104,6 +104,8 @@
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h
@@ -104,6 +104,8 @@ struct eth_plat_info {
u8 txreadyq; u8 txreadyq;
u8 hwaddr[6]; u8 hwaddr[6];
u32 phy_mask; u32 phy_mask;

8
target/linux/ixp4xx/patches-2.6.25/310-gtwx5717_spi_bus.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/gtwx5715-setup.c --- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/gtwx5715-setup.c
@@ -29,6 +29,8 @@ @@ -29,6 +29,8 @@
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -11,7 +9,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/gtwx5715-setup.c
#include <asm/types.h> #include <asm/types.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/memory.h> #include <asm/memory.h>
@@ -121,9 +123,41 @@ static struct platform_device gtwx5715_f @@ -121,9 +123,41 @@
.resource = &gtwx5715_flash_resource, .resource = &gtwx5715_flash_resource,
}; };

8
target/linux/ixp4xx/patches-2.6.25/311-gtwx5717_mac_plat_info.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/gtwx5715-setup.c --- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
=================================================================== +++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/gtwx5715-setup.c @@ -154,10 +154,37 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/gtwx5715-setup.c
@@ -154,10 +154,37 @@ static struct platform_device gtwx5715_s
}, },
}; };

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

@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/arm/common/dmabounce.c --- a/arch/arm/common/dmabounce.c
=================================================================== +++ b/arch/arm/common/dmabounce.c
--- linux-2.6.25.4.orig/arch/arm/common/dmabounce.c @@ -117,6 +117,10 @@
+++ linux-2.6.25.4/arch/arm/common/dmabounce.c
@@ -117,6 +117,10 @@ alloc_safe_buffer(struct dmabounce_devic
} else if (size <= device_info->large.size) { } else if (size <= device_info->large.size) {
pool = &device_info->large; pool = &device_info->large;
} else { } else {
@ -13,11 +11,9 @@ Index: linux-2.6.25.4/arch/arm/common/dmabounce.c
pool = NULL; pool = NULL;
} }
Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig --- a/arch/arm/mach-ixp4xx/Kconfig
=================================================================== +++ b/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig @@ -236,6 +236,11 @@
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig
@@ -236,6 +236,11 @@ config DMABOUNCE
default y default y
depends on PCI depends on PCI

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

@ -1,7 +1,5 @@
Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h --- a/include/asm-arm/arch-ixp4xx/avila.h
=================================================================== +++ b/include/asm-arm/arch-ixp4xx/avila.h
--- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/avila.h
+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/avila.h
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
/* /*
* AVILA PCI IRQs * AVILA PCI IRQs