diff options
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.24/204-npe_driver_ixp43x_support.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.24/204-npe_driver_ixp43x_support.patch | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.24/204-npe_driver_ixp43x_support.patch b/target/linux/ixp4xx/patches-2.6.24/204-npe_driver_ixp43x_support.patch index c0b55aa118..1bd576d896 100644 --- a/target/linux/ixp4xx/patches-2.6.24/204-npe_driver_ixp43x_support.patch +++ b/target/linux/ixp4xx/patches-2.6.24/204-npe_driver_ixp43x_support.patch @@ -1,7 +1,8 @@ -diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c ---- linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c 2008-04-22 12:24:29.000000000 +0200 -+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/ixp4xx_npe.c 2008-04-24 13:26:56.000000000 +0200 -@@ -571,8 +571,8 @@ +Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/ixp4xx_npe.c +=================================================================== +--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/ixp4xx_npe.c ++++ linux-2.6.24.7/arch/arm/mach-ixp4xx/ixp4xx_npe.c +@@ -571,8 +571,8 @@ int npe_load_firmware(struct npe *npe, c for (i = 0; i < image->size; i++) image->data[i] = swab32(image->data[i]); @@ -12,7 +13,7 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.24.2-owrt/a "IXP42x\n"); goto err; } -@@ -594,7 +594,7 @@ +@@ -594,7 +594,7 @@ int npe_load_firmware(struct npe *npe, c "revision 0x%X:%X\n", (image->id >> 16) & 0xFF, (image->id >> 8) & 0xFF, image->id & 0xFF); @@ -21,9 +22,10 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/ixp4xx_npe.c linux-2.6.24.2-owrt/a if (!npe->id) instr_size = NPE_A_42X_INSTR_SIZE; else -diff -Nur linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c linux-2.6.24.2-owrt/drivers/net/arm/ixp4xx_eth.c ---- linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c 2008-04-22 12:24:29.000000000 +0200 -+++ linux-2.6.24.2-owrt/drivers/net/arm/ixp4xx_eth.c 2008-04-24 18:23:24.000000000 +0200 +Index: linux-2.6.24.7/drivers/net/arm/ixp4xx_eth.c +=================================================================== +--- linux-2.6.24.7.orig/drivers/net/arm/ixp4xx_eth.c ++++ linux-2.6.24.7/drivers/net/arm/ixp4xx_eth.c @@ -32,6 +32,7 @@ #include <linux/kernel.h> #include <linux/mii.h> @@ -32,7 +34,7 @@ diff -Nur linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c linux-2.6.24.2-owrt/driver #include <asm/arch/npe.h> #include <asm/arch/qmgr.h> -@@ -1238,12 +1239,16 @@ +@@ -1335,12 +1336,16 @@ static struct platform_driver drv = { static int __init eth_init_module(void) { @@ -53,10 +55,11 @@ diff -Nur linux-2.6.24.2/drivers/net/arm/ixp4xx_eth.c linux-2.6.24.2-owrt/driver __raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control); return platform_driver_register(&drv); -diff -Nur linux-2.6.24.2/include/asm-arm/arch-ixp4xx/cpu.h linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/cpu.h ---- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/cpu.h 2008-04-22 12:24:29.000000000 +0200 -+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/cpu.h 2008-04-24 18:15:29.000000000 +0200 -@@ -34,6 +34,8 @@ +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/cpu.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/cpu.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/cpu.h +@@ -34,6 +34,8 @@ static inline u32 ixp4xx_read_feature_bi val &= ~IXP4XX_FEATURE_RESERVED; if (!cpu_is_ixp46x()) val &= ~IXP4XX_FEATURE_IXP46X_ONLY; @@ -65,9 +68,10 @@ diff -Nur linux-2.6.24.2/include/asm-arm/arch-ixp4xx/cpu.h linux-2.6.24.2-owrt/i return val; } -diff -Nur linux-2.6.24.2/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h ---- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2008-04-22 12:24:29.000000000 +0200 -+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2008-04-24 18:15:13.000000000 +0200 +Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h ++++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h @@ -628,11 +628,12 @@ #define IXP4XX_FEATURE_XSCALE_MAX_FREQ (3 << 22) #define IXP4XX_FEATURE_RESERVED (0xFF << 24) |