ar7: remove patches/configs for old kernel versions

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26707 3c298f89-4303-0410-b956-a3cf2f4a3e73

15 files changed, 0 insertions, 1779 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
deleted file mode 100644
index 8be4276ef7..0000000000
--- a/target/linux/ar7/patches-2.6.32/100-board_support.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/arch/mips/kernel/traps.c
-+++ b/arch/mips/kernel/traps.c
-@@ -1255,9 +1255,22 @@ void *set_except_vector(int n, void *add
- 
- 	exception_handlers[n] = handler;
- 	if (n == 0 && cpu_has_divec) {
--		*(u32 *)(ebase + 0x200) = 0x08000000 |
--					  (0x03ffffff & (handler >> 2));
--		local_flush_icache_range(ebase + 0x200, ebase + 0x204);
-+		if ((handler ^ (ebase + 4)) & 0xfc000000) {
-+			/* lui k0, 0x0000 */
-+			*(u32 *)(ebase + 0x200) = 0x3c1a0000 | (handler >> 16);
-+			/* ori k0, 0x0000 */
-+			*(u32 *)(ebase + 0x204) =
-+					0x375a0000 | (handler & 0xffff);
-+			/* jr k0 */
-+			*(u32 *)(ebase + 0x208) = 0x03400008;
-+			/* nop */
-+			*(u32 *)(ebase + 0x20C) = 0x00000000;
-+			flush_icache_range(ebase + 0x200, ebase + 0x210);
-+		} else {
-+			*(u32 *)(ebase + 0x200) =
-+				0x08000000 | (0x03ffffff & (handler >> 2));
-+			flush_icache_range(ebase + 0x200, ebase + 0x204);
-+		}
- 	}
- 	return (void *)old_handler;
- }
---- a/arch/mips/include/asm/page.h
-+++ b/arch/mips/include/asm/page.h
-@@ -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)
- 
--#define UNCAC_ADDR(addr)	((addr) - PAGE_OFFSET + UNCAC_BASE)
--#define CAC_ADDR(addr)		((addr) - UNCAC_BASE + PAGE_OFFSET)
-+#define UNCAC_ADDR(addr)	((addr) - PAGE_OFFSET + UNCAC_BASE +	\
-+				 PHYS_OFFSET)
-+#define CAC_ADDR(addr)		((addr) - UNCAC_BASE + PAGE_OFFSET -	\
-+				 PHYS_OFFSET)
- 
- #include <asm-generic/memory_model.h>
- #include <asm-generic/getorder.h>
diff --git a/target/linux/ar7/patches-2.6.32/110-flash.patch b/target/linux/ar7/patches-2.6.32/110-flash.patch
deleted file mode 100644
index ae39770f29..0000000000
--- a/target/linux/ar7/patches-2.6.32/110-flash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/mtd/maps/physmap.c
-+++ b/drivers/mtd/maps/physmap.c
-@@ -80,7 +80,7 @@ static const char *rom_probe_types[] = {
- 					"map_rom",
- 					NULL };
- #ifdef CONFIG_MTD_PARTITIONS
--static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
-+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "ar7part", NULL };
- #endif
- 
- static int physmap_flash_probe(struct platform_device *dev)
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -98,7 +98,7 @@ static struct resource physmap_flash_res
- 	.name = "mem",
- 	.flags = IORESOURCE_MEM,
- 	.start = 0x10000000,
--	.end = 0x107fffff,
-+	.end = 0x11ffffff,
- };
- 
- static struct resource cpmac_low_res[] = {
diff --git a/target/linux/ar7/patches-2.6.32/120-gpio_chrdev.patch b/target/linux/ar7/patches-2.6.32/120-gpio_chrdev.patch
deleted file mode 100644
index be3614492a..0000000000
--- a/target/linux/ar7/patches-2.6.32/120-gpio_chrdev.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -987,6 +987,15 @@ config MWAVE
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called mwave.
- 
-+config AR7_GPIO
-+	tristate "TI AR7 GPIO Support"
-+	depends on AR7
-+	help
-+	  Give userspace access to the GPIO pins on the Texas Instruments AR7
-+	  processors.
-+
-+	  If compiled as a module, it will be called ar7_gpio.
-+
- config SCx200_GPIO
- 	tristate "NatSemi SCx200 GPIO Support"
- 	depends on SCx200
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -92,6 +92,7 @@ obj-$(CONFIG_HW_RANDOM)		+= hw_random/
- obj-$(CONFIG_PPDEV)		+= ppdev.o
- obj-$(CONFIG_NWBUTTON)		+= nwbutton.o
- obj-$(CONFIG_NWFLASH)		+= nwflash.o
-+obj-$(CONFIG_AR7_GPIO)		+= ar7_gpio.o
- obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio.o
- obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
diff --git a/target/linux/ar7/patches-2.6.32/130-clocks_devices_init.patch b/target/linux/ar7/patches-2.6.32/130-clocks_devices_init.patch
deleted file mode 100644
index 45f2e453e3..0000000000
--- a/target/linux/ar7/patches-2.6.32/130-clocks_devices_init.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -606,4 +606,4 @@ static int __init ar7_register_devices(v
- 
- 	return res;
- }
--arch_initcall(ar7_register_devices);
-+device_initcall(ar7_register_devices);
diff --git a/target/linux/ar7/patches-2.6.32/140-uart_port_ar7.patch b/target/linux/ar7/patches-2.6.32/140-uart_port_ar7.patch
deleted file mode 100644
index 3353c21fb1..0000000000
--- a/target/linux/ar7/patches-2.6.32/140-uart_port_ar7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-    AR7: use correct UART port type
-
-    PORT_AR7 has the correct TRIG flag (UART_FCR_R_TRIG_00) as well as UART_CAP_AFE
-    being set. This fixes kernel console on TNETD7300 revision 0x02 and has no side
-    effects on other revisions of the chip.
-
-    Signed-off-by: Florian Fainelli <florian@openwrt.org>
-
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -509,7 +509,7 @@ static int __init ar7_register_devices(v
- 
- 	memset(uart_port, 0, sizeof(struct uart_port) * 2);
- 
--	uart_port[0].type = PORT_16550A;
-+	uart_port[0].type = PORT_AR7;
- 	uart_port[0].line = 0;
- 	uart_port[0].irq = AR7_IRQ_UART0;
- 	uart_port[0].uartclk = ar7_bus_freq() / 2;
-@@ -524,7 +524,7 @@ static int __init ar7_register_devices(v
- 
- 	/* Only TNETD73xx have a second serial port */
- 	if (ar7_has_second_uart()) {
--		uart_port[1].type = PORT_16550A;
-+		uart_port[1].type = PORT_AR7;
- 		uart_port[1].line = 1;
- 		uart_port[1].irq = AR7_IRQ_UART1;
- 		uart_port[1].uartclk = ar7_bus_freq() / 2;
diff --git a/target/linux/ar7/patches-2.6.32/160-vlynq_try_remote_first.patch b/target/linux/ar7/patches-2.6.32/160-vlynq_try_remote_first.patch
deleted file mode 100644
index e75371bf99..0000000000
--- a/target/linux/ar7/patches-2.6.32/160-vlynq_try_remote_first.patch
+++ /dev/null
@@ -1,304 +0,0 @@
---- a/drivers/vlynq/vlynq.c
-+++ b/drivers/vlynq/vlynq.c
-@@ -103,6 +103,12 @@ static void vlynq_dump_mem(u32 *base, in
- }
- #endif
- 
-+u32 __vlynq_rev_reg(struct vlynq_regs *regs)
-+{
-+	return readl(&regs->revision);
-+}
-+EXPORT_SYMBOL(__vlynq_rev_reg);
-+
- /* Check the VLYNQ link status with a given device */
- static int vlynq_linked(struct vlynq_device *dev)
- {
-@@ -117,20 +123,40 @@ static int vlynq_linked(struct vlynq_dev
- 	return 0;
- }
- 
-+static volatile int vlynq_delay_value_new = 0;
-+
-+static void vlynq_delay_wait(u32 count)
-+{
-+	/* Code adopted from original vlynq driver */
-+	int i = 0;
-+	volatile int *ptr = &vlynq_delay_value_new;
-+	*ptr = 0;
-+
-+	/* We are assuming that the each cycle takes about
-+	 * 23 assembly instructions. */
-+	for(i = 0; i < (count + 23)/23; i++)
-+		*ptr = *ptr + 1;
-+}
-+
- static void vlynq_reset(struct vlynq_device *dev)
- {
-+	u32 rtm = readl(&dev->local->revision);
-+
-+	rtm = rtm < 0x00010205 || readl(&dev->local->status) & 0x800 == 0 ?
-+			0 : 0x600000;
-+
- 	writel(readl(&dev->local->control) | VLYNQ_CTRL_RESET,
- 			&dev->local->control);
- 
- 	/* Wait for the devices to finish resetting */
--	msleep(5);
-+	vlynq_delay_wait(0xffffff);
- 
- 	/* Remove reset bit */
--	writel(readl(&dev->local->control) & ~VLYNQ_CTRL_RESET,
-+	writel(readl(&dev->local->control) & ~VLYNQ_CTRL_RESET | rtm,
- 			&dev->local->control);
- 
- 	/* Give some time for the devices to settle */
--	msleep(5);
-+	vlynq_delay_wait(0xffffff);
- }
- 
- static void vlynq_irq_unmask(unsigned int irq)
-@@ -379,6 +405,61 @@ void vlynq_unregister_driver(struct vlyn
- }
- EXPORT_SYMBOL(vlynq_unregister_driver);
- 
-+enum vlynq_clk_src {
-+	vlynq_clk_external,
-+	vlynq_clk_local,
-+	vlynq_clk_remote,
-+	vlynq_clk_invalid,
-+};
-+
-+static int __vlynq_set_clocks(struct vlynq_device *dev,
-+				enum vlynq_clk_src clk_dir,
-+				int lclk_div, int rclk_div)
-+{
-+	u32 reg;
-+
-+	if (clk_dir == vlynq_clk_invalid) {
-+		printk(KERN_ERR "%s: attempt to set invalid clocking\n",
-+				dev_name(&dev->dev));
-+		return -EINVAL;
-+	}
-+
-+	reg = readl(&dev->local->control);
-+	if (readl(&dev->local->revision) < 0x00010205) {
-+		if (clk_dir & vlynq_clk_local)
-+			reg |= VLYNQ_CTRL_CLOCK_INT;
-+		else
-+			reg &= ~VLYNQ_CTRL_CLOCK_INT;
-+	}
-+	reg &= ~VLYNQ_CTRL_CLOCK_MASK;
-+	reg |= VLYNQ_CTRL_CLOCK_DIV(lclk_div);
-+	writel(reg, &dev->local->control);
-+
-+	if (!vlynq_linked(dev))
-+		return -ENODEV;
-+
-+	printk(KERN_INFO "%s: local VLYNQ protocol rev. is 0x%08x\n",
-+			dev_name(&dev->dev), readl(&dev->local->revision));
-+	printk(KERN_INFO "%s: remote VLYNQ protocol rev. is 0x%08x\n",
-+			dev_name(&dev->dev), readl(&dev->remote->revision));
-+
-+	reg = readl(&dev->remote->control);
-+	if (readl(&dev->remote->revision) < 0x00010205) {
-+		if (clk_dir & vlynq_clk_remote)
-+			reg |= VLYNQ_CTRL_CLOCK_INT;
-+		else
-+			reg &= ~VLYNQ_CTRL_CLOCK_INT;
-+	}
-+	reg &= ~VLYNQ_CTRL_CLOCK_MASK;
-+	reg |= VLYNQ_CTRL_CLOCK_DIV(rclk_div);
-+	writel(reg, &dev->remote->control);
-+
-+	if (!vlynq_linked(dev))
-+		return -ENODEV;
-+
-+	return 0;
-+}
-+
- /*
-  * A VLYNQ remote device can clock the VLYNQ bus master
-  * using a dedicated clock line. In that case, both the
-@@ -392,29 +473,17 @@ static int __vlynq_try_remote(struct vly
- 	int i;
- 
- 	vlynq_reset(dev);
--	for (i = dev->dev_id ? vlynq_rdiv2 : vlynq_rdiv8; dev->dev_id ?
--			i <= vlynq_rdiv8 : i >= vlynq_rdiv2;
--		dev->dev_id ? i++ : i--) {
-+	for (i = dev->dev_id ? 0 : 7; dev->dev_id ? i <= 7 : i >= 0;
-+			dev->dev_id ? i++ : i--) {
- 
- 		if (!vlynq_linked(dev))
- 			break;
- 
--		writel((readl(&dev->remote->control) &
--				~VLYNQ_CTRL_CLOCK_MASK) |
--				VLYNQ_CTRL_CLOCK_INT |
--				VLYNQ_CTRL_CLOCK_DIV(i - vlynq_rdiv1),
--				&dev->remote->control);
--		writel((readl(&dev->local->control)
--				& ~(VLYNQ_CTRL_CLOCK_INT |
--				VLYNQ_CTRL_CLOCK_MASK)) |
--				VLYNQ_CTRL_CLOCK_DIV(i - vlynq_rdiv1),
--				&dev->local->control);
--
--		if (vlynq_linked(dev)) {
--			printk(KERN_DEBUG
--				"%s: using remote clock divisor %d\n",
--				dev_name(&dev->dev), i - vlynq_rdiv1 + 1);
--			dev->divisor = i;
-+		if (!__vlynq_set_clocks(dev, vlynq_clk_remote, i, i)) {
-+			printk(KERN_INFO
-+					"%s: using remote clock divisor %d\n",
-+					dev_name(&dev->dev), i + 1);
-+			dev->divisor = i + vlynq_rdiv1;
- 			return 0;
- 		} else {
- 			vlynq_reset(dev);
-@@ -437,21 +506,14 @@ static int __vlynq_try_local(struct vlyn
- 
- 	vlynq_reset(dev);
- 
--	for (i = dev->dev_id ? vlynq_ldiv2 : vlynq_ldiv8; dev->dev_id ?
--			i <= vlynq_ldiv8 : i >= vlynq_ldiv2;
--		dev->dev_id ? i++ : i--) {
--
--		writel((readl(&dev->local->control) &
--				~VLYNQ_CTRL_CLOCK_MASK) |
--				VLYNQ_CTRL_CLOCK_INT |
--				VLYNQ_CTRL_CLOCK_DIV(i - vlynq_ldiv1),
--				&dev->local->control);
--
--		if (vlynq_linked(dev)) {
--			printk(KERN_DEBUG
--				"%s: using local clock divisor %d\n",
--				dev_name(&dev->dev), i - vlynq_ldiv1 + 1);
--			dev->divisor = i;
-+	for (i = dev->dev_id ? 0 : 7; dev->dev_id ? i <= 7 : i >= 0;
-+			dev->dev_id ? i++ : i--) {
-+
-+		if (!__vlynq_set_clocks(dev, vlynq_clk_local, i, 0)) {
-+			printk(KERN_INFO
-+					"%s: using local clock divisor %d\n",
-+					dev_name(&dev->dev), i + 1);
-+			dev->divisor = i + vlynq_ldiv1;
- 			return 0;
- 		} else {
- 			vlynq_reset(dev);
-@@ -473,18 +535,10 @@ static int __vlynq_try_external(struct v
- 	if (!vlynq_linked(dev))
- 		return -ENODEV;
- 
--	writel((readl(&dev->remote->control) &
--			~VLYNQ_CTRL_CLOCK_INT),
--			&dev->remote->control);
--
--	writel((readl(&dev->local->control) &
--			~VLYNQ_CTRL_CLOCK_INT),
--			&dev->local->control);
--
--	if (vlynq_linked(dev)) {
--		printk(KERN_DEBUG "%s: using external clock\n",
--			dev_name(&dev->dev));
--			dev->divisor = vlynq_div_external;
-+	if (!__vlynq_set_clocks(dev, vlynq_clk_external, 0, 0)) {
-+		printk(KERN_INFO "%s: using external clock\n",
-+				dev_name(&dev->dev));
-+				dev->divisor = vlynq_div_external;
- 		return 0;
- 	}
- 
-@@ -507,18 +561,9 @@ static int __vlynq_enable_device(struct
- 		 * generation negotiated by hardware.
- 		 * Check which device is generating clocks and perform setup
- 		 * accordingly */
--		if (vlynq_linked(dev) && readl(&dev->remote->control) &
--		   VLYNQ_CTRL_CLOCK_INT) {
--			if (!__vlynq_try_remote(dev) ||
--				!__vlynq_try_local(dev)  ||
--				!__vlynq_try_external(dev))
--				return 0;
--		} else {
--			if (!__vlynq_try_external(dev) ||
--				!__vlynq_try_local(dev)    ||
--				!__vlynq_try_remote(dev))
--				return 0;
--		}
-+		if (!__vlynq_try_remote(dev) || !__vlynq_try_local(dev) ||
-+						!__vlynq_try_external(dev))
-+			return 0;
- 		break;
- 	case vlynq_ldiv1:
- 	case vlynq_ldiv2:
-@@ -528,15 +573,12 @@ static int __vlynq_enable_device(struct
- 	case vlynq_ldiv6:
- 	case vlynq_ldiv7:
- 	case vlynq_ldiv8:
--		writel(VLYNQ_CTRL_CLOCK_INT |
--			VLYNQ_CTRL_CLOCK_DIV(dev->divisor -
--			vlynq_ldiv1), &dev->local->control);
--		writel(0, &dev->remote->control);
--		if (vlynq_linked(dev)) {
--			printk(KERN_DEBUG
--				"%s: using local clock divisor %d\n",
--				dev_name(&dev->dev),
--				dev->divisor - vlynq_ldiv1 + 1);
-+		if (!__vlynq_set_clocks(dev, vlynq_clk_local, dev->divisor -
-+				vlynq_ldiv1, 0)) {
-+			printk(KERN_INFO
-+					"%s: using local clock divisor %d\n",
-+					dev_name(&dev->dev),
-+					dev->divisor - vlynq_ldiv1 + 1);
- 			return 0;
- 		}
- 		break;
-@@ -548,15 +590,12 @@ static int __vlynq_enable_device(struct
- 	case vlynq_rdiv6:
- 	case vlynq_rdiv7:
- 	case vlynq_rdiv8:
--		writel(0, &dev->local->control);
--		writel(VLYNQ_CTRL_CLOCK_INT |
--			VLYNQ_CTRL_CLOCK_DIV(dev->divisor -
--			vlynq_rdiv1), &dev->remote->control);
--		if (vlynq_linked(dev)) {
--			printk(KERN_DEBUG
--				"%s: using remote clock divisor %d\n",
--				dev_name(&dev->dev),
--				dev->divisor - vlynq_rdiv1 + 1);
-+		if (!__vlynq_set_clocks(dev, vlynq_clk_remote, 0,
-+				dev->divisor - vlynq_rdiv1)) {
-+			printk(KERN_INFO
-+					"%s: using remote clock divisor %d\n",
-+					dev_name(&dev->dev),
-+					dev->divisor - vlynq_rdiv1 + 1);
- 			return 0;
- 		}
- 		break;
-@@ -732,13 +771,12 @@ static int vlynq_probe(struct platform_d
- 	platform_set_drvdata(pdev, dev);
- 
- 	printk(KERN_INFO "%s: regs 0x%p, irq %d, mem 0x%p\n",
--	       dev_name(&dev->dev), (void *)dev->regs_start, dev->irq,
--	       (void *)dev->mem_start);
-+			dev_name(&dev->dev), (void *)dev->regs_start,
-+			dev->irq, (void *)dev->mem_start);
- 
- 	dev->dev_id = 0;
- 	dev->divisor = vlynq_div_auto;
--	result = __vlynq_enable_device(dev);
--	if (result == 0) {
-+	if (!__vlynq_enable_device(dev)) {
- 		dev->dev_id = readl(&dev->remote->chip);
- 		((struct plat_vlynq_ops *)(dev->dev.platform_data))->off(dev);
- 	}
---- a/include/linux/vlynq.h
-+++ b/include/linux/vlynq.h
-@@ -98,6 +98,7 @@ static inline struct vlynq_device *to_vl
- 
- extern struct bus_type vlynq_bus_type;
- 
-+extern u32 __vlynq_rev_reg(struct vlynq_regs *regs);
- extern int __vlynq_register_driver(struct vlynq_driver *driver,
- 				   struct module *owner);
- 
diff --git a/target/linux/ar7/patches-2.6.32/170-clocks_init_earlier.patch b/target/linux/ar7/patches-2.6.32/170-clocks_init_earlier.patch
deleted file mode 100644
index a0b384aae9..0000000000
--- a/target/linux/ar7/patches-2.6.32/170-clocks_init_earlier.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/arch/mips/ar7/clock.c
-+++ b/arch/mips/ar7/clock.c
-@@ -232,12 +232,12 @@ static void tnetd7300_set_clock(u32 shif
- 	calculate(base_clock, frequency, &prediv, &postdiv, &mul);
- 
- 	writel(((prediv - 1) << PREDIV_SHIFT) | (postdiv - 1), &clock->ctrl);
--	msleep(1);
-+	mdelay(1);
- 	writel(4, &clock->pll);
- 	while (readl(&clock->pll) & PLL_STATUS)
- 		;
- 	writel(((mul - 1) << MUL_SHIFT) | (0xff << 3) | 0x0e, &clock->pll);
--	msleep(75);
-+	mdelay(75);
- }
- 
- static void __init tnetd7300_init_clocks(void)
-@@ -407,7 +407,7 @@ static void __init tnetd7200_init_clocks
- 	iounmap(bootcr);
- }
- 
--int __init ar7_init_clocks(void)
-+void __init ar7_init_clocks(void)
- {
- 	switch (ar7_chip_id()) {
- 	case AR7_CHIP_7100:
-@@ -421,7 +421,4 @@ int __init ar7_init_clocks(void)
- 	default:
- 		break;
- 	}
--
--	return 0;
- }
--arch_initcall(ar7_init_clocks);
---- a/arch/mips/ar7/time.c
-+++ b/arch/mips/ar7/time.c
-@@ -26,5 +26,7 @@
- 
- void __init plat_time_init(void)
- {
-+	ar7_init_clocks();
-+
- 	mips_hpt_frequency = ar7_cpu_freq() / 2;
- }
---- a/arch/mips/include/asm/mach-ar7/ar7.h
-+++ b/arch/mips/include/asm/mach-ar7/ar7.h
-@@ -178,4 +178,6 @@ static inline void ar7_device_off(u32 bi
- 	msleep(20);
- }
- 
-+extern void __init ar7_init_clocks(void);
-+
- #endif /* __AR7_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
deleted file mode 100644
index fed6e715dd..0000000000
--- a/target/linux/ar7/patches-2.6.32/500-serial_kludge.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/serial/8250.c
-+++ b/drivers/serial/8250.c
-@@ -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,
- 	},
-+	[PORT_AR7] = {
-+		.name		= "TI-AR7",
-+		.fifo_size	= 16,
-+		.tx_loadsz	= 16,
-+		.fcr		= UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
-+		.flags		= UART_CAP_FIFO | UART_CAP_AFE,
-+	},
- };
- 
- #if defined (CONFIG_SERIAL_8250_AU1X00)
-@@ -2713,7 +2720,11 @@ static void serial8250_console_putchar(s
- {
- 	struct uart_8250_port *up = (struct uart_8250_port *)port;
- 
-+#ifdef CONFIG_AR7
-+	wait_for_xmitr(up, BOTH_EMPTY);
-+#else
- 	wait_for_xmitr(up, UART_LSR_THRE);
-+#endif
- 	serial_out(up, UART_TX, ch);
- }
- 
diff --git a/target/linux/ar7/patches-2.6.32/920-ar7part.patch b/target/linux/ar7/patches-2.6.32/920-ar7part.patch
deleted file mode 100644
index 31e4816724..0000000000
--- a/target/linux/ar7/patches-2.6.32/920-ar7part.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/drivers/mtd/ar7part.c
-+++ b/drivers/mtd/ar7part.c
-@@ -27,12 +27,14 @@
- #include <linux/mtd/partitions.h>
- #include <linux/bootmem.h>
- #include <linux/magic.h>
-+#include <asm/mach-ar7/prom.h>
- 
- #define AR7_PARTS	4
- #define ROOT_OFFSET	0xe0000
- 
- #define LOADER_MAGIC1	le32_to_cpu(0xfeedfa42)
- #define LOADER_MAGIC2	le32_to_cpu(0xfeed1281)
-+#define LOADER_MAGIC3	le32_to_cpu(0x434d4d4c)
- 
- #ifndef SQUASHFS_MAGIC
- #define SQUASHFS_MAGIC	0x73717368
-@@ -44,6 +46,10 @@ struct ar7_bin_rec {
- 	unsigned int address;
- };
- 
-+int create_titan_partitions(struct mtd_info *master,
-+        struct mtd_partition **pparts,
-+        unsigned long origin);
-+
- static int create_mtd_partitions(struct mtd_info *master,
- 				 struct mtd_partition **pparts,
- 				 unsigned long origin)
-@@ -57,6 +63,16 @@ static int create_mtd_partitions(struct
- 	int retries = 10;
- 	struct mtd_partition *ar7_parts;
- 
-+	const char *prod_id ;
-+	prod_id = prom_getenv("ProductID");
-+	if(prod_id &&
-+		(strcmp(prod_id, "CYWL")==0 ||
-+		strcmp(prod_id, "CYWM")==0 ||
-+		strcmp(prod_id, "CYLM")==0 ||
-+		strcmp(prod_id, "CYLL")==0)){
-+		return create_titan_partitions(master, pparts, origin);
-+	}
-+
- 	ar7_parts = kzalloc(sizeof(*ar7_parts) * AR7_PARTS, GFP_KERNEL);
- 	if (!ar7_parts)
- 		return -ENOMEM;
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
- obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
-+obj-$(CONFIG_MTD_AR7_PARTS)	+= titanpart.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
- obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
- 
diff --git a/target/linux/ar7/patches-2.6.32/930-titan-platform.patch b/target/linux/ar7/patches-2.6.32/930-titan-platform.patch
deleted file mode 100644
index b7ecfc2d12..0000000000
--- a/target/linux/ar7/patches-2.6.32/930-titan-platform.patch
+++ /dev/null
@@ -1,772 +0,0 @@
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -131,6 +131,36 @@ static struct resource cpmac_high_res[]
- 	},
- };
- 
-+static struct resource cpmac_low_res_titan[] = {
-+	{
-+		.name = "regs",
-+		.flags = IORESOURCE_MEM,
-+		.start = TITAN_REGS_MAC0,
-+		.end = TITAN_REGS_MAC0 + 0x7ff,
-+	},
-+	{
-+		.name = "irq",
-+		.flags = IORESOURCE_IRQ,
-+		.start = 27,
-+		.end = 27,
-+	},
-+};
-+
-+static struct resource cpmac_high_res_titan[] = {
-+	{
-+		.name = "regs",
-+		.flags = IORESOURCE_MEM,
-+		.start = TITAN_REGS_MAC1,
-+		.end = TITAN_REGS_MAC1 + 0x7ff,
-+	},
-+	{
-+		.name = "irq",
-+		.flags = IORESOURCE_IRQ,
-+		.start = 41,
-+		.end = 41,
-+	},
-+};
-+
- static struct resource vlynq_low_res[] = {
- 	{
- 		.name = "regs",
-@@ -185,6 +215,60 @@ static struct resource vlynq_high_res[]
- 	},
- };
- 
-+static struct resource vlynq_low_res_titan[] = {
-+	{
-+		.name = "regs",
-+		.flags = IORESOURCE_MEM,
-+		.start = TITAN_REGS_VLYNQ0,
-+		.end = TITAN_REGS_VLYNQ0 + 0xff,
-+	},
-+	{
-+		.name = "irq",
-+		.flags = IORESOURCE_IRQ,
-+		.start = 33,
-+		.end = 33,
-+	},
-+	{
-+		.name = "mem",
-+		.flags = IORESOURCE_MEM,
-+		.start = 0x0c000000,
-+		.end = 0x0fffffff,
-+	},
-+	{
-+		.name = "devirq",
-+		.flags = IORESOURCE_IRQ,
-+		.start = 80,
-+		.end = 111,
-+	},
-+};
-+
-+static struct resource vlynq_high_res_titan[] = {
-+	{
-+		.name = "regs",
-+		.flags = IORESOURCE_MEM,
-+		.start = TITAN_REGS_VLYNQ1,
-+		.end = TITAN_REGS_VLYNQ1 + 0xff,
-+	},
-+	{
-+		.name = "irq",
-+		.flags = IORESOURCE_IRQ,
-+		.start = 34,
-+		.end = 34,
-+	},
-+	{
-+		.name = "mem",
-+		.flags = IORESOURCE_MEM,
-+		.start = 0x40000000,
-+		.end = 0x43ffffff,
-+	},
-+	{
-+		.name = "devirq",
-+		.flags = IORESOURCE_IRQ,
-+		.start = 112,
-+		.end = 143,
-+	},
-+};
-+
- static struct resource usb_res[] = {
- 	{
- 		.name = "regs",
-@@ -228,6 +312,18 @@ static struct plat_cpmac_data cpmac_high
- 	.phy_mask = 0x7fffffff,
- };
- 
-+static struct plat_cpmac_data cpmac_low_data_titan = {
-+	.reset_bit = 17,
-+	.power_bit = 20,
-+	.phy_mask = 0x40000000,
-+};
-+
-+static struct plat_cpmac_data cpmac_high_data_titan = {
-+	.reset_bit = 21,
-+	.power_bit = 22,
-+	.phy_mask = 0x80000000,
-+};
-+
- static struct plat_vlynq_data vlynq_low_data = {
- 	.ops.on = vlynq_on,
- 	.ops.off = vlynq_off,
-@@ -242,6 +338,20 @@ static struct plat_vlynq_data vlynq_high
- 	.gpio_bit = 19,
- };
- 
-+static struct plat_vlynq_data vlynq_low_data_titan = {
-+	.ops.on = vlynq_on,
-+	.ops.off = vlynq_off,
-+	.reset_bit = 15,
-+	.gpio_bit = 14,
-+};
-+
-+static struct plat_vlynq_data vlynq_high_data_titan = {
-+	.ops.on = vlynq_on,
-+	.ops.off = vlynq_off,
-+	.reset_bit = 16,
-+	.gpio_bit = 7,
-+};
-+
- static struct platform_device physmap_flash = {
- 	.id = 0,
- 	.name = "physmap-flash",
-@@ -275,6 +385,30 @@ static struct platform_device cpmac_high
- 	.num_resources = ARRAY_SIZE(cpmac_high_res),
- };
- 
-+static struct platform_device cpmac_low_titan = {
-+	.id = 0,
-+	.name = "cpmac",
-+	.dev = {
-+		.dma_mask = &cpmac_dma_mask,
-+		.coherent_dma_mask = DMA_BIT_MASK(32),
-+		.platform_data = &cpmac_low_data_titan,
-+	},
-+	.resource = cpmac_low_res_titan,
-+	.num_resources = ARRAY_SIZE(cpmac_low_res_titan),
-+};
-+
-+static struct platform_device cpmac_high_titan = {
-+	.id = 1,
-+	.name = "cpmac",
-+	.dev = {
-+		.dma_mask = &cpmac_dma_mask,
-+		.coherent_dma_mask = DMA_BIT_MASK(32),
-+		.platform_data = &cpmac_high_data_titan,
-+	},
-+	.resource = cpmac_high_res_titan,
-+	.num_resources = ARRAY_SIZE(cpmac_high_res_titan),
-+};
-+
- static struct platform_device vlynq_low = {
- 	.id = 0,
- 	.name = "vlynq",
-@@ -291,6 +425,22 @@ static struct platform_device vlynq_high
- 	.num_resources = ARRAY_SIZE(vlynq_high_res),
- };
- 
-+static struct platform_device vlynq_low_titan = {
-+	.id = 0,
-+	.name = "vlynq",
-+	.dev.platform_data = &vlynq_low_data_titan,
-+	.resource = vlynq_low_res_titan,
-+	.num_resources = ARRAY_SIZE(vlynq_low_res_titan),
-+};
-+
-+static struct platform_device vlynq_high_titan = {
-+	.id = 1,
-+	.name = "vlynq",
-+	.dev.platform_data = &vlynq_high_data_titan,
-+	.resource = vlynq_high_res_titan,
-+	.num_resources = ARRAY_SIZE(vlynq_high_res_titan),
-+};
-+
- 
- static struct gpio_led default_leds[] = {
- 	{
-@@ -300,6 +450,11 @@ static struct gpio_led default_leds[] =
- 	},
- };
- 
-+static struct gpio_led titan_leds[] = {
-+	{ .name = "status", .gpio = 8, .active_low = 1, },
-+	{ .name = "wifi", .gpio = 13, .active_low = 1, },
-+};
-+
- static struct gpio_led dsl502t_leds[] = {
- 	{
- 		.name = "status",
-@@ -496,6 +651,9 @@ static void __init detect_leds(void)
- 	} else if (strstr(prid, "DG834")) {
- 		ar7_led_data.num_leds = ARRAY_SIZE(dg834g_leds);
- 		ar7_led_data.leds = dg834g_leds;
-+	} else if (strstr(prid, "CYWM") || strstr(prid, "CYWL")) {
-+		ar7_led_data.num_leds = ARRAY_SIZE(titan_leds);
-+		ar7_led_data.leds = titan_leds;
- 	}
- }
- 
-@@ -541,14 +699,18 @@ static int __init ar7_register_devices(v
- 	if (res)
- 		return res;
- 
--	ar7_device_disable(vlynq_low_data.reset_bit);
--	res = platform_device_register(&vlynq_low);
-+	ar7_device_disable(ar7_is_titan() ? vlynq_low_data_titan.reset_bit :
-+		vlynq_low_data.reset_bit);
-+	res = platform_device_register(ar7_is_titan() ? &vlynq_low_titan :
-+		&vlynq_low);
- 	if (res)
- 		return res;
- 
- 	if (ar7_has_high_vlynq()) {
--		ar7_device_disable(vlynq_high_data.reset_bit);
--		res = platform_device_register(&vlynq_high);
-+		ar7_device_disable(ar7_is_titan() ? vlynq_high_data_titan.reset_bit :
-+			vlynq_high_data.reset_bit);
-+		res = platform_device_register(ar7_is_titan() ? &vlynq_high_titan :
-+			&vlynq_high);
- 		if (res)
- 			return res;
- 	}
---- a/arch/mips/ar7/gpio.c
-+++ b/arch/mips/ar7/gpio.c
-@@ -21,11 +21,11 @@
- 
- #include <asm/mach-ar7/gpio.h>
- 
--static const char *ar7_gpio_list[AR7_GPIO_MAX];
-+static const char *ar7_gpio_list[TITAN_GPIO_MAX];
- 
- int gpio_request(unsigned gpio, const char *label)
- {
--	if (gpio >= AR7_GPIO_MAX)
-+	if (gpio >= (ar7_is_titan() ? TITAN_GPIO_MAX : AR7_GPIO_MAX))
- 		return -EINVAL;
- 
- 	if (ar7_gpio_list[gpio])
---- a/arch/mips/ar7/setup.c
-+++ b/arch/mips/ar7/setup.c
-@@ -23,6 +23,9 @@
- #include <asm/reboot.h>
- #include <asm/mach-ar7/ar7.h>
- #include <asm/mach-ar7/prom.h>
-+#include <asm/mach-ar7/gpio.h>
-+
-+static int titan_variant;
- 
- static void ar7_machine_restart(char *command)
- {
-@@ -55,6 +58,18 @@ const char *get_system_type(void)
- 		return "TI AR7 (TNETD7100)";
- 	case AR7_CHIP_7200:
- 		return "TI AR7 (TNETD7200)";
-+	case AR7_CHIP_TITAN:
-+		titan_variant = ar7_init_titan_variant();
-+		switch (titan_variant /*(gpio_get_value_titan(1) >> 12) & 0xf*/) {
-+		case TITAN_CHIP_1050:
-+			return "TI AR7 (TNETV1050)";
-+		case TITAN_CHIP_1055:
-+			return "TI AR7 (TNETV1055)";
-+		case TITAN_CHIP_1056:
-+			return "TI AR7 (TNETV1056)";
-+		case TITAN_CHIP_1060:
-+			return "TI AR7 (TNETV1060)";
-+		}
- 	default:
- 		return "TI AR7 (Unknown)";
- 	}
---- a/arch/mips/include/asm/mach-ar7/ar7.h
-+++ b/arch/mips/include/asm/mach-ar7/ar7.h
-@@ -50,6 +50,11 @@
- #define UR8_REGS_WDT	(AR7_REGS_BASE + 0x0b00)
- #define UR8_REGS_UART1	(AR7_REGS_BASE + 0x0f00)
- 
-+#define TITAN_REGS_MAC0		(0x08640000)
-+#define TITAN_REGS_MAC1		(TITAN_REGS_MAC0 + 0x0800)
-+#define TITAN_REGS_VLYNQ0	(AR7_REGS_BASE + 0x1c00)
-+#define TITAN_REGS_VLYNQ1	(AR7_REGS_BASE + 0x1300)
-+
- #define AR7_RESET_PEREPHERIAL	0x0
- #define AR7_RESET_SOFTWARE	0x4
- #define AR7_RESET_STATUS	0x8
-@@ -59,15 +64,30 @@
- #define AR7_RESET_BIT_MDIO	22
- #define AR7_RESET_BIT_EPHY	26
- 
-+#define TITAN_RESET_BIT_EPHY1	28
-+
- /* GPIO control registers */
- #define AR7_GPIO_INPUT	0x0
- #define AR7_GPIO_OUTPUT	0x4
- #define AR7_GPIO_DIR	0x8
- #define AR7_GPIO_ENABLE	0xc
-+#define TITAN_GPIO_INPUT_0	0x0
-+#define TITAN_GPIO_INPUT_1	0x4
-+#define TITAN_GPIO_OUTPUT_0	0x8
-+#define TITAN_GPIO_OUTPUT_1	0xc
-+#define TITAN_GPIO_DIR_0	0x10
-+#define TITAN_GPIO_DIR_1	0x14
-+#define TITAN_GPIO_ENBL_0	0x18
-+#define TITAN_GPIO_ENBL_1	0x1c
- 
- #define AR7_CHIP_7100	0x18
- #define AR7_CHIP_7200	0x2b
- #define AR7_CHIP_7300	0x05
-+#define AR7_CHIP_TITAN	0x07
-+#define TITAN_CHIP_1050	0x0f
-+#define TITAN_CHIP_1055	0x0e
-+#define TITAN_CHIP_1056	0x0d
-+#define TITAN_CHIP_1060	0x07
- 
- /* Interrupts */
- #define AR7_IRQ_UART0	15
-@@ -95,14 +115,22 @@ struct plat_dsl_data {
- 
- extern int ar7_cpu_clock, ar7_bus_clock, ar7_dsp_clock;
- 
-+static inline int ar7_is_titan(void)
-+{
-+	return (readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 0x24)) & 0xffff) ==
-+		AR7_CHIP_TITAN;
-+}
-+
- static inline u16 ar7_chip_id(void)
- {
--	return readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 0x14)) & 0xffff;
-+	return ar7_is_titan() ? AR7_CHIP_TITAN : (readl((void *)
-+		KSEG1ADDR(AR7_REGS_GPIO + 0x14)) & 0xffff);
- }
- 
- static inline u8 ar7_chip_rev(void)
- {
--	return (readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 0x14)) >> 16) & 0xff;
-+	return (readl((void *)KSEG1ADDR(AR7_REGS_GPIO + (ar7_is_titan() ? 0x24 :
-+		0x14))) >> 16) & 0xff;
- }
- 
- static inline int ar7_cpu_freq(void)
---- a/arch/mips/include/asm/mach-ar7/gpio.h
-+++ b/arch/mips/include/asm/mach-ar7/gpio.h
-@@ -20,14 +20,18 @@
- #define __AR7_GPIO_H__
- 
- #include <asm/mach-ar7/ar7.h>
-+#ifndef __AR7_TITAN_H__
-+#include <asm/mach-ar7/titan.h>
-+#endif
- 
- #define AR7_GPIO_MAX 32
-+#define TITAN_GPIO_MAX 51
- 
- extern int gpio_request(unsigned gpio, const char *label);
- extern void gpio_free(unsigned gpio);
- 
- /* Common GPIO layer */
--static inline int gpio_get_value(unsigned gpio)
-+static inline int gpio_get_value_ar7(unsigned gpio)
- {
- 	void __iomem *gpio_in =
- 		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_INPUT);
-@@ -35,7 +39,23 @@ static inline int gpio_get_value(unsigne
- 	return readl(gpio_in) & (1 << gpio);
- }
- 
--static inline void gpio_set_value(unsigned gpio, int value)
-+static inline int gpio_get_value_titan(unsigned gpio)
-+{
-+	void __iomem *gpio_in0 =
-+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_INPUT_0);
-+	void __iomem *gpio_in1 =
-+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_INPUT_1);
-+
-+	return readl(gpio >> 5 ? gpio_in1 : gpio_in0) & (1 << (gpio & 0x1f));
-+}
-+
-+static inline int gpio_get_value(unsigned gpio)
-+{
-+	return ar7_is_titan() ? gpio_get_value_titan(gpio) :
-+		gpio_get_value_ar7(gpio);
-+}
-+
-+static inline void gpio_set_value_ar7(unsigned gpio, int value)
- {
- 	void __iomem *gpio_out =
- 		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_OUTPUT);
-@@ -47,7 +67,29 @@ static inline void gpio_set_value(unsign
- 	writel(tmp, gpio_out);
- }
- 
--static inline int gpio_direction_input(unsigned gpio)
-+static inline void gpio_set_value_titan(unsigned gpio, int value)
-+{
-+	void __iomem *gpio_out0 =
-+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_OUTPUT_0);
-+	void __iomem *gpio_out1 =
-+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_OUTPUT_1);
-+	unsigned tmp;
-+
-+	tmp = readl(gpio >> 5 ? gpio_out1 : gpio_out0) & ~(1 << (gpio & 0x1f));
-+	if (value)
-+		tmp |= 1 << (gpio & 0x1f);
-+	writel(tmp, gpio >> 5 ? gpio_out1 : gpio_out0);
-+}
-+
-+static inline void gpio_set_value(unsigned gpio, int value)
-+{
-+	if (ar7_is_titan())
-+		gpio_set_value_titan(gpio, value);
-+	else
-+		gpio_set_value_ar7(gpio, value);
-+}
-+
-+static inline int gpio_direction_input_ar7(unsigned gpio)
- {
- 	void __iomem *gpio_dir =
- 		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
-@@ -60,7 +102,29 @@ static inline int gpio_direction_input(u
- 	return 0;
- }
- 
--static inline int gpio_direction_output(unsigned gpio, int value)
-+static inline int gpio_direction_input_titan(unsigned gpio)
-+{
-+	void __iomem *gpio_dir0 =
-+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_DIR_0);
-+	void __iomem *gpio_dir1 =
-+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_DIR_1);
-+
-+	if (gpio >= TITAN_GPIO_MAX)
-+		return -EINVAL;
-+
-+	writel(readl(gpio >> 5 ? gpio_dir1 : gpio_dir0) | (1 << (gpio & 0x1f)),
-+		gpio >> 5 ? gpio_dir1 : gpio_dir0);
-+
-+	return 0;
-+}
-+
-+static inline int gpio_direction_input(unsigned gpio)
-+{
-+	return ar7_is_titan() ?  gpio_direction_input_titan(gpio) :
-+		gpio_direction_input_ar7(gpio);
-+}
-+
-+static inline int gpio_direction_output_ar7(unsigned gpio, int value)
- {
- 	void __iomem *gpio_dir =
- 		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
-@@ -74,6 +138,29 @@ static inline int gpio_direction_output(
- 	return 0;
- }
- 
-+static inline int gpio_direction_output_titan(unsigned gpio, int value)
-+{
-+	void __iomem *gpio_dir0 =
-+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_DIR_0);
-+	void __iomem *gpio_dir1 =
-+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_DIR_1);
-+
-+	if (gpio >= TITAN_GPIO_MAX)
-+		return -EINVAL;
-+
-+	gpio_set_value_titan(gpio, value);
-+	writel(readl(gpio >> 5 ? gpio_dir1 : gpio_dir0) & ~(1 <<
-+		(gpio & 0x1f)), gpio >> 5 ? gpio_dir1 : gpio_dir0);
-+
-+	return 0;
-+}
-+
-+static inline int gpio_direction_output(unsigned gpio, int value)
-+{
-+	return ar7_is_titan() ?  gpio_direction_output_titan(gpio, value) :
-+		gpio_direction_output_ar7(gpio, value);
-+}
-+
- static inline int gpio_to_irq(unsigned gpio)
- {
- 	return -EINVAL;
-@@ -85,7 +172,7 @@ static inline int irq_to_gpio(unsigned i
- }
- 
- /* Board specific GPIO functions */
--static inline int ar7_gpio_enable(unsigned gpio)
-+static inline int ar7_gpio_enable_ar7(unsigned gpio)
- {
- 	void __iomem *gpio_en =
- 		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_ENABLE);
-@@ -95,7 +182,26 @@ static inline int ar7_gpio_enable(unsign
- 	return 0;
- }
- 
--static inline int ar7_gpio_disable(unsigned gpio)
-+static inline int ar7_gpio_enable_titan(unsigned gpio)
-+{
-+	void __iomem *gpio_en0 =
-+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_ENBL_0);
-+	void __iomem *gpio_en1 =
-+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_ENBL_1);
-+
-+	writel(readl(gpio >> 5 ? gpio_en1 : gpio_en0) | (1 << (gpio & 0x1f)),
-+		gpio >> 5 ? gpio_en1 : gpio_en0);
-+
-+	return 0;
-+}
-+
-+static inline int ar7_gpio_enable(unsigned gpio)
-+{
-+	return ar7_is_titan() ? ar7_gpio_enable_titan(gpio) :
-+		ar7_gpio_enable_ar7(gpio);
-+}
-+
-+static inline int ar7_gpio_disable_ar7(unsigned gpio)
- {
- 	void __iomem *gpio_en =
- 		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_ENABLE);
-@@ -105,6 +211,60 @@ static inline int ar7_gpio_disable(unsig
- 	return 0;
- }
- 
-+static inline int ar7_gpio_disable_titan(unsigned gpio)
-+{
-+	void __iomem *gpio_en0 =
-+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_ENBL_0);
-+	void __iomem *gpio_en1 =
-+		(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_ENBL_1);
-+
-+	writel(readl(gpio >> 5 ? gpio_en1 : gpio_en0) & ~(1 << (gpio & 0x1f)),
-+		gpio >> 5 ? gpio_en1 : gpio_en0);
-+
-+	return 0;
-+}
-+
-+static inline int ar7_gpio_disable(unsigned gpio)
-+{
-+	return ar7_is_titan() ? ar7_gpio_disable_titan(gpio) :
-+		ar7_gpio_disable_ar7(gpio);
-+}
-+
-+static inline int ar7_init_titan_variant(void)
-+{
-+	/*UINT32 new_val;*/
-+	unsigned new_val;
-+
-+	/* set GPIO 44 - 47 as input */
-+	/*PAL_sysGpioCtrl(const int, GPIO_PIN, GPIO_INPUT_PIN); */
-+	/*define titan_gpio_ctrl in titan.h*/
-+	titan_gpio_ctrl(44, GPIO_PIN, GPIO_INPUT_PIN);
-+	titan_gpio_ctrl(45, GPIO_PIN, GPIO_INPUT_PIN);
-+	titan_gpio_ctrl(46, GPIO_PIN, GPIO_INPUT_PIN);
-+	titan_gpio_ctrl(47, GPIO_PIN, GPIO_INPUT_PIN);
-+
-+	/* read GPIO to get Titan variant type */
-+	/*fix this*/
-+	titan_sysGpioInValue( &new_val, 1 );
-+
-+	new_val >>= 12;
-+	new_val &= 0x0f;
-+
-+	switch ( new_val )
-+	{
-+	case TITAN_CHIP_1050:
-+	case TITAN_CHIP_1055:
-+	case TITAN_CHIP_1056:
-+	case TITAN_CHIP_1060:
-+		return new_val;
-+
-+	default:
-+		break;
-+	}
-+	/* In case we get an invalid value, return the default Titan chip */
-+	return TITAN_CHIP_1050;
-+}
-+
- #include <asm-generic/gpio.h>
- 
- #endif
---- /dev/null
-+++ b/arch/mips/include/asm/mach-ar7/titan.h
-@@ -0,0 +1,176 @@
-+/*
-+ * Copyright (C) 2008 Stanley Pinchak <stanley_dot_pinchak_at_gmail_dot_com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-+ */
-+#ifndef __AR7_TITAN_H__
-+#define __AR7_TITAN_H__
-+
-+#include <asm/mach-ar7/gpio.h>
-+
-+typedef enum TITAN_GPIO_PIN_MODE_tag
-+{
-+    FUNCTIONAL_PIN = 0,
-+    GPIO_PIN = 1
-+} TITAN_GPIO_PIN_MODE_T;
-+
-+typedef enum TITAN_GPIO_PIN_DIRECTION_tag
-+{
-+    GPIO_OUTPUT_PIN = 0,
-+    GPIO_INPUT_PIN = 1
-+} TITAN_GPIO_PIN_DIRECTION_T;
-+
-+/**********************************************************************
-+ *  GPIO Control
-+ **********************************************************************/
-+
-+typedef struct
-+{
-+    int pinSelReg;
-+    int shift;
-+    int func;
-+
-+} GPIO_CFG;
-+
-+static GPIO_CFG gptable[]= {
-+		      /* PIN_SEL_REG, START_BIT, GPIO_CFG_MUX_VALUE */
-+	              {4,24,1},
-+		      {4,26,1},
-+		      {4,28,1},
-+		      {4,30,1},
-+		      {5,6,1},
-+		      {5,8,1},
-+		      {5,10,1},
-+		      {5,12,1},
-+		      {7,14,3},
-+		      {7,16,3},
-+		      {7,18,3},
-+		      {7,20,3},
-+		      {7,22,3},
-+		      {7,26,3},
-+		      {7,28,3},
-+		      {7,30,3},
-+                      {8,0,3},
-+		      {8,2,3},
-+		      {8,4,3},
-+		      {8,10,3},
-+		      {8,14,3},
-+		      {8,16,3},
-+		      {8,18,3},
-+		      {8,20,3},
-+		      {9,8,3},
-+		      {9,10,3},
-+		      {9,12,3},
-+		      {9,14,3},
-+		      {9,18,3},
-+		      {9,20,3},
-+		      {9,24,3},
-+		      {9,26,3},
-+		      {9,28,3},
-+		      {9,30,3},
-+		      {10,0,3},
-+		      {10,2,3},
-+		      {10,8,3},
-+		      {10,10,3},
-+		      {10,12,3},
-+		      {10,14,3},
-+		      {13,12,3},
-+		      {13,14,3},
-+		      {13,16,3},
-+		      {13,18,3},
-+		      {13,24,3},
-+		      {13,26,3},
-+		      {13,28,3},
-+		      {13,30,3},
-+		      {14,2,3},
-+		      {14,6,3},
-+		      {14,8,3},
-+		      {14,12,3}
-+};
-+
-+typedef struct
-+{
-+    volatile unsigned int reg[21];
-+}
-+PIN_SEL_REG_ARRAY_T;
-+
-+typedef struct
-+{
-+    unsigned int data_in [2];
-+    unsigned int data_out[2];
-+    unsigned int dir[2];
-+    unsigned int enable[2];
-+
-+} TITAN_GPIO_CONTROL_T;
-+
-+#define AVALANCHE_PIN_SEL_BASE        0xA861160C /*replace with KSEG1ADDR()*/
-+
-+static inline int titan_gpio_ctrl(unsigned int gpio_pin, TITAN_GPIO_PIN_MODE_T pin_mode,
-+                        TITAN_GPIO_PIN_DIRECTION_T pin_direction)
-+{
-+    int reg_index = 0;
-+    int mux_status;
-+    GPIO_CFG  gpio_cfg;
-+    volatile PIN_SEL_REG_ARRAY_T *pin_sel_array = (PIN_SEL_REG_ARRAY_T*) AVALANCHE_PIN_SEL_BASE;
-+    volatile TITAN_GPIO_CONTROL_T   *gpio_cntl     = (TITAN_GPIO_CONTROL_T*) KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_INPUT_0);
-+
-+    if (gpio_pin > 51 )
-+        return(-1);
-+
-+    gpio_cfg = gptable[gpio_pin];
-+    mux_status = (pin_sel_array->reg[gpio_cfg.pinSelReg - 1] >> gpio_cfg.shift) & 0x3;
-+    if(!((mux_status == 0 /* tri-stated */ ) || (mux_status == gpio_cfg.func /*GPIO functionality*/)))
-+    {
-+        return(-1); /* Pin have been configured for non GPIO funcs. */
-+    }
-+
-+    /* Set the pin to be used as GPIO. */
-+    pin_sel_array->reg[gpio_cfg.pinSelReg - 1] |= ((gpio_cfg.func & 0x3) << gpio_cfg.shift);
-+
-+    /* Check whether gpio refers to the first GPIO reg or second. */
-+    if(gpio_pin > 31)
-+    {
-+	reg_index = 1;
-+	gpio_pin -= 32;
-+    }
-+
-+    if(pin_mode)
-+        gpio_cntl->enable[reg_index] |=  (1 << gpio_pin); /* Enable */
-+    else
-+	gpio_cntl->enable[reg_index] &= ~(1 << gpio_pin);
-+
-+    if(pin_direction)
-+        gpio_cntl->dir[reg_index] |=  (1 << gpio_pin); /* Input */
-+    else
-+	gpio_cntl->dir[reg_index] &= ~(1 << gpio_pin);
-+
-+    return(0);
-+
-+}/* end of function titan_gpio_ctrl */
-+
-+static inline int titan_sysGpioInValue(unsigned int *in_val, unsigned int reg_index)
-+{
-+    volatile TITAN_GPIO_CONTROL_T   *gpio_cntl     = (TITAN_GPIO_CONTROL_T*) KSEG1ADDR(AR7_REGS_GPIO + TITAN_GPIO_INPUT_0);
-+
-+    if(reg_index > 1)
-+       return (-1);
-+
-+    *in_val = gpio_cntl->data_in[reg_index];
-+
-+    return (0);
-+}
-+
-+
-+#endif
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
deleted file mode 100644
index 84bba9b1c3..0000000000
--- a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- 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()) {
--		res = fixed_phy_add(PHY_POLL, cpmac_high.id, &fixed_phy_status);
-+		res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_high_titan.id : cpmac_high.id,
-+						&fixed_phy_status);
- 		if (res && res != -ENODEV)
- 			return res;
--		cpmac_get_mac(1, cpmac_high_data.dev_addr);
--		res = platform_device_register(&cpmac_high);
-+
-+		cpmac_get_mac(1, ar7_is_titan() ? cpmac_high_data_titan.dev_addr :
-+						cpmac_high_data.dev_addr);
-+		res = platform_device_register(ar7_is_titan() ? &cpmac_high_titan :
-+						&cpmac_high);
-+
- 		if (res)
- 			return res;
- 	} else {
--		cpmac_low_data.phy_mask = 0xffffffff;
-+		if (ar7_is_titan())
-+			cpmac_low_data_titan.phy_mask = 0xffffffff;
-+		else
-+			cpmac_low_data.phy_mask = 0xffffffff;
-+
- 	}
- 
--	res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status);
-+	res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_low_titan.id :
-+			cpmac_low.id, &fixed_phy_status);
- 	if (res && res != -ENODEV)
- 		return res;
- 
--	cpmac_get_mac(0, cpmac_low_data.dev_addr);
--	res = platform_device_register(&cpmac_low);
-+	cpmac_get_mac(0, ar7_is_titan() ? cpmac_low_data_titan.dev_addr :
-+			cpmac_low_data.dev_addr);
-+	res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan :
-+			&cpmac_low);
- 	if (res)
- 		return res;
- 
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct
- 		goto fail;
- 	}
- 
-+	ar7_device_reset(pdata->reset_bit);
-+
- 	dev->irq = platform_get_irq_byname(pdev, "irq");
- 
- 	dev->netdev_ops = &cpmac_netdev_ops;
-@@ -1229,7 +1231,7 @@ int __devinit cpmac_init(void)
- 	cpmac_mii->reset = cpmac_mdio_reset;
- 	cpmac_mii->irq = mii_irqs;
- 
--	cpmac_mii->priv = ioremap(AR7_REGS_MDIO, 256);
-+	cpmac_mii->priv = ioremap(ar7_is_titan() ? TITAN_REGS_MDIO : AR7_REGS_MDIO, 256);
- 
- 	if (!cpmac_mii->priv) {
- 		printk(KERN_ERR "Can't ioremap mdio registers\n");
-@@ -1240,10 +1242,17 @@ int __devinit cpmac_init(void)
- #warning FIXME: unhardcode gpio&reset bits
- 	ar7_gpio_disable(26);
- 	ar7_gpio_disable(27);
--	ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
--	ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
-+
-+	if (!ar7_is_titan()) {
-+		ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
-+		ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
-+	}
- 	ar7_device_reset(AR7_RESET_BIT_EPHY);
- 
-+	if (ar7_is_titan()) {
-+		ar7_device_reset(TITAN_RESET_BIT_EPHY1);
-+	}
-+
- 	cpmac_mii->reset(cpmac_mii);
- 
- 	for (i = 0; i < 300; i++)
-@@ -1258,7 +1267,8 @@ int __devinit cpmac_init(void)
- 		mask = 0;
- 	}
- 
--	cpmac_mii->phy_mask = ~(mask | 0x80000000);
-+	cpmac_mii->phy_mask = ar7_is_titan()? ~(mask | 0x80000000 | 0x40000000):
-+		~(mask | 0x80000000);
- 	snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
- 
- 	res = mdiobus_register(cpmac_mii);
---- 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)
- 
--#define TITAN_REGS_MAC0		(0x08640000)
--#define TITAN_REGS_MAC1		(TITAN_REGS_MAC0 + 0x0800)
-+#define TITAN_REGS_ESWITCH_BASE	(0x08640000)
-+#define TITAN_REGS_MAC0			(TITAN_REGS_ESWITCH_BASE + 0)
-+#define TITAN_REGS_MAC1			(TITAN_REGS_ESWITCH_BASE + 0x0800)
-+#define TITAN_REGS_MDIO			(TITAN_REGS_ESWITCH_BASE + 0x02000)
- #define TITAN_REGS_VLYNQ0	(AR7_REGS_BASE + 0x1c00)
- #define TITAN_REGS_VLYNQ1	(AR7_REGS_BASE + 0x1300)
- 
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
deleted file mode 100644
index 005822075f..0000000000
--- a/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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) {
--		dev_err(&pdev->dev, "no PHY present\n");
--		return -ENODEV;
-+		dev_err(&pdev->dev, "no PHY present, falling back to switch mode\n");
-+		strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
-+		phy_id = pdev->id;
- 	}
- 
- 	dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
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
deleted file mode 100644
index a0d5ec3c76..0000000000
--- a/target/linux/ar7/patches-2.6.32/960-cpmac_allow_vlan.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.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)
- #define CPMAC_QUEUES	8
- 
- /* Ethernet registers */
diff --git a/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch b/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch
deleted file mode 100644
index d11415b1a6..0000000000
--- a/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch
+++ /dev/null
@@ -1,240 +0,0 @@
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -46,7 +46,6 @@ struct plat_vlynq_data {
- 	int reset_bit;
- };
- 
--
- static int vlynq_on(struct vlynq_device *dev)
- {
- 	int result;
-@@ -72,7 +71,8 @@ static int vlynq_on(struct vlynq_device
- 
- 	msleep(50);
- 
--	gpio_set_value(pdata->gpio_bit, 1);
-+	gpio_set_value(pdata->gpio_bit,
-+			__vlynq_rev_reg(dev->local) < 0x00010205);
- 	msleep(50);
- 
- 	return 0;
-@@ -601,6 +601,18 @@ static inline unsigned char char2hex(cha
- 	}
- }
- 
-+static void auto_mdix_on(void)
-+{
-+	ar7_gpio_enable(28);
-+	ar7_gpio_disable(30);
-+}
-+
-+/*static void auto_mdix_off(void)
-+{
-+	ar7_gpio_disable(28);
-+	ar7_gpio_disable(30);
-+}*/
-+
- static void cpmac_get_mac(int instance, unsigned char *dev_addr)
- {
- 	int i;
-@@ -662,6 +674,7 @@ static int __init ar7_register_devices(v
- 	u16 chip_id;
- 	int res;
- 	u32 *bootcr, val;
-+	void __iomem *mii_reg;
- #ifdef CONFIG_SERIAL_8250
- 	static struct uart_port uart_port[2];
- 
-@@ -715,27 +728,6 @@ static int __init ar7_register_devices(v
- 			return res;
- 	}
- 
--	if (ar7_has_high_cpmac()) {
--		res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_high_titan.id : cpmac_high.id,
--						&fixed_phy_status);
--		if (res && res != -ENODEV)
--			return res;
--
--		cpmac_get_mac(1, ar7_is_titan() ? cpmac_high_data_titan.dev_addr :
--						cpmac_high_data.dev_addr);
--		res = platform_device_register(ar7_is_titan() ? &cpmac_high_titan :
--						&cpmac_high);
--
--		if (res)
--			return res;
--	} else {
--		if (ar7_is_titan())
--			cpmac_low_data_titan.phy_mask = 0xffffffff;
--		else
--			cpmac_low_data.phy_mask = 0xffffffff;
--
--	}
--
- 	res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_low_titan.id :
- 			cpmac_low.id, &fixed_phy_status);
- 	if (res && res != -ENODEV)
-@@ -748,6 +740,34 @@ static int __init ar7_register_devices(v
- 	if (res)
- 		return res;
- 
-+	if (ar7_has_high_cpmac()) {
-+		res = fixed_phy_add(PHY_POLL, ar7_is_titan() ?
-+				cpmac_high_titan.id : cpmac_high.id,
-+				&fixed_phy_status);
-+		if (res && res != -ENODEV)
-+			return res;
-+
-+		cpmac_get_mac(1, ar7_is_titan() ?
-+				cpmac_high_data_titan.dev_addr :
-+				cpmac_high_data.dev_addr);
-+		res = platform_device_register(ar7_is_titan() ?
-+				&cpmac_high_titan : &cpmac_high);
-+
-+		if (res)
-+			return res;
-+	} else {
-+		mii_reg = ioremap(AR7_REGS_MII, 4);
-+		if (mii_reg) {
-+			writel(readl(mii_reg) | 1, mii_reg);
-+			iounmap(mii_reg);
-+		}
-+
-+		ar7_gpio_disable(17);
-+		mdelay(20);
-+		ar7_gpio_enable(17);
-+		auto_mdix_on();
-+	}
-+
- 	detect_leds();
- 	res = platform_device_register(&ar7_gpio_leds);
- 	if (res)
-@@ -771,8 +791,10 @@ static int __init ar7_register_devices(v
- 	ar7_wdt_res.end = ar7_wdt_res.start + 0x20;
- 
- 	bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);
--	val = *bootcr;
--	iounmap(bootcr);
-+	if (bootcr) {
-+		val = *bootcr;
-+		iounmap(bootcr);
-+	}
- 
- 	/* Register watchdog only if enabled in hardware */
- 	if (val & AR7_WDT_HW_ENA)
---- a/arch/mips/include/asm/mach-ar7/ar7.h
-+++ b/arch/mips/include/asm/mach-ar7/ar7.h
-@@ -41,6 +41,7 @@
- #define AR7_REGS_RESET	(AR7_REGS_BASE + 0x1600)
- #define AR7_REGS_VLYNQ0	(AR7_REGS_BASE + 0x1800)
- #define AR7_REGS_DCL	(AR7_REGS_BASE + 0x1a00)
-+#define AR7_REGS_MII	(AR7_REGS_BASE + 0x1a08)
- #define AR7_REGS_VLYNQ1	(AR7_REGS_BASE + 0x1c00)
- #define AR7_REGS_MDIO	(AR7_REGS_BASE + 0x1e00)
- #define AR7_REGS_IRQ	(AR7_REGS_BASE + 0x2400)
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -668,9 +668,8 @@ static void cpmac_hw_start(struct net_de
- 	for (i = 0; i < 8; i++)
- 		cpmac_write(priv->regs, CPMAC_MAC_ADDR_LO(i), dev->dev_addr[5]);
- 	cpmac_write(priv->regs, CPMAC_MAC_ADDR_MID, dev->dev_addr[4]);
--	cpmac_write(priv->regs, CPMAC_MAC_ADDR_HI, dev->dev_addr[0] |
--		    (dev->dev_addr[1] << 8) | (dev->dev_addr[2] << 16) |
--		    (dev->dev_addr[3] << 24));
-+	cpmac_write(priv->regs, CPMAC_MAC_ADDR_HI, be32_to_cpu(*(u32 *)
-+			dev->dev_addr));
- 	cpmac_write(priv->regs, CPMAC_MAX_LENGTH, CPMAC_SKB_SIZE);
- 	cpmac_write(priv->regs, CPMAC_UNICAST_CLEAR, 0xff);
- 	cpmac_write(priv->regs, CPMAC_RX_INT_CLEAR, 0xff);
-@@ -1104,8 +1103,6 @@ static const struct net_device_ops cpmac
- 	.ndo_set_mac_address	= eth_mac_addr,
- };
- 
--static int external_switch;
--
- static int __devinit cpmac_probe(struct platform_device *pdev)
- {
- 	int rc, phy_id;
-@@ -1117,24 +1114,26 @@ static int __devinit cpmac_probe(struct
- 
- 	pdata = pdev->dev.platform_data;
- 
--	if (external_switch || dumb_switch) {
--		strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
--		phy_id = pdev->id;
--	} else {
--		for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
--			if (!(pdata->phy_mask & (1 << phy_id)))
--				continue;
--			if (!cpmac_mii->phy_map[phy_id])
--				continue;
--			strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE);
--			break;
--		}
-+	if (dumb_switch)
-+		phy_id = PHY_MAX_ADDR;
-+	else for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
-+		if (!((pdata->phy_mask | cpmac_mii->phy_mask) &
-+				(1 << phy_id)))
-+			continue;
-+		if (cpmac_mii->phy_map[phy_id])
-+			continue;
-+		strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE);
-+		break;
- 	}
- 
- 	if (phy_id == PHY_MAX_ADDR) {
- 		dev_err(&pdev->dev, "no PHY present, falling back to switch mode\n");
- 		strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
- 		phy_id = pdev->id;
-+	} else {
-+		/* Now disable EPHY and enable MII */
-+		dev_info(&pdev->dev, "trying external MII\n");
-+		ar7_device_disable(AR7_RESET_BIT_EPHY);
- 	}
- 
- 	dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
-@@ -1168,7 +1167,7 @@ static int __devinit cpmac_probe(struct
- 	priv->dev = dev;
- 	priv->ring_size = 64;
- 	priv->msg_enable = netif_msg_init(debug_level, 0xff);
--	memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
-+	memcpy(dev->dev_addr, pdata->dev_addr, sizeof(pdata->dev_addr));
- 
- 	snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
- 
-@@ -1244,14 +1243,14 @@ int __devinit cpmac_init(void)
- 	ar7_gpio_disable(26);
- 	ar7_gpio_disable(27);
- 
--	if (!ar7_is_titan()) {
-+	if (ar7_is_titan()) {
-+		ar7_device_reset(AR7_RESET_BIT_EPHY);
-+		ar7_device_reset(TITAN_RESET_BIT_EPHY1);
-+	} else {
- 		ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
- 		ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
--	}
--	ar7_device_reset(AR7_RESET_BIT_EPHY);
- 
--	if (ar7_is_titan()) {
--		ar7_device_reset(TITAN_RESET_BIT_EPHY1);
-+		ar7_device_reset(AR7_RESET_BIT_EPHY);
- 	}
- 
- 	cpmac_mii->reset(cpmac_mii);
-@@ -1262,14 +1261,7 @@ int __devinit cpmac_init(void)
- 		else
- 			msleep(10);
- 
--	mask &= 0x7fffffff;
--	if (mask & (mask - 1)) {
--		external_switch = 1;
--		mask = 0;
--	}
--
--	cpmac_mii->phy_mask = ar7_is_titan()? ~(mask | 0x80000000 | 0x40000000):
--		~(mask | 0x80000000);
-+	cpmac_mii->phy_mask = ~mask;
- 	snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
- 
- 	res = mdiobus_register(cpmac_mii);
diff --git a/target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch b/target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch
deleted file mode 100644
index 13cfdc28f5..0000000000
--- a/target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -369,6 +369,7 @@ static struct sk_buff *cpmac_rx_one(stru
- 				    struct cpmac_desc *desc)
- {
- 	struct sk_buff *skb, *result = NULL;
-+	int offset;
- 
- 	if (unlikely(netif_msg_hw(priv)))
- 		cpmac_dump_desc(priv->dev, desc);
-@@ -382,9 +383,13 @@ static struct sk_buff *cpmac_rx_one(stru
- 
- 	skb = netdev_alloc_skb(priv->dev, CPMAC_SKB_SIZE);
- 	if (likely(skb)) {
--		skb_reserve(skb, 2);
-+		offset = 2;
-+		if (priv->phy) {
-+			offset += priv->phy->pkt_align;
-+		}
-+		skb_reserve(skb, offset);
-+
- 		skb_put(desc->skb, desc->datalen);
--		desc->skb->protocol = eth_type_trans(desc->skb, priv->dev);
- 		desc->skb->ip_summed = CHECKSUM_NONE;
- 		priv->dev->stats.rx_packets++;
- 		priv->dev->stats.rx_bytes += desc->datalen;
-@@ -456,7 +461,12 @@ static int cpmac_poll(struct napi_struct
- 
- 		skb = cpmac_rx_one(priv, desc);
- 		if (likely(skb)) {
--			netif_receive_skb(skb);
-+			if (priv->phy->netif_receive_skb) {
-+				priv->phy->netif_receive_skb(skb);
-+			} else {
-+				skb->protocol = eth_type_trans(skb, priv->dev);
-+				netif_receive_skb(skb);
-+			}
- 			received++;
- 		}
- 		desc = desc->next;
-@@ -951,7 +961,7 @@ static void cpmac_adjust_link(struct net
- 
- static int cpmac_open(struct net_device *dev)
- {
--	int i, size, res;
-+	int i, size, res, offset;
- 	struct cpmac_priv *priv = netdev_priv(dev);
- 	struct resource *mem;
- 	struct cpmac_desc *desc;
-@@ -995,7 +1005,12 @@ static int cpmac_open(struct net_device
- 			res = -ENOMEM;
- 			goto fail_desc;
- 		}
--		skb_reserve(skb, 2);
-+		offset = 2;
-+		if (priv->phy) {
-+			offset += priv->phy->pkt_align;
-+		}
-+		skb_reserve(skb, offset);
-+
- 		desc->skb = skb;
- 		desc->data_mapping = dma_map_single(&dev->dev, skb->data,
- 						    CPMAC_SKB_SIZE,