aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.32
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-03-26 10:45:25 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-03-26 10:45:25 +0000
commite66a368bd1c068d50e24bd906cfc6ef7009f7580 (patch)
tree62821cf6f2450be73a617420cf7e4b46f2641232 /target/linux/ar7/patches-2.6.32
parent797967480c2ec11fb788972de03cb35f076f95eb (diff)
downloadupstream-e66a368bd1c068d50e24bd906cfc6ef7009f7580.tar.gz
upstream-e66a368bd1c068d50e24bd906cfc6ef7009f7580.tar.bz2
upstream-e66a368bd1c068d50e24bd906cfc6ef7009f7580.zip
kernel: update to 2.6.32.10
SVN-Revision: 20444
Diffstat (limited to 'target/linux/ar7/patches-2.6.32')
-rw-r--r--target/linux/ar7/patches-2.6.32/100-board_support.patch6
-rw-r--r--target/linux/ar7/patches-2.6.32/500-serial_kludge.patch4
-rw-r--r--target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch30
-rw-r--r--target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch8
-rw-r--r--target/linux/ar7/patches-2.6.32/960-cpmac_allow_vlan.patch8
5 files changed, 24 insertions, 32 deletions
diff --git a/target/linux/ar7/patches-2.6.32/100-board_support.patch b/target/linux/ar7/patches-2.6.32/100-board_support.patch
index 0738354d89..8be4276ef7 100644
--- a/target/linux/ar7/patches-2.6.32/100-board_support.patch
+++ b/target/linux/ar7/patches-2.6.32/100-board_support.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
-@@ -1256,9 +1256,22 @@ void *set_except_vector(int n, void *add
+@@ -1255,9 +1255,22 @@ void *set_except_vector(int n, void *add
exception_handlers[n] = handler;
if (n == 0 && cpu_has_divec) {
@@ -28,7 +28,7 @@
}
--- a/arch/mips/include/asm/page.h
+++ b/arch/mips/include/asm/page.h
-@@ -185,8 +185,10 @@ typedef struct { unsigned long pgprot; }
+@@ -200,8 +200,10 @@ typedef struct { unsigned long pgprot; }
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
@@ -40,4 +40,4 @@
+ PHYS_OFFSET)
#include <asm-generic/memory_model.h>
- #include <asm-generic/page.h>
+ #include <asm-generic/getorder.h>
diff --git a/target/linux/ar7/patches-2.6.32/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.32/500-serial_kludge.patch
index 4d9bcb931f..fed6e715dd 100644
--- a/target/linux/ar7/patches-2.6.32/500-serial_kludge.patch
+++ b/target/linux/ar7/patches-2.6.32/500-serial_kludge.patch
@@ -1,6 +1,6 @@
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
-@@ -296,6 +296,13 @@ static const struct serial8250_config ua
+@@ -299,6 +299,13 @@ static const struct serial8250_config ua
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
.flags = UART_CAP_FIFO | UART_CAP_AFE,
},
@@ -14,7 +14,7 @@
};
#if defined (CONFIG_SERIAL_8250_AU1X00)
-@@ -2712,7 +2719,11 @@ static void serial8250_console_putchar(s
+@@ -2713,7 +2720,11 @@ static void serial8250_console_putchar(s
{
struct uart_8250_port *up = (struct uart_8250_port *)port;
diff --git a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch b/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
index e81c9bedb8..884d46d481 100644
--- a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
+++ b/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.32.9/arch/mips/ar7/platform.c
-===================================================================
---- linux-2.6.32.9.orig/arch/mips/ar7/platform.c 2010-03-07 13:09:00.000000000 +0100
-+++ linux-2.6.32.9/arch/mips/ar7/platform.c 2010-03-07 13:09:00.000000000 +0100
-@@ -716,23 +716,35 @@
+--- a/arch/mips/ar7/platform.c
++++ b/arch/mips/ar7/platform.c
+@@ -716,23 +716,35 @@ static int __init ar7_register_devices(v
}
if (ar7_has_high_cpmac()) {
@@ -45,11 +43,9 @@ Index: linux-2.6.32.9/arch/mips/ar7/platform.c
if (res)
return res;
-Index: linux-2.6.32.9/drivers/net/cpmac.c
-===================================================================
---- linux-2.6.32.9.orig/drivers/net/cpmac.c 2010-02-23 16:38:51.000000000 +0100
-+++ linux-2.6.32.9/drivers/net/cpmac.c 2010-03-07 13:24:56.000000000 +0100
-@@ -1153,6 +1153,8 @@
+--- a/drivers/net/cpmac.c
++++ b/drivers/net/cpmac.c
+@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct
goto fail;
}
@@ -58,7 +54,7 @@ Index: linux-2.6.32.9/drivers/net/cpmac.c
dev->irq = platform_get_irq_byname(pdev, "irq");
dev->netdev_ops = &cpmac_netdev_ops;
-@@ -1228,7 +1230,7 @@
+@@ -1228,7 +1230,7 @@ int __devinit cpmac_init(void)
cpmac_mii->reset = cpmac_mdio_reset;
cpmac_mii->irq = mii_irqs;
@@ -67,7 +63,7 @@ Index: linux-2.6.32.9/drivers/net/cpmac.c
if (!cpmac_mii->priv) {
printk(KERN_ERR "Can't ioremap mdio registers\n");
-@@ -1239,10 +1241,17 @@
+@@ -1239,10 +1241,17 @@ int __devinit cpmac_init(void)
#warning FIXME: unhardcode gpio&reset bits
ar7_gpio_disable(26);
ar7_gpio_disable(27);
@@ -87,7 +83,7 @@ Index: linux-2.6.32.9/drivers/net/cpmac.c
cpmac_mii->reset(cpmac_mii);
for (i = 0; i < 300; i++)
-@@ -1257,7 +1266,8 @@
+@@ -1257,7 +1266,8 @@ int __devinit cpmac_init(void)
mask = 0;
}
@@ -97,11 +93,9 @@ Index: linux-2.6.32.9/drivers/net/cpmac.c
snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
res = mdiobus_register(cpmac_mii);
-Index: a/arch/mips/include/asm/mach-ar7/ar7.h
-===================================================================
---- a/arch/mips/include/asm/mach-ar7/ar7.h (revision 19112)
-+++ b/arch/mips/include/asm/mach-ar7/ar7.h (working copy)
-@@ -44,8 +44,10 @@
+--- a/arch/mips/include/asm/mach-ar7/ar7.h
++++ b/arch/mips/include/asm/mach-ar7/ar7.h
+@@ -50,8 +50,10 @@
#define UR8_REGS_WDT (AR7_REGS_BASE + 0x0b00)
#define UR8_REGS_UART1 (AR7_REGS_BASE + 0x0f00)
diff --git a/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch b/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch
index b5ba861552..102b829749 100644
--- a/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch
+++ b/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.32.9/drivers/net/cpmac.c
-===================================================================
---- linux-2.6.32.9.orig/drivers/net/cpmac.c 2010-03-06 23:12:46.000000000 +0100
-+++ linux-2.6.32.9/drivers/net/cpmac.c 2010-03-06 23:13:14.000000000 +0100
-@@ -1132,8 +1132,9 @@
+--- a/drivers/net/cpmac.c
++++ b/drivers/net/cpmac.c
+@@ -1132,8 +1132,9 @@ static int __devinit cpmac_probe(struct
}
if (phy_id == PHY_MAX_ADDR) {
diff --git a/target/linux/ar7/patches-2.6.32/960-cpmac_allow_vlan.patch b/target/linux/ar7/patches-2.6.32/960-cpmac_allow_vlan.patch
index 022da4fab5..a0d5ec3c76 100644
--- a/target/linux/ar7/patches-2.6.32/960-cpmac_allow_vlan.patch
+++ b/target/linux/ar7/patches-2.6.32/960-cpmac_allow_vlan.patch
@@ -1,8 +1,8 @@
---- a/drivers/net/cpmac.c 2010-02-11 23:52:19.000000000 +0000
-+++ b/drivers/net/cpmac.c 2010-02-20 20:32:58.000000000 +0000
-@@ -57,7 +57,7 @@
+--- a/drivers/net/cpmac.c
++++ b/drivers/net/cpmac.c
+@@ -56,7 +56,7 @@ MODULE_PARM_DESC(dumb_switch, "Assume sw
- #define CPMAC_VERSION "0.5.0"
+ #define CPMAC_VERSION "0.5.1"
/* frame size + 802.1q tag */
-#define CPMAC_SKB_SIZE (ETH_FRAME_LEN + 4)
+#define CPMAC_SKB_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + 4)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 06:10:36 +0000