ramips: nuke 2.6.30 support

SVN-Revision: 19466

8 files changed, 0 insertions, 447 deletions

diff --git a/target/linux/ramips/patches-2.6.30/001-mips-add-cp0-compare-irq-function.patch b/target/linux/ramips/patches-2.6.30/001-mips-add-cp0-compare-irq-function.patch
deleted file mode 100644
index adb8044af6..0000000000
--- a/target/linux/ramips/patches-2.6.30/001-mips-add-cp0-compare-irq-function.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/arch/mips/kernel/traps.c
-+++ b/arch/mips/kernel/traps.c
-@@ -48,6 +48,7 @@
- #include <asm/types.h>
- #include <asm/stacktrace.h>
- #include <asm/irq.h>
-+#include <asm/time.h>
- 
- extern void check_wait(void);
- extern asmlinkage void r4k_wait(void);
-@@ -1542,6 +1543,8 @@ void __cpuinit per_cpu_trap_init(void)
- 	 */
- 	if (cpu_has_mips_r2) {
- 		cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
-+		if (get_c0_compare_irq)
-+			cp0_compare_irq = get_c0_compare_irq();
- 		cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
- 		if (cp0_perfcount_irq == cp0_compare_irq)
- 			cp0_perfcount_irq = -1;
---- a/arch/mips/include/asm/time.h
-+++ b/arch/mips/include/asm/time.h
-@@ -52,6 +52,7 @@ extern int (*perf_irq)(void);
-  */
- #ifdef CONFIG_CEVT_R4K_LIB
- extern unsigned int __weak get_c0_compare_int(void);
-+extern unsigned int __weak get_c0_compare_irq(void);
- extern int r4k_clockevent_init(void);
- #endif
- 
diff --git a/target/linux/ramips/patches-2.6.30/002-mips-clocksource-init-war.patch b/target/linux/ramips/patches-2.6.30/002-mips-clocksource-init-war.patch
deleted file mode 100644
index 03a66ff133..0000000000
--- a/target/linux/ramips/patches-2.6.30/002-mips-clocksource-init-war.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/arch/mips/kernel/cevt-r4k.c
-+++ b/arch/mips/kernel/cevt-r4k.c
-@@ -15,6 +15,22 @@
- #include <asm/cevt-r4k.h>
- 
- /*
-+ * Compare interrupt can be routed and latched outside the core,
-+ * so a single execution hazard barrier may not be enough to give
-+ * it time to clear as seen in the Cause register.  4 time the
-+ * pipeline depth seems reasonably conservative, and empirically
-+ * works better in configurations with high CPU/bus clock ratios.
-+ */
-+
-+#define compare_change_hazard() \
-+	do { \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+		irq_disable_hazard(); \
-+	} while (0)
-+
-+/*
-  * The SMTC Kernel for the 34K, 1004K, et. al. replaces several
-  * of these routines with SMTC-specific variants.
-  */
-@@ -30,6 +46,7 @@ static int mips_next_event(unsigned long
- 	cnt = read_c0_count();
- 	cnt += delta;
- 	write_c0_compare(cnt);
-+	compare_change_hazard();
- 	res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0;
- 	return res;
- }
-@@ -99,22 +116,6 @@ static int c0_compare_int_pending(void)
- 	return (read_c0_cause() >> cp0_compare_irq) & 0x100;
- }
- 
--/*
-- * Compare interrupt can be routed and latched outside the core,
-- * so a single execution hazard barrier may not be enough to give
-- * it time to clear as seen in the Cause register.  4 time the
-- * pipeline depth seems reasonably conservative, and empirically
-- * works better in configurations with high CPU/bus clock ratios.
-- */
--
--#define compare_change_hazard() \
--	do { \
--		irq_disable_hazard(); \
--		irq_disable_hazard(); \
--		irq_disable_hazard(); \
--		irq_disable_hazard(); \
--	} while (0)
--
- int c0_compare_int_usable(void)
- {
- 	unsigned int delta;
diff --git a/target/linux/ramips/patches-2.6.30/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch b/target/linux/ramips/patches-2.6.30/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
deleted file mode 100644
index 3f25b61dd9..0000000000
--- a/target/linux/ramips/patches-2.6.30/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1579,7 +1579,7 @@ static int __xipram do_erase_chip(struct
- 			chip->erase_suspended = 0;
- 		}
- 
--		if (chip_ready(map, adr))
-+		if (chip_good(map, adr, map_word_ff(map)))
- 			break;
- 
- 		if (time_after(jiffies, timeo)) {
-@@ -1667,7 +1667,7 @@ static int __xipram do_erase_oneblock(st
- 			chip->erase_suspended = 0;
- 		}
- 
--		if (chip_ready(map, adr)) {
-+		if (chip_good(map, adr, map_word_ff(map))) {
- 			xip_enable(map, chip, adr);
- 			break;
- 		}
diff --git a/target/linux/ramips/patches-2.6.30/100-mips-ralink-core.patch b/target/linux/ramips/patches-2.6.30/100-mips-ralink-core.patch
deleted file mode 100644
index d6635357bb..0000000000
--- a/target/linux/ramips/patches-2.6.30/100-mips-ralink-core.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -607,6 +607,26 @@ ifdef CONFIG_PHYSICAL_START
- load-y			= $(CONFIG_PHYSICAL_START)
- endif
- 
-+#
-+# Ralink SoC common stuff
-+#
-+core-$(CONFIG_MIPS_RALINK)	+= arch/mips/ralink/common/
-+cflags-$(CONFIG_MIPS_RALINK)	+= -I$(srctree)/arch/mips/include/asm/mach-ralink
-+
-+#
-+# Ralink RT288x
-+#
-+core-$(CONFIG_RALINK_RT288X)	+= arch/mips/ralink/rt288x/
-+cflags-$(CONFIG_RALINK_RT288X)	+= -I$(srctree)//arch/mips/include/asm/mach-ralink/rt288x
-+load-$(CONFIG_RALINK_RT288X)	+= 0xffffffff88000000
-+
-+#
-+# Ralink RT305x
-+#
-+core-$(CONFIG_RALINK_RT305X)	+= arch/mips/ralink/rt305x/
-+cflags-$(CONFIG_RALINK_RT305X)	+= -I$(srctree)/arch/mips/include/asm/mach-ralink/rt305x
-+load-$(CONFIG_RALINK_RT305X)	+= 0xffffffff80000000
-+
- # temporary until string.h is fixed
- cflags-y += -ffreestanding
- 
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -22,6 +22,9 @@ choice
- config MACH_ALCHEMY
- 	bool "Alchemy processor based machines"
- 
-+config MIPS_RALINK
-+	bool "Ralink MIPS SoC based boards"
-+
- config BASLER_EXCITE
- 	bool "Basler eXcite smart camera"
- 	select CEVT_R4K
-@@ -638,6 +641,7 @@ source "arch/mips/basler/excite/Kconfig"
- source "arch/mips/jazz/Kconfig"
- source "arch/mips/lasat/Kconfig"
- source "arch/mips/pmc-sierra/Kconfig"
-+source "arch/mips/ralink/Kconfig"
- source "arch/mips/sgi-ip27/Kconfig"
- source "arch/mips/sibyte/Kconfig"
- source "arch/mips/txx9/Kconfig"
-@@ -989,7 +993,7 @@ config BOOT_ELF32
- 
- config MIPS_L1_CACHE_SHIFT
- 	int
--	default "4" if MACH_DECSTATION || MIKROTIK_RB532
-+	default "4" if MACH_DECSTATION || MIKROTIK_RB532 || RALINK_RT288X
- 	default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM || CPU_CAVIUM_OCTEON
- 	default "4" if PMC_MSP4200_EVAL
- 	default "5"
diff --git a/target/linux/ramips/patches-2.6.30/101-rt288x_serial_driver_hack.patch b/target/linux/ramips/patches-2.6.30/101-rt288x_serial_driver_hack.patch
deleted file mode 100644
index eedd704aaf..0000000000
--- a/target/linux/ramips/patches-2.6.30/101-rt288x_serial_driver_hack.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- a/drivers/serial/8250.c
-+++ b/drivers/serial/8250.c
-@@ -289,9 +289,9 @@ static const struct serial8250_config ua
- 	},
- };
- 
--#if defined (CONFIG_SERIAL_8250_AU1X00)
-+#if defined (CONFIG_SERIAL_8250_AU1X00) || defined (CONFIG_SERIAL_8250_RT288X)
- 
--/* Au1x00 UART hardware has a weird register layout */
-+/* Au1x00 and RT288x UART hardware has a weird register layout */
- static const u8 au_io_in_map[] = {
- 	[UART_RX]  = 0,
- 	[UART_IER] = 2,
-@@ -409,7 +409,7 @@ static unsigned int mem32_serial_in(stru
- 	return readl(p->membase + offset);
- }
- 
--#ifdef CONFIG_SERIAL_8250_AU1X00
-+#if defined(CONFIG_SERIAL_8250_AU1X00) || defined(CONFIG_SERIAL_8250_RT288X)
- static unsigned int au_serial_in(struct uart_port *p, int offset)
- {
- 	offset = map_8250_in_reg(p, offset) << p->regshift;
-@@ -490,7 +490,7 @@ static void set_io_from_upio(struct uart
- 		p->serial_out = mem32_serial_out;
- 		break;
- 
--#ifdef CONFIG_SERIAL_8250_AU1X00
-+#if defined (CONFIG_SERIAL_8250_AU1X00) || defined (CONFIG_SERIAL_8250_RT288X)
- 	case UPIO_AU:
- 		p->serial_in = au_serial_in;
- 		p->serial_out = au_serial_out;
-@@ -522,7 +522,7 @@ serial_out_sync(struct uart_8250_port *u
- 	switch (p->iotype) {
- 	case UPIO_MEM:
- 	case UPIO_MEM32:
--#ifdef CONFIG_SERIAL_8250_AU1X00
-+#if defined (CONFIG_SERIAL_8250_AU1X00) || defined (CONFIG_SERIAL_8250_RT288X)
- 	case UPIO_AU:
- #endif
- 	case UPIO_DWAPB:
-@@ -560,8 +560,8 @@ static inline void _serial_dl_write(stru
- 	serial_outp(up, UART_DLM, value >> 8 & 0xff);
- }
- 
--#if defined(CONFIG_SERIAL_8250_AU1X00)
--/* Au1x00 haven't got a standard divisor latch */
-+#if defined (CONFIG_SERIAL_8250_AU1X00) || defined (CONFIG_SERIAL_8250_RT288X)
-+/* Au1x00 and RT288x haven't got a standard divisor latch */
- static int serial_dl_read(struct uart_8250_port *up)
- {
- 	if (up->port.iotype == UPIO_AU)
-@@ -768,22 +768,19 @@ static int size_fifo(struct uart_8250_po
-  */
- static unsigned int autoconfig_read_divisor_id(struct uart_8250_port *p)
- {
--	unsigned char old_dll, old_dlm, old_lcr;
-+	unsigned char old_lcr;
-+	unsigned int old_dl;
- 	unsigned int id;
- 
- 	old_lcr = serial_inp(p, UART_LCR);
- 	serial_outp(p, UART_LCR, UART_LCR_DLAB);
- 
--	old_dll = serial_inp(p, UART_DLL);
--	old_dlm = serial_inp(p, UART_DLM);
-+	old_dl = serial_dl_read(p);
- 
--	serial_outp(p, UART_DLL, 0);
--	serial_outp(p, UART_DLM, 0);
-+	serial_dl_write(p, 0);
-+	id = serial_dl_read(p);
- 
--	id = serial_inp(p, UART_DLL) | serial_inp(p, UART_DLM) << 8;
--
--	serial_outp(p, UART_DLL, old_dll);
--	serial_outp(p, UART_DLM, old_dlm);
-+	serial_dl_write(p, old_dl);
- 	serial_outp(p, UART_LCR, old_lcr);
- 
- 	return id;
-@@ -1205,7 +1202,7 @@ static void autoconfig(struct uart_8250_
- 	}
- #endif
- 
--#ifdef CONFIG_SERIAL_8250_AU1X00
-+#if defined (CONFIG_SERIAL_8250_AU1X00) || defined (CONFIG_SERIAL_8250_RT288X)
- 	/* if access method is AU, it is a 16550 with a quirk */
- 	if (up->port.type == PORT_16550A && up->port.iotype == UPIO_AU)
- 		up->bugs |= UART_BUG_NOMSR;
---- a/drivers/serial/Kconfig
-+++ b/drivers/serial/Kconfig
-@@ -266,6 +266,14 @@ config SERIAL_8250_AU1X00
- 	  say Y to this option. The driver can handle up to 4 serial ports,
- 	  depending on the SOC. If unsure, say N.
- 
-+config SERIAL_8250_RT288X
-+	bool "Ralink RT288x/RT305x serial port support"
-+	depends on SERIAL_8250 != n && (SOC_RT288X || SOC_RT305X)
-+	help
-+	  If you have a Ralink RT288x/RT305x SoC based board and want to use the 
-+	  serial port, say Y to this option. The driver can handle up to 2 serial 
-+	  ports. If unsure, say N.
-+
- config SERIAL_8250_RM9K
- 	bool "Support for MIPS RM9xxx integrated serial port"
- 	depends on SERIAL_8250 != n && SERIAL_RM9000
---- a/include/linux/serial_core.h
-+++ b/include/linux/serial_core.h
-@@ -269,7 +269,7 @@ struct uart_port {
- #define UPIO_HUB6		(1)
- #define UPIO_MEM		(2)
- #define UPIO_MEM32		(3)
--#define UPIO_AU			(4)			/* Au1x00 type IO */
-+#define UPIO_AU			(4)			/* Au1x00 and RT288x type IO */
- #define UPIO_TSI		(5)			/* Tsi108/109 type IO */
- #define UPIO_DWAPB		(6)			/* DesignWare APB UART */
- #define UPIO_RM9000		(7)			/* RM9000 type IO */
diff --git a/target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch b/target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch
deleted file mode 100644
index f6f71c3e39..0000000000
--- a/target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/arch/mips/pci/Makefile
-+++ b/arch/mips/pci/Makefile
-@@ -52,3 +52,4 @@ obj-$(CONFIG_VICTOR_MPC30X)	+= fixup-mpc
- obj-$(CONFIG_ZAO_CAPCELLA)	+= fixup-capcella.o
- obj-$(CONFIG_WR_PPMC)		+= fixup-wrppmc.o
- obj-$(CONFIG_MIKROTIK_RB532)	+= pci-rc32434.o ops-rc32434.o fixup-rc32434.o
-+obj-$(CONFIG_SOC_RT288X)	+= pci-rt288x.o
diff --git a/target/linux/ramips/patches-2.6.30/103-ethernet.patch b/target/linux/ramips/patches-2.6.30/103-ethernet.patch
deleted file mode 100644
index 1828cbfc16..0000000000
--- a/target/linux/ramips/patches-2.6.30/103-ethernet.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -612,6 +612,12 @@ config MIPS_AU1X00_ENET
- 	  If you have an Alchemy Semi AU1X00 based system
- 	  say Y.  Otherwise, say N.
- 
-+config MIPS_RAMIPS_NET
-+	tristate "Ethernet driver for rt288x/rt305x"
-+	depends on MIPS_RALINK
-+	help
-+	  This driver supports the etehrnet mac inside the ralink wisocs
-+
- config SGI_IOC3_ETH
- 	bool "SGI IOC3 Ethernet"
- 	depends on PCI && SGI_IP27
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -204,6 +204,7 @@ obj-$(CONFIG_KORINA) += korina.o
- obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
- obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
- obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
-+obj-$(CONFIG_MIPS_RAMIPS_NET) += ramips.o
- obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
- obj-$(CONFIG_DECLANCE) += declance.o
- obj-$(CONFIG_ATARILANCE) += atarilance.o
diff --git a/target/linux/ramips/patches-2.6.30/400-mips-multi-machine-update.patch b/target/linux/ramips/patches-2.6.30/400-mips-multi-machine-update.patch
deleted file mode 100644
index d63587901d..0000000000
--- a/target/linux/ramips/patches-2.6.30/400-mips-multi-machine-update.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- a/arch/mips/kernel/mips_machine.c
-+++ b/arch/mips/kernel/mips_machine.c
-@@ -7,12 +7,13 @@
-  *
-  */
- #include <linux/mm.h>
-+#include <linux/string.h>
- 
- #include <asm/mips_machine.h>
--#include <asm/bootinfo.h>
- 
- static struct list_head mips_machines __initdata =
- 		LIST_HEAD_INIT(mips_machines);
-+static char *mips_machid __initdata;
- 
- char *mips_machine_name = "Unknown";
- 
-@@ -55,20 +56,65 @@ void __init mips_machine_set_name(char *
- 	}
- }
- 
--void __init mips_machine_setup(unsigned long machtype)
-+void __init mips_machine_setup(void)
- {
- 	struct mips_machine *mach;
- 
--	mach = mips_machine_find(machtype);
-+	mach = mips_machine_find(mips_machtype);
- 	if (!mach) {
--		printk(KERN_ALERT "MIPS: no machine registered for "
--			"machtype %lu\n", machtype);
-+		printk(KERN_WARNING "MIPS: no machine registered for "
-+			"machtype %lu\n", mips_machtype);
- 		return;
- 	}
- 
- 	mips_machine_set_name(mach->mach_name);
--	printk(KERN_INFO "MIPS: machine is %s\n", mips_machine_name);
-+	printk(KERN_NOTICE "MIPS: machine is %s\n", mips_machine_name);
- 
- 	if (mach->mach_setup)
- 		mach->mach_setup();
- }
-+
-+int __init mips_machtype_setup(char *id)
-+{
-+	if (mips_machid == NULL)
-+		mips_machid = id;
-+
-+	return 1;
-+}
-+
-+__setup("machtype=", mips_machtype_setup);
-+
-+static int __init mips_machtype_init(void)
-+{
-+	struct list_head *this;
-+	struct mips_machine *mach;
-+
-+	if (mips_machid == NULL)
-+		return 0;
-+
-+	list_for_each(this, &mips_machines) {
-+		mach = list_entry(this, struct mips_machine, list);
-+		if (mach->mach_id == NULL)
-+			continue;
-+
-+		if (strcmp(mach->mach_id, mips_machid) == 0) {
-+			mips_machtype = mach->mach_type;
-+			return 0;
-+		}
-+	}
-+
-+	printk(KERN_WARNING
-+	       "MIPS: no machine found for id: '%s', registered machines:\n",
-+	       mips_machid);
-+	printk(KERN_WARNING "%32s %s\n", "id", "name");
-+
-+	list_for_each(this, &mips_machines) {
-+		mach = list_entry(this, struct mips_machine, list);
-+		printk(KERN_WARNING "%32s %s\n",
-+		       mach->mach_id ? mach->mach_id : "", mach->mach_name);
-+	}
-+
-+	return 0;
-+}
-+
-+core_initcall(mips_machtype_init);
---- a/arch/mips/include/asm/mips_machine.h
-+++ b/arch/mips/include/asm/mips_machine.h
-@@ -13,25 +13,33 @@
- #include <linux/init.h>
- #include <linux/list.h>
- 
-+#include <asm/bootinfo.h>
-+
- struct mips_machine {
- 	unsigned long		mach_type;
--	void			(*mach_setup)(void);
-+	char			*mach_id;
- 	char			*mach_name;
-+	void			(*mach_setup)(void);
- 	struct list_head	list;
- };
- 
- void mips_machine_register(struct mips_machine *) __init;
--void mips_machine_setup(unsigned long machtype) __init;
-+void mips_machine_setup(void) __init;
-+int  mips_machtype_setup(char *id) __init;
- void mips_machine_set_name(char *name) __init;
- 
- extern char *mips_machine_name;
- 
--#define MIPS_MACHINE(_type, _name, _setup) 			\
--static char machine_name_##_type[] __initdata = _name;		\
-+#define MIPS_MACHINE(_type, _id, _name, _setup) 		\
-+static const char machine_name_##_type[] __initconst		\
-+			__aligned(1) = _name;			\
-+static const char machine_id_##_type[] __initconst		\
-+			__aligned(1) = _id;			\
- static struct mips_machine machine_##_type __initdata =		\
- {								\
- 	.mach_type	= _type,				\
--	.mach_name	= machine_name_##_type,			\
-+	.mach_id	= (char *) machine_id_##_type,		\
-+	.mach_name	= (char *) machine_name_##_type,	\
- 	.mach_setup	= _setup,				\
- };								\
- 								\
-@@ -44,4 +52,3 @@ static int __init register_machine_##_ty
- pure_initcall(register_machine_##_type)
- 
- #endif /* __ASM_MIPS_MACHINE_H */
--