diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-07-01 22:28:16 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-07-01 22:28:16 +0000 |
| commit | 7484ad4108583bf6408ce2d5f23a1b018399f23c (patch) | |
| tree | a26733d2912f4399073a2e338ca515064bcf047a /target/linux/au1000/patches-2.6.34 | |
| parent | a92623b92a509f621a76b22078d5d2bacedd5dac (diff) | |
| download | upstream-7484ad4108583bf6408ce2d5f23a1b018399f23c.tar.gz upstream-7484ad4108583bf6408ce2d5f23a1b018399f23c.tar.bz2 upstream-7484ad4108583bf6408ce2d5f23a1b018399f23c.zip | |
add 2.6.34 support
SVN-Revision: 22041
Diffstat (limited to 'target/linux/au1000/patches-2.6.34')
4 files changed, 80 insertions, 0 deletions
diff --git a/target/linux/au1000/patches-2.6.34/001-mtx1_cmdline.patch b/target/linux/au1000/patches-2.6.34/001-mtx1_cmdline.patch new file mode 100644 index 0000000000..d5c5d4a84f --- /dev/null +++ b/target/linux/au1000/patches-2.6.34/001-mtx1_cmdline.patch @@ -0,0 +1,19 @@ +--- a/arch/mips/alchemy/mtx-1/init.c ++++ b/arch/mips/alchemy/mtx-1/init.c +@@ -33,6 +33,7 @@ + + #include <asm/bootinfo.h> + #include <asm/mach-au1x00/au1000.h> ++#include <asm/string.h> + + #include <prom.h> + +@@ -50,7 +51,7 @@ void __init prom_init(void) + prom_argv = (char **)fw_arg1; + prom_envp = (char **)fw_arg2; + +- prom_init_cmdline(); ++ strcpy(arcs_cmdline, CONFIG_CMDLINE); + + memsize_str = prom_getenv("memsize"); + if (!memsize_str) diff --git a/target/linux/au1000/patches-2.6.34/002-openwrt_rootfs.patch b/target/linux/au1000/patches-2.6.34/002-openwrt_rootfs.patch new file mode 100644 index 0000000000..e1056e93d9 --- /dev/null +++ b/target/linux/au1000/patches-2.6.34/002-openwrt_rootfs.patch @@ -0,0 +1,11 @@ +--- a/arch/mips/alchemy/mtx-1/platform.c ++++ b/arch/mips/alchemy/mtx-1/platform.c +@@ -90,7 +90,7 @@ static struct platform_device mtx1_gpio_ + + static struct mtd_partition mtx1_mtd_partitions[] = { + { +- .name = "filesystem", ++ .name = "rootfs", + .size = 0x01C00000, + .offset = 0, + }, diff --git a/target/linux/au1000/patches-2.6.34/003-au1000_eth_ioctl.patch b/target/linux/au1000/patches-2.6.34/003-au1000_eth_ioctl.patch new file mode 100644 index 0000000000..723cba332c --- /dev/null +++ b/target/linux/au1000/patches-2.6.34/003-au1000_eth_ioctl.patch @@ -0,0 +1,17 @@ +--- a/drivers/net/au1000_eth.c ++++ b/drivers/net/au1000_eth.c +@@ -971,10 +971,14 @@ static void au1000_multicast_list(struct + } + } + ++#define AU1000_KNOWN_PHY_IOCTLS (SIOCGMIIPHY & 0xfff0) + static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) + { + struct au1000_private *aup = netdev_priv(dev); + ++ if((cmd & AU1000_KNOWN_PHY_IOCTLS) != AU1000_KNOWN_PHY_IOCTLS) ++ return -EINVAL; ++ + if (!netif_running(dev)) return -EINVAL; + + if (!aup->phy_dev) return -EINVAL; // PHY not controllable diff --git a/target/linux/au1000/patches-2.6.34/004-mtx1_fix_pci.patch b/target/linux/au1000/patches-2.6.34/004-mtx1_fix_pci.patch new file mode 100644 index 0000000000..a637602d87 --- /dev/null +++ b/target/linux/au1000/patches-2.6.34/004-mtx1_fix_pci.patch @@ -0,0 +1,33 @@ +--- a/arch/mips/alchemy/mtx-1/board_setup.c ++++ b/arch/mips/alchemy/mtx-1/board_setup.c +@@ -67,7 +67,6 @@ static void mtx1_power_off(void) + + void __init board_setup(void) + { +- alchemy_gpio2_enable(); + + #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) + /* Enable USB power switch */ +@@ -107,21 +106,13 @@ void __init board_setup(void) + int + mtx1_pci_idsel(unsigned int devsel, int assert) + { +-#define MTX_IDSEL_ONLY_0_AND_3 0 +-#if MTX_IDSEL_ONLY_0_AND_3 +- if (devsel != 0 && devsel != 3) { +- printk(KERN_ERR "*** not 0 or 3\n"); +- return 0; +- } +-#endif +- + if (assert && devsel != 0) + /* Suppress signal to Cardbus */ + gpio_set_value(1, 0); /* set EXT_IO3 OFF */ + else + gpio_set_value(1, 1); /* set EXT_IO3 ON */ + +- au_sync_udelay(1); ++ udelay(1); + return 1; + } + |