diff options
Diffstat (limited to 'target/linux/ramips/patches-2.6.37')
8 files changed, 0 insertions, 320 deletions
diff --git a/target/linux/ramips/patches-2.6.37/001-mips-add-cp0-compare-irq-function.patch b/target/linux/ramips/patches-2.6.37/001-mips-add-cp0-compare-irq-function.patch deleted file mode 100644 index 38d997ef68..0000000000 --- a/target/linux/ramips/patches-2.6.37/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 -@@ -54,6 +54,7 @@ - #include <asm/types.h> - #include <asm/stacktrace.h> - #include <asm/uasm.h> -+#include <asm/time.h> - - extern void check_wait(void); - extern asmlinkage void r4k_wait(void); -@@ -1578,6 +1579,8 @@ void __cpuinit per_cpu_trap_init(void) - if (cpu_has_mips_r2) { - cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP; - cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7; -+ if (get_c0_compare_irq) -+ cp0_compare_irq = get_c0_compare_irq(); - cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 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.37/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch b/target/linux/ramips/patches-2.6.37/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch deleted file mode 100644 index 67801891a3..0000000000 --- a/target/linux/ramips/patches-2.6.37/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 -@@ -1640,7 +1640,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)) { -@@ -1728,7 +1728,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.37/011-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ramips/patches-2.6.37/011-mtd-cfi_cmdset_0002-force-word-write.patch deleted file mode 100644 index 8e93b10aa5..0000000000 --- a/target/linux/ramips/patches-2.6.37/011-mtd-cfi_cmdset_0002-force-word-write.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- a/drivers/mtd/chips/cfi_cmdset_0002.c -+++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -39,7 +39,7 @@ - #include <linux/mtd/xip.h> - - #define AMD_BOOTLOC_BUG --#define FORCE_WORD_WRITE 0 -+#define FORCE_WORD_WRITE 1 - - #define MAX_WORD_RETRIES 3 - -@@ -50,7 +50,9 @@ - - static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); - static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); -+#if !FORCE_WORD_WRITE - static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); -+#endif - static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *); - static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *); - static void cfi_amdstd_sync (struct mtd_info *); -@@ -186,6 +188,7 @@ static void fixup_amd_bootblock(struct m - } - #endif - -+#if !FORCE_WORD_WRITE - static void fixup_use_write_buffers(struct mtd_info *mtd, void *param) - { - struct map_info *map = mtd->priv; -@@ -195,6 +198,7 @@ static void fixup_use_write_buffers(stru - mtd->write = cfi_amdstd_write_buffers; - } - } -+#endif /* !FORCE_WORD_WRITE */ - - /* Atmel chips don't use the same PRI format as AMD chips */ - static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param) -@@ -472,7 +476,7 @@ struct mtd_info *cfi_cmdset_0002(struct - - /* - * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4 -- * see: Spec 1.3 http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 -+ * see: Spec 1.3 http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 - * http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf - * Spec 1.4 http://www.spansion.com/Support/AppNotes/CFI_Spec_AN_03.pdf, page 9 - */ -@@ -1386,6 +1390,7 @@ static int cfi_amdstd_write_words(struct - /* - * FIXME: interleaved mode not tested, and probably not supported! - */ -+#if !FORCE_WORD_WRITE - static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, - unsigned long adr, const u_char *buf, - int len) -@@ -1496,7 +1501,6 @@ static int __xipram do_write_buffer(stru - return ret; - } - -- - static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, - size_t *retlen, const u_char *buf) - { -@@ -1575,6 +1579,7 @@ static int cfi_amdstd_write_buffers(stru - - return 0; - } -+#endif /* !FORCE_WORD_WRITE */ - - - /* diff --git a/target/linux/ramips/patches-2.6.37/100-mips-ralink-core.patch b/target/linux/ramips/patches-2.6.37/100-mips-ralink-core.patch deleted file mode 100644 index 178a4bad74..0000000000 --- a/target/linux/ramips/patches-2.6.37/100-mips-ralink-core.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -158,6 +158,26 @@ cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -W - endif - cflags-$(CONFIG_CAVIUM_CN63XXP1) += -Wa,-mfix-cn63xxp1 - -+# -+# 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 -@@ -65,6 +65,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 BCM47XX - bool "Broadcom BCM47XX based boards" - select CEVT_R4K -@@ -722,6 +725,7 @@ source "arch/mips/jazz/Kconfig" - source "arch/mips/jz4740/Kconfig" - source "arch/mips/lasat/Kconfig" - source "arch/mips/pmc-sierra/Kconfig" -+source "arch/mips/ralink/Kconfig" - source "arch/mips/powertv/Kconfig" - source "arch/mips/sgi-ip27/Kconfig" - source "arch/mips/sibyte/Kconfig" -@@ -1081,7 +1085,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.37/101-rt288x_serial_driver_hack.patch b/target/linux/ramips/patches-2.6.37/101-rt288x_serial_driver_hack.patch deleted file mode 100644 index 441f983856..0000000000 --- a/target/linux/ramips/patches-2.6.37/101-rt288x_serial_driver_hack.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- a/drivers/serial/8250.c -+++ b/drivers/serial/8250.c -@@ -305,9 +305,9 @@ static const struct serial8250_config ua - }, - }; - --#if defined(CONFIG_MIPS_ALCHEMY) -+#if defined(CONFIG_MIPS_ALCHEMY) || 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, -@@ -571,8 +571,8 @@ static inline void _serial_dl_write(stru - serial_outp(up, UART_DLM, value >> 8 & 0xff); - } - --#if defined(CONFIG_MIPS_ALCHEMY) --/* Au1x00 haven't got a standard divisor latch */ -+#if defined(CONFIG_MIPS_ALCHEMY) || 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) -@@ -779,22 +779,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; ---- a/drivers/serial/Kconfig -+++ b/drivers/serial/Kconfig -@@ -258,6 +258,14 @@ config SERIAL_8250_ACORN - system, say Y to this option. The driver can handle 1, 2, or 3 port - cards. 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 -@@ -307,7 +307,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.37/102-rt288x-pci-driver-hook.patch b/target/linux/ramips/patches-2.6.37/102-rt288x-pci-driver-hook.patch deleted file mode 100644 index d2056c6465..0000000000 --- a/target/linux/ramips/patches-2.6.37/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.37/103-ethernet.patch b/target/linux/ramips/patches-2.6.37/103-ethernet.patch deleted file mode 100644 index bf6e094e87..0000000000 --- a/target/linux/ramips/patches-2.6.37/103-ethernet.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/drivers/net/Kconfig -+++ b/drivers/net/Kconfig -@@ -494,6 +494,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 -@@ -225,6 +225,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.37/104-ramips-watchdog-driver.patch b/target/linux/ramips/patches-2.6.37/104-ramips-watchdog-driver.patch deleted file mode 100644 index 643a6a0b66..0000000000 --- a/target/linux/ramips/patches-2.6.37/104-ramips-watchdog-driver.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -930,6 +930,13 @@ config BCM63XX_WDT - To compile this driver as a loadable module, choose M here. - The module will be called bcm63xx_wdt. - -+config RAMIPS_WDT -+ tristate "Ralink RT288X/RT305X Watchdog Timer" -+ depends on SOC_RT288X || SOC_RT305X -+ help -+ Hardware driver for the built-in watchdog timer on the -+ Ralink RT288X/RT305X SoCs. -+ - # PARISC Architecture - - # POWERPC Architecture ---- a/drivers/watchdog/Makefile -+++ b/drivers/watchdog/Makefile -@@ -119,6 +119,7 @@ obj-$(CONFIG_AR7_WDT) += ar7_wdt.o - obj-$(CONFIG_TXX9_WDT) += txx9wdt.o - obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o - octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o -+obj-$(CONFIG_RAMIPS_WDT) += ramips_wdt.o - - # PARISC Architecture - |