diff options
Diffstat (limited to 'target/linux/ramips/patches-2.6.32')
6 files changed, 0 insertions, 260 deletions
diff --git a/target/linux/ramips/patches-2.6.32/001-mips-add-cp0-compare-irq-function.patch b/target/linux/ramips/patches-2.6.32/001-mips-add-cp0-compare-irq-function.patch deleted file mode 100644 index babe906eb1..0000000000 --- a/target/linux/ramips/patches-2.6.32/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); -@@ -1537,6 +1538,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.32/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch b/target/linux/ramips/patches-2.6.32/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch deleted file mode 100644 index 22aefe0d46..0000000000 --- a/target/linux/ramips/patches-2.6.32/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 -@@ -1568,7 +1568,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)) { -@@ -1656,7 +1656,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.32/100-mips-ralink-core.patch b/target/linux/ramips/patches-2.6.32/100-mips-ralink-core.patch deleted file mode 100644 index 10d329ca05..0000000000 --- a/target/linux/ramips/patches-2.6.32/100-mips-ralink-core.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -156,6 +156,26 @@ ifeq (,$(findstring march=octeon, $(cfla - cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon - 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 -+ - cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,) - cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,) - cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,) ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -43,6 +43,9 @@ config AR7 - Support for the Texas Instruments AR7 System-on-a-Chip - family: TNETD7100, 7200 and 7300. - -+config MIPS_RALINK -+ bool "Ralink MIPS SoC based boards" -+ - config BASLER_EXCITE - bool "Basler eXcite smart camera" - select CEVT_R4K -@@ -679,6 +682,7 @@ source "arch/mips/bcm63xx/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" -@@ -1045,7 +1049,7 @@ config BOOT_ELF32 - - config MIPS_L1_CACHE_SHIFT - int -- default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL -+ default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL || RALINK_RT288X - default "6" if MIPS_CPU_SCACHE - default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM || CPU_CAVIUM_OCTEON - default "5" diff --git a/target/linux/ramips/patches-2.6.32/101-rt288x_serial_driver_hack.patch b/target/linux/ramips/patches-2.6.32/101-rt288x_serial_driver_hack.patch deleted file mode 100644 index 8e47aa3f10..0000000000 --- a/target/linux/ramips/patches-2.6.32/101-rt288x_serial_driver_hack.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- a/drivers/serial/8250.c -+++ b/drivers/serial/8250.c -@@ -301,9 +301,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, -@@ -421,7 +421,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; -@@ -502,7 +502,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; -@@ -534,7 +534,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: -@@ -572,8 +572,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) -@@ -780,22 +780,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; -@@ -1217,7 +1214,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 -@@ -281,7 +281,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.32/102-rt288x-pci-driver-hook.patch b/target/linux/ramips/patches-2.6.32/102-rt288x-pci-driver-hook.patch deleted file mode 100644 index d2056c6465..0000000000 --- a/target/linux/ramips/patches-2.6.32/102-rt288x-pci-driver-hook.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/arch/mips/pci/Makefile -+++ b/arch/mips/pci/Makefile -@@ -55,6 +55,7 @@ obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capc - obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o - obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.o - obj-$(CONFIG_CPU_CAVIUM_OCTEON) += pci-octeon.o pcie-octeon.o -+obj-$(CONFIG_SOC_RT288X) += pci-rt288x.o - - ifdef CONFIG_PCI_MSI - obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o diff --git a/target/linux/ramips/patches-2.6.32/103-ethernet.patch b/target/linux/ramips/patches-2.6.32/103-ethernet.patch deleted file mode 100644 index 8b370b608a..0000000000 --- a/target/linux/ramips/patches-2.6.32/103-ethernet.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/drivers/net/Kconfig -+++ b/drivers/net/Kconfig -@@ -602,6 +602,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 -@@ -217,6 +217,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 |