diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
| commit | 9a495f6bbbcb294b9926f4ec32e5bbb339395d00 (patch) | |
| tree | c76b5e53fffd1d6238ba09da9d8bb7a6bde9e474 /target/linux/ramips/patches-3.14 | |
| parent | 3951f9492f31b59602a9a7c46fbb041be0929be0 (diff) | |
| download | master-31e0f0ae-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.gz master-31e0f0ae-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.bz2 master-31e0f0ae-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.zip | |
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43564
Diffstat (limited to 'target/linux/ramips/patches-3.14')
20 files changed, 217 insertions, 320 deletions
diff --git a/target/linux/ramips/patches-3.14/0012-MIPS-ralink-add-MT7621-support.patch b/target/linux/ramips/patches-3.14/0012-MIPS-ralink-add-MT7621-support.patch index 1798ee00a8..2471e7c8f5 100644 --- a/target/linux/ramips/patches-3.14/0012-MIPS-ralink-add-MT7621-support.patch +++ b/target/linux/ramips/patches-3.14/0012-MIPS-ralink-add-MT7621-support.patch @@ -22,10 +22,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 arch/mips/ralink/malta-amon.c create mode 100644 arch/mips/ralink/mt7621.c -Index: linux-3.14.18/arch/mips/include/asm/gic.h -=================================================================== ---- linux-3.14.18.orig/arch/mips/include/asm/gic.h 2014-09-06 01:34:59.000000000 +0200 -+++ linux-3.14.18/arch/mips/include/asm/gic.h 2014-11-12 18:15:37.293244085 +0100 +--- a/arch/mips/include/asm/gic.h ++++ b/arch/mips/include/asm/gic.h @@ -19,7 +19,11 @@ #define GIC_TRIG_EDGE 1 #define GIC_TRIG_LEVEL 0 @@ -38,10 +36,8 @@ Index: linux-3.14.18/arch/mips/include/asm/gic.h #define MSK(n) ((1 << (n)) - 1) #define REG32(addr) (*(volatile unsigned int *) (addr)) -Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/irq.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/arch/mips/include/asm/mach-ralink/irq.h 2014-11-12 18:15:37.297244234 +0100 +--- /dev/null ++++ b/arch/mips/include/asm/mach-ralink/irq.h @@ -0,0 +1,9 @@ +#ifndef __ASM_MACH_RALINK_IRQ_H +#define __ASM_MACH_RALINK_IRQ_H @@ -52,10 +48,8 @@ Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/irq.h +#include_next <irq.h> + +#endif -Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/mt7621.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/arch/mips/include/asm/mach-ralink/mt7621.h 2014-11-12 18:15:37.297244234 +0100 +--- /dev/null ++++ b/arch/mips/include/asm/mach-ralink/mt7621.h @@ -0,0 +1,39 @@ +/* + * This program is free software; you can redistribute it and/or modify it @@ -96,11 +90,9 @@ Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/mt7621.h +#define MIPS_GIC_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8) + +#endif -Index: linux-3.14.18/arch/mips/kernel/vmlinux.lds.S -=================================================================== ---- linux-3.14.18.orig/arch/mips/kernel/vmlinux.lds.S 2014-11-12 18:15:35.441175040 +0100 -+++ linux-3.14.18/arch/mips/kernel/vmlinux.lds.S 2014-11-12 18:15:37.297244234 +0100 -@@ -51,6 +51,7 @@ +--- a/arch/mips/kernel/vmlinux.lds.S ++++ b/arch/mips/kernel/vmlinux.lds.S +@@ -51,6 +51,7 @@ SECTIONS /* read-only */ _text = .; /* Text and read-only data */ .text : { @@ -108,11 +100,9 @@ Index: linux-3.14.18/arch/mips/kernel/vmlinux.lds.S TEXT_TEXT SCHED_TEXT LOCK_TEXT -Index: linux-3.14.18/arch/mips/ralink/Kconfig -=================================================================== ---- linux-3.14.18.orig/arch/mips/ralink/Kconfig 2014-09-06 01:34:59.000000000 +0200 -+++ linux-3.14.18/arch/mips/ralink/Kconfig 2014-11-13 10:37:45.371792998 +0100 -@@ -7,6 +7,11 @@ +--- a/arch/mips/ralink/Kconfig ++++ b/arch/mips/ralink/Kconfig +@@ -7,6 +7,11 @@ config CLKEVT_RT3352 select CLKSRC_OF select CLKSRC_MMIO @@ -124,7 +114,7 @@ Index: linux-3.14.18/arch/mips/ralink/Kconfig choice prompt "Ralink SoC selection" default SOC_RT305X -@@ -34,6 +39,15 @@ +@@ -34,6 +39,15 @@ choice select USB_ARCH_HAS_OHCI select USB_ARCH_HAS_EHCI @@ -140,7 +130,7 @@ Index: linux-3.14.18/arch/mips/ralink/Kconfig endchoice choice -@@ -61,6 +75,10 @@ +@@ -61,6 +75,10 @@ choice bool "MT7620A eval kit" depends on SOC_MT7620 @@ -151,10 +141,8 @@ Index: linux-3.14.18/arch/mips/ralink/Kconfig endchoice endif -Index: linux-3.14.18/arch/mips/ralink/Makefile -=================================================================== ---- linux-3.14.18.orig/arch/mips/ralink/Makefile 2014-11-12 18:15:37.225241550 +0100 -+++ linux-3.14.18/arch/mips/ralink/Makefile 2014-11-13 10:37:43.947738138 +0100 +--- a/arch/mips/ralink/Makefile ++++ b/arch/mips/ralink/Makefile @@ -6,16 +6,21 @@ # Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org> # Copyright (C) 2013 John Crispin <blogic@openwrt.org> @@ -178,11 +166,9 @@ Index: linux-3.14.18/arch/mips/ralink/Makefile obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -Index: linux-3.14.18/arch/mips/ralink/Platform -=================================================================== ---- linux-3.14.18.orig/arch/mips/ralink/Platform 2014-09-06 01:34:59.000000000 +0200 -+++ linux-3.14.18/arch/mips/ralink/Platform 2014-11-12 18:15:37.297244234 +0100 -@@ -27,3 +27,8 @@ +--- a/arch/mips/ralink/Platform ++++ b/arch/mips/ralink/Platform +@@ -27,3 +27,8 @@ cflags-$(CONFIG_SOC_RT3883) += -I$(srctr # load-$(CONFIG_SOC_MT7620) += 0xffffffff80000000 cflags-$(CONFIG_SOC_MT7620) += -I$(srctree)/arch/mips/include/asm/mach-ralink/mt7620 @@ -191,10 +177,8 @@ Index: linux-3.14.18/arch/mips/ralink/Platform +# +load-$(CONFIG_SOC_MT7621) += 0xffffffff80001000 +cflags-$(CONFIG_SOC_MT7621) += -I$(srctree)/arch/mips/include/asm/mach-ralink/mt7621 -Index: linux-3.14.18/arch/mips/ralink/irq-gic.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/arch/mips/ralink/irq-gic.c 2014-11-12 18:15:37.297244234 +0100 +--- /dev/null ++++ b/arch/mips/ralink/irq-gic.c @@ -0,0 +1,271 @@ +#include <linux/init.h> +#include <linux/sched.h> @@ -467,10 +451,8 @@ Index: linux-3.14.18/arch/mips/ralink/irq-gic.c +{ + of_irq_init(of_irq_ids); +} -Index: linux-3.14.18/arch/mips/ralink/malta-amon.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/arch/mips/ralink/malta-amon.c 2014-11-12 18:15:37.297244234 +0100 +--- /dev/null ++++ b/arch/mips/ralink/malta-amon.c @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2007 MIPS Technologies, Inc. @@ -553,10 +535,8 @@ Index: linux-3.14.18/arch/mips/ralink/malta-amon.c + smp_rmb(); /* Target will be updating flags soon */ + pr_debug("launch: cpu%d gone!\n", cpu); +} -Index: linux-3.14.18/arch/mips/ralink/mt7621.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/arch/mips/ralink/mt7621.c 2014-11-13 10:32:56.960683223 +0100 +--- /dev/null ++++ b/arch/mips/ralink/mt7621.c @@ -0,0 +1,183 @@ +/* + * This program is free software; you can redistribute it and/or modify it diff --git a/target/linux/ramips/patches-3.14/0017-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch b/target/linux/ramips/patches-3.14/0017-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch index a3b4e4a70f..1423a3acc7 100644 --- a/target/linux/ramips/patches-3.14/0017-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch +++ b/target/linux/ramips/patches-3.14/0017-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch @@ -24,7 +24,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device); int cp0_timer_irq_installed; -@@ -90,9 +84,38 @@ struct irqaction c0_compare_irqaction = +@@ -90,9 +84,38 @@ struct irqaction c0_compare_irqaction = .name = "timer", }; diff --git a/target/linux/ramips/patches-3.14/0021-MIPS-ralink-add-cpu-frequency-scaling.patch b/target/linux/ramips/patches-3.14/0021-MIPS-ralink-add-cpu-frequency-scaling.patch index 0e567cb2f0..ea1d03aad3 100644 --- a/target/linux/ramips/patches-3.14/0021-MIPS-ralink-add-cpu-frequency-scaling.patch +++ b/target/linux/ramips/patches-3.14/0021-MIPS-ralink-add-cpu-frequency-scaling.patch @@ -55,7 +55,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> static void systick_set_clock_mode(enum clock_event_mode mode, struct clock_event_device *evt) { -@@ -101,9 +122,13 @@ static void systick_set_clock_mode(enum +@@ -101,9 +122,13 @@ static void systick_set_clock_mode(enum sdev->irq_requested = 1; iowrite32(CFG_EXT_STK_EN | CFG_CNT_EN, systick.membase + SYSTICK_CONFIG); @@ -69,7 +69,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> if (sdev->irq_requested) free_irq(systick.dev.irq, &systick_irqaction); sdev->irq_requested = 0; -@@ -116,12 +141,23 @@ static void systick_set_clock_mode(enum +@@ -116,12 +141,23 @@ static void systick_set_clock_mode(enum } } diff --git a/target/linux/ramips/patches-3.14/0030-pinctrl-ralink-add-pinctrl-driver.patch b/target/linux/ramips/patches-3.14/0030-pinctrl-ralink-add-pinctrl-driver.patch index 56fc3d7227..b4af82529f 100644 --- a/target/linux/ramips/patches-3.14/0030-pinctrl-ralink-add-pinctrl-driver.patch +++ b/target/linux/ramips/patches-3.14/0030-pinctrl-ralink-add-pinctrl-driver.patch @@ -330,25 +330,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> - .gpio_first = 72, - .gpio_last = 72, - }, {0} -+static struct rt2880_pmx_func i2c_grp[] = { FUNC("i2c", 0, 1, 2) }; -+static struct rt2880_pmx_func spi_grp[] = { FUNC("spi", 0, 3, 4) }; -+static struct rt2880_pmx_func uartlite_grp[] = { FUNC("uartlite", 0, 15, 2) }; -+static struct rt2880_pmx_func mdio_grp[] = { FUNC("mdio", 0, 22, 2) }; -+static struct rt2880_pmx_func rgmii1_grp[] = { FUNC("rgmii1", 0, 24, 12) }; -+static struct rt2880_pmx_func refclk_grp[] = { FUNC("spi refclk", 0, 37, 3) }; -+static struct rt2880_pmx_func ephy_grp[] = { FUNC("ephy", 0, 40, 5) }; -+static struct rt2880_pmx_func rgmii2_grp[] = { FUNC("rgmii2", 0, 60, 12) }; -+static struct rt2880_pmx_func wled_grp[] = { FUNC("wled", 0, 72, 1) }; -+static struct rt2880_pmx_func pa_grp[] = { FUNC("pa", 0, 18, 4) }; -+static struct rt2880_pmx_func uartf_grp[] = { -+ FUNC("uartf", MT7620_GPIO_MODE_UARTF, 7, 8), -+ FUNC("pcm uartf", MT7620_GPIO_MODE_PCM_UARTF, 7, 8), -+ FUNC("pcm i2s", MT7620_GPIO_MODE_PCM_I2S, 7, 8), -+ FUNC("i2s uartf", MT7620_GPIO_MODE_I2S_UARTF, 7, 8), -+ FUNC("pcm gpio", MT7620_GPIO_MODE_PCM_GPIO, 11, 4), -+ FUNC("gpio uartf", MT7620_GPIO_MODE_GPIO_UARTF, 7, 4), -+ FUNC("gpio i2s", MT7620_GPIO_MODE_GPIO_I2S, 7, 4), - }; +-}; - -static struct ralink_pinmux_grp uart_mux[] = { - { @@ -390,6 +372,32 @@ Signed-off-by: John Crispin <blogic@openwrt.org> - .name = "gpio", - .mask = MT7620_GPIO_MODE_GPIO, - }, {0} +-}; +- +-struct ralink_pinmux rt_gpio_pinmux = { +- .mode = mode_mux, +- .uart = uart_mux, +- .uart_shift = MT7620_GPIO_MODE_UART0_SHIFT, +- .uart_mask = MT7620_GPIO_MODE_UART0_MASK, ++static struct rt2880_pmx_func i2c_grp[] = { FUNC("i2c", 0, 1, 2) }; ++static struct rt2880_pmx_func spi_grp[] = { FUNC("spi", 0, 3, 4) }; ++static struct rt2880_pmx_func uartlite_grp[] = { FUNC("uartlite", 0, 15, 2) }; ++static struct rt2880_pmx_func mdio_grp[] = { FUNC("mdio", 0, 22, 2) }; ++static struct rt2880_pmx_func rgmii1_grp[] = { FUNC("rgmii1", 0, 24, 12) }; ++static struct rt2880_pmx_func refclk_grp[] = { FUNC("spi refclk", 0, 37, 3) }; ++static struct rt2880_pmx_func ephy_grp[] = { FUNC("ephy", 0, 40, 5) }; ++static struct rt2880_pmx_func rgmii2_grp[] = { FUNC("rgmii2", 0, 60, 12) }; ++static struct rt2880_pmx_func wled_grp[] = { FUNC("wled", 0, 72, 1) }; ++static struct rt2880_pmx_func pa_grp[] = { FUNC("pa", 0, 18, 4) }; ++static struct rt2880_pmx_func uartf_grp[] = { ++ FUNC("uartf", MT7620_GPIO_MODE_UARTF, 7, 8), ++ FUNC("pcm uartf", MT7620_GPIO_MODE_PCM_UARTF, 7, 8), ++ FUNC("pcm i2s", MT7620_GPIO_MODE_PCM_I2S, 7, 8), ++ FUNC("i2s uartf", MT7620_GPIO_MODE_I2S_UARTF, 7, 8), ++ FUNC("pcm gpio", MT7620_GPIO_MODE_PCM_GPIO, 11, 4), ++ FUNC("gpio uartf", MT7620_GPIO_MODE_GPIO_UARTF, 7, 4), ++ FUNC("gpio i2s", MT7620_GPIO_MODE_GPIO_I2S, 7, 4), ++}; +static struct rt2880_pmx_func wdt_grp[] = { + FUNC("wdt rst", 0, 17, 1), + FUNC("wdt refclk", 0, 17, 1), @@ -401,13 +409,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org> +static struct rt2880_pmx_func nd_sd_grp[] = { + FUNC("nand", MT7620_GPIO_MODE_NAND, 45, 15), + FUNC("sd", MT7620_GPIO_MODE_SD, 45, 15) - }; - --struct ralink_pinmux rt_gpio_pinmux = { -- .mode = mode_mux, -- .uart = uart_mux, -- .uart_shift = MT7620_GPIO_MODE_UART0_SHIFT, -- .uart_mask = MT7620_GPIO_MODE_UART0_MASK, ++}; ++ +static struct rt2880_pmx_group mt7620a_pinmux_data[] = { + GRP("i2c", i2c_grp, 1, MT7620_GPIO_MODE_I2C), + GRP("uartf", uartf_grp, MT7620_GPIO_MODE_UART0_MASK, diff --git a/target/linux/ramips/patches-3.14/0032-PCI-MIPS-adds-mt7620a-pcie-driver.patch b/target/linux/ramips/patches-3.14/0032-PCI-MIPS-adds-mt7620a-pcie-driver.patch index bea6a46098..ca835dafb3 100644 --- a/target/linux/ramips/patches-3.14/0032-PCI-MIPS-adds-mt7620a-pcie-driver.patch +++ b/target/linux/ramips/patches-3.14/0032-PCI-MIPS-adds-mt7620a-pcie-driver.patch @@ -11,11 +11,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 3 files changed, 365 insertions(+) create mode 100644 arch/mips/pci/pci-mt7620.c -Index: linux-3.14.18/arch/mips/pci/Makefile -=================================================================== ---- linux-3.14.18.orig/arch/mips/pci/Makefile 2014-11-17 16:02:34.009553392 +0100 -+++ linux-3.14.18/arch/mips/pci/Makefile 2014-11-17 16:02:34.017553694 +0100 -@@ -42,6 +42,7 @@ +--- a/arch/mips/pci/Makefile ++++ b/arch/mips/pci/Makefile +@@ -42,6 +42,7 @@ obj-$(CONFIG_SNI_RM) += fixup-sni.o ops obj-$(CONFIG_LANTIQ) += fixup-lantiq.o obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o obj-$(CONFIG_SOC_MT7621) += pci-mt7621.o @@ -23,10 +21,8 @@ Index: linux-3.14.18/arch/mips/pci/Makefile obj-$(CONFIG_SOC_RT2880) += pci-rt2880.o obj-$(CONFIG_SOC_RT3883) += pci-rt3883.o obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o -Index: linux-3.14.18/arch/mips/pci/pci-mt7620.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/arch/mips/pci/pci-mt7620.c 2014-11-17 16:09:52.814075085 +0100 +--- /dev/null ++++ b/arch/mips/pci/pci-mt7620.c @@ -0,0 +1,396 @@ +/* + * Ralink MT7620A SoC PCI support @@ -424,11 +420,9 @@ Index: linux-3.14.18/arch/mips/pci/pci-mt7620.c +} + +arch_initcall(mt7620_pci_init); -Index: linux-3.14.18/arch/mips/ralink/Kconfig -=================================================================== ---- linux-3.14.18.orig/arch/mips/ralink/Kconfig 2014-11-17 16:02:34.009553392 +0100 -+++ linux-3.14.18/arch/mips/ralink/Kconfig 2014-11-17 16:02:34.021553845 +0100 -@@ -39,6 +39,7 @@ +--- a/arch/mips/ralink/Kconfig ++++ b/arch/mips/ralink/Kconfig +@@ -39,6 +39,7 @@ choice bool "MT7620/8" select USB_ARCH_HAS_OHCI select USB_ARCH_HAS_EHCI @@ -436,11 +430,9 @@ Index: linux-3.14.18/arch/mips/ralink/Kconfig config SOC_MT7621 bool "MT7621" -Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/mt7620.h -=================================================================== ---- linux-3.14.18.orig/arch/mips/include/asm/mach-ralink/mt7620.h 2014-11-17 16:02:33.993552790 +0100 -+++ linux-3.14.18/arch/mips/include/asm/mach-ralink/mt7620.h 2014-11-17 16:10:00.002345398 +0100 -@@ -19,6 +19,7 @@ +--- a/arch/mips/include/asm/mach-ralink/mt7620.h ++++ b/arch/mips/include/asm/mach-ralink/mt7620.h +@@ -19,6 +19,7 @@ enum mt762x_soc_type { MT762X_SOC_MT7620N, MT762X_SOC_MT7628AN, }; diff --git a/target/linux/ramips/patches-3.14/0040-USB-add-mt7621-xhci-support.patch b/target/linux/ramips/patches-3.14/0040-USB-add-mt7621-xhci-support.patch index bc1915e4aa..9ff46ce075 100644 --- a/target/linux/ramips/patches-3.14/0040-USB-add-mt7621-xhci-support.patch +++ b/target/linux/ramips/patches-3.14/0040-USB-add-mt7621-xhci-support.patch @@ -5143,7 +5143,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> return 1; } -@@ -2991,6 +2994,7 @@ static int prepare_ring(struct xhci_hcd +@@ -2990,6 +2993,7 @@ static int prepare_ring(struct xhci_hcd next = ring->enqueue; while (last_trb(xhci, ring, ring->enq_seg, next)) { @@ -5151,7 +5151,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> /* If we're not dealing with 0.95 hardware or isoc rings * on AMD 0.96 host, clear the chain bit. */ -@@ -3000,7 +3004,9 @@ static int prepare_ring(struct xhci_hcd +@@ -2999,7 +3003,9 @@ static int prepare_ring(struct xhci_hcd next->link.control &= cpu_to_le32(~TRB_CHAIN); else next->link.control |= cpu_to_le32(TRB_CHAIN); @@ -5162,7 +5162,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> wmb(); next->link.control ^= cpu_to_le32(TRB_CYCLE); -@@ -3130,6 +3136,9 @@ static void giveback_first_trb(struct xh +@@ -3129,6 +3135,9 @@ static void giveback_first_trb(struct xh start_trb->field[3] |= cpu_to_le32(start_cycle); else start_trb->field[3] &= cpu_to_le32(~TRB_CYCLE); @@ -5172,7 +5172,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> xhci_ring_ep_doorbell(xhci, slot_id, ep_index, stream_id); } -@@ -3185,6 +3194,29 @@ static u32 xhci_td_remainder(unsigned in +@@ -3184,6 +3193,29 @@ static u32 xhci_td_remainder(unsigned in return (remainder >> 10) << 17; } @@ -5202,7 +5202,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> /* * For xHCI 1.0 host controllers, TD size is the number of max packet sized * packets remaining in the TD (*not* including this TRB). -@@ -3322,6 +3354,7 @@ static int queue_bulk_sg_tx(struct xhci_ +@@ -3321,6 +3353,7 @@ static int queue_bulk_sg_tx(struct xhci_ } /* Set the TRB length, TD size, and interrupter fields. */ @@ -5210,7 +5210,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> if (xhci->hci_version < 0x100) { remainder = xhci_td_remainder( urb->transfer_buffer_length - -@@ -3331,6 +3364,13 @@ static int queue_bulk_sg_tx(struct xhci_ +@@ -3330,6 +3363,13 @@ static int queue_bulk_sg_tx(struct xhci_ trb_buff_len, total_packet_count, urb, num_trbs - 1); } @@ -5224,7 +5224,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> length_field = TRB_LEN(trb_buff_len) | remainder | TRB_INTR_TARGET(0); -@@ -3393,6 +3433,9 @@ int xhci_queue_bulk_tx(struct xhci_hcd * +@@ -3392,6 +3432,9 @@ int xhci_queue_bulk_tx(struct xhci_hcd * int running_total, trb_buff_len, ret; unsigned int total_packet_count; u64 addr; @@ -5234,7 +5234,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> if (urb->num_sgs) return queue_bulk_sg_tx(xhci, mem_flags, urb, slot_id, ep_index); -@@ -3418,6 +3461,25 @@ int xhci_queue_bulk_tx(struct xhci_hcd * +@@ -3417,6 +3460,25 @@ int xhci_queue_bulk_tx(struct xhci_hcd * running_total += TRB_MAX_BUFF_SIZE; } /* FIXME: this doesn't deal with URB_ZERO_PACKET - need one more */ @@ -5260,7 +5260,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> ret = prepare_transfer(xhci, xhci->devs[slot_id], ep_index, urb->stream_id, -@@ -3477,6 +3539,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd * +@@ -3476,6 +3538,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd * field |= TRB_ISP; /* Set the TRB length, TD size, and interrupter fields. */ @@ -5268,7 +5268,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> if (xhci->hci_version < 0x100) { remainder = xhci_td_remainder( urb->transfer_buffer_length - -@@ -3486,6 +3549,10 @@ int xhci_queue_bulk_tx(struct xhci_hcd * +@@ -3485,6 +3548,10 @@ int xhci_queue_bulk_tx(struct xhci_hcd * trb_buff_len, total_packet_count, urb, num_trbs - 1); } @@ -5279,7 +5279,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> length_field = TRB_LEN(trb_buff_len) | remainder | TRB_INTR_TARGET(0); -@@ -3575,7 +3642,11 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * +@@ -3574,7 +3641,11 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * field |= 0x1; /* xHCI 1.0 6.4.1.2.1: Transfer Type field */ @@ -5291,7 +5291,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> if (urb->transfer_buffer_length > 0) { if (setup->bRequestType & USB_DIR_IN) field |= TRB_TX_TYPE(TRB_DATA_IN); -@@ -3599,7 +3670,12 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * +@@ -3598,7 +3669,12 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * field = TRB_TYPE(TRB_DATA); length_field = TRB_LEN(urb->transfer_buffer_length) | @@ -5304,7 +5304,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> TRB_INTR_TARGET(0); if (urb->transfer_buffer_length > 0) { if (setup->bRequestType & USB_DIR_IN) -@@ -3610,7 +3686,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * +@@ -3609,7 +3685,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * length_field, field | ep_ring->cycle_state); } @@ -5313,7 +5313,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> /* Save the DMA address of the last TRB in the TD */ td->last_trb = ep_ring->enqueue; -@@ -3722,6 +3798,9 @@ static int xhci_queue_isoc_tx(struct xhc +@@ -3721,6 +3797,9 @@ static int xhci_queue_isoc_tx(struct xhc u64 start_addr, addr; int i, j; bool more_trbs_coming; @@ -5323,7 +5323,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> ep_ring = xhci->devs[slot_id]->eps[ep_index].ring; -@@ -3735,6 +3814,21 @@ static int xhci_queue_isoc_tx(struct xhc +@@ -3734,6 +3813,21 @@ static int xhci_queue_isoc_tx(struct xhc start_trb = &ep_ring->enqueue->generic; start_cycle = ep_ring->cycle_state; @@ -5345,7 +5345,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> urb_priv = urb->hcpriv; /* Queue the first TRB, even if it's zero-length */ for (i = 0; i < num_tds; i++) { -@@ -3806,9 +3900,13 @@ static int xhci_queue_isoc_tx(struct xhc +@@ -3805,9 +3899,13 @@ static int xhci_queue_isoc_tx(struct xhc } else { td->last_trb = ep_ring->enqueue; field |= TRB_IOC; @@ -5359,7 +5359,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> /* Set BEI bit except for the last td */ if (i < num_tds - 1) field |= TRB_BEI; -@@ -3823,6 +3921,7 @@ static int xhci_queue_isoc_tx(struct xhc +@@ -3822,6 +3920,7 @@ static int xhci_queue_isoc_tx(struct xhc trb_buff_len = td_remain_len; /* Set the TRB length, TD size, & interrupter fields. */ @@ -5367,7 +5367,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> if (xhci->hci_version < 0x100) { remainder = xhci_td_remainder( td_len - running_total); -@@ -3832,6 +3931,10 @@ static int xhci_queue_isoc_tx(struct xhc +@@ -3831,6 +3930,10 @@ static int xhci_queue_isoc_tx(struct xhc total_packet_count, urb, (trbs_per_td - j - 1)); } @@ -5397,7 +5397,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> #define DRIVER_AUTHOR "Sarah Sharp" #define DRIVER_DESC "'eXtensible' Host Controller (xHC) Driver" -@@ -44,6 +54,18 @@ static unsigned int quirks; +@@ -46,6 +56,18 @@ static unsigned int quirks; module_param(quirks, uint, S_IRUGO); MODULE_PARM_DESC(quirks, "Bit flags for quirks to be enabled as default"); @@ -5416,7 +5416,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> /* TODO: copied from ehci-hcd.c - can this be refactored? */ /* * xhci_handshake - spin reading hc until handshake completes or fails -@@ -196,7 +218,7 @@ int xhci_reset(struct xhci_hcd *xhci) +@@ -198,7 +220,7 @@ int xhci_reset(struct xhci_hcd *xhci) return ret; } @@ -5425,7 +5425,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> static int xhci_free_msi(struct xhci_hcd *xhci) { int i; -@@ -399,6 +421,7 @@ static int xhci_try_enable_msi(struct us +@@ -401,6 +423,7 @@ static int xhci_try_enable_msi(struct us return ret; } hcd->irq = pdev->irq; @@ -5433,7 +5433,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> return 0; } -@@ -442,6 +465,11 @@ static void compliance_mode_recovery(uns +@@ -444,6 +467,11 @@ static void compliance_mode_recovery(uns "Attempting compliance mode recovery"); hcd = xhci->shared_hcd; @@ -5445,7 +5445,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> if (hcd->state == HC_STATE_SUSPENDED) usb_hcd_resume_root_hub(hcd); -@@ -491,6 +519,9 @@ bool xhci_compliance_mode_recovery_timer +@@ -493,6 +521,9 @@ bool xhci_compliance_mode_recovery_timer { const char *dmi_product_name, *dmi_sys_vendor; @@ -5455,7 +5455,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> dmi_product_name = dmi_get_system_info(DMI_PRODUCT_NAME); dmi_sys_vendor = dmi_get_system_info(DMI_SYS_VENDOR); if (!dmi_product_name || !dmi_sys_vendor) -@@ -536,6 +567,10 @@ int xhci_init(struct usb_hcd *hcd) +@@ -538,6 +569,10 @@ int xhci_init(struct usb_hcd *hcd) xhci_dbg_trace(xhci, trace_xhci_dbg_init, "xHCI doesn't need link TRB QUIRK"); } @@ -5466,7 +5466,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> retval = xhci_mem_init(xhci, GFP_KERNEL); xhci_dbg_trace(xhci, trace_xhci_dbg_init, "Finished xhci_init"); -@@ -620,7 +655,11 @@ int xhci_run(struct usb_hcd *hcd) +@@ -622,7 +657,11 @@ int xhci_run(struct usb_hcd *hcd) "// Set the interrupt modulation register"); temp = readl(&xhci->ir_set->irq_control); temp &= ~ER_IRQ_INTERVAL_MASK; @@ -5478,7 +5478,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> writel(temp, &xhci->ir_set->irq_control); /* Set the HCD state before we enable the irqs */ -@@ -641,6 +680,9 @@ int xhci_run(struct usb_hcd *hcd) +@@ -643,6 +682,9 @@ int xhci_run(struct usb_hcd *hcd) xhci_queue_vendor_command(xhci, 0, 0, 0, TRB_TYPE(TRB_NEC_GET_FW)); @@ -5488,7 +5488,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> xhci_dbg_trace(xhci, trace_xhci_dbg_init, "Finished xhci_run for USB2 roothub"); return 0; -@@ -970,7 +1012,6 @@ int xhci_resume(struct xhci_hcd *xhci, b +@@ -1010,7 +1052,6 @@ int xhci_resume(struct xhci_hcd *xhci, b /* If restore operation fails, re-initialize the HC during resume */ if ((temp & STS_SRE) || hibernated) { @@ -5496,7 +5496,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> if ((xhci->quirks & XHCI_COMP_MODE_QUIRK) && !(xhci_all_ports_seen_u0(xhci))) { del_timer_sync(&xhci->comp_mode_recovery_timer); -@@ -1573,6 +1614,13 @@ int xhci_drop_endpoint(struct usb_hcd *h +@@ -1613,6 +1654,13 @@ int xhci_drop_endpoint(struct usb_hcd *h u32 drop_flag; u32 new_add_flags, new_drop_flags, new_slot_info; int ret; @@ -5510,7 +5510,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> ret = xhci_check_args(hcd, udev, ep, 1, true, __func__); if (ret <= 0) -@@ -1630,6 +1678,40 @@ int xhci_drop_endpoint(struct usb_hcd *h +@@ -1670,6 +1718,40 @@ int xhci_drop_endpoint(struct usb_hcd *h xhci_endpoint_zero(xhci, xhci->devs[udev->slot_id], ep); @@ -5551,7 +5551,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> xhci_dbg(xhci, "drop ep 0x%x, slot id %d, new drop flags = %#x, new add flags = %#x, new slot info = %#x\n", (unsigned int) ep->desc.bEndpointAddress, udev->slot_id, -@@ -1665,6 +1747,18 @@ int xhci_add_endpoint(struct usb_hcd *hc +@@ -1705,6 +1787,18 @@ int xhci_add_endpoint(struct usb_hcd *hc u32 new_add_flags, new_drop_flags, new_slot_info; struct xhci_virt_device *virt_dev; int ret = 0; @@ -5570,7 +5570,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> ret = xhci_check_args(hcd, udev, ep, 1, true, __func__); if (ret <= 0) { -@@ -1732,6 +1826,56 @@ int xhci_add_endpoint(struct usb_hcd *hc +@@ -1772,6 +1866,56 @@ int xhci_add_endpoint(struct usb_hcd *hc return -ENOMEM; } @@ -5627,7 +5627,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> ctrl_ctx->add_flags |= cpu_to_le32(added_ctxs); new_add_flags = le32_to_cpu(ctrl_ctx->add_flags); -@@ -2726,7 +2870,7 @@ int xhci_check_bandwidth(struct usb_hcd +@@ -2766,7 +2910,7 @@ int xhci_check_bandwidth(struct usb_hcd if (ctrl_ctx->add_flags == cpu_to_le32(SLOT_FLAG) && ctrl_ctx->drop_flags == 0) return 0; @@ -5636,7 +5636,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> xhci_dbg(xhci, "New Input Control Context:\n"); slot_ctx = xhci_get_slot_ctx(xhci, virt_dev->in_ctx); xhci_dbg_ctx(xhci, virt_dev->in_ctx, -@@ -4352,10 +4496,14 @@ static u16 xhci_call_host_update_timeout +@@ -4400,10 +4544,14 @@ static u16 xhci_call_host_update_timeout u16 *timeout) { if (state == USB3_LPM_U1) { @@ -5651,7 +5651,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> return xhci_calculate_intel_u2_timeout(udev, desc); } -@@ -4740,7 +4888,9 @@ int xhci_gen_setup(struct usb_hcd *hcd, +@@ -4788,7 +4936,9 @@ int xhci_gen_setup(struct usb_hcd *hcd, hcd->self.no_sg_constraint = 1; /* XHCI controllers don't stop the ep queue on short packets :| */ @@ -5661,7 +5661,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> if (usb_hcd_is_primary_hcd(hcd)) { xhci = kzalloc(sizeof(struct xhci_hcd), GFP_KERNEL); -@@ -4803,6 +4953,10 @@ int xhci_gen_setup(struct usb_hcd *hcd, +@@ -4851,6 +5001,10 @@ int xhci_gen_setup(struct usb_hcd *hcd, goto error; xhci_dbg(xhci, "Reset complete\n"); @@ -5672,7 +5672,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> /* Set dma_mask and coherent_dma_mask to 64-bits, * if xHC supports 64-bit addressing */ if (HCC_64BIT_ADDR(xhci->hcc_params) && -@@ -4827,8 +4981,21 @@ MODULE_DESCRIPTION(DRIVER_DESC); +@@ -4875,8 +5029,21 @@ MODULE_DESCRIPTION(DRIVER_DESC); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_LICENSE("GPL"); @@ -5694,7 +5694,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> int retval; retval = xhci_register_pci(); -@@ -4841,6 +5008,33 @@ static int __init xhci_hcd_init(void) +@@ -4889,6 +5056,33 @@ static int __init xhci_hcd_init(void) pr_debug("Problem registering platform driver.\n"); goto unreg_pci; } @@ -5728,7 +5728,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> /* * Check the compiler generated sizes of structures that must be laid * out in specific ways for hardware access. -@@ -4858,6 +5052,7 @@ static int __init xhci_hcd_init(void) +@@ -4906,6 +5100,7 @@ static int __init xhci_hcd_init(void) BUILD_BUG_ON(sizeof(struct xhci_intr_reg) != 8*32/8); /* xhci_run_regs has eight fields and embeds 128 xhci_intr_regs */ BUILD_BUG_ON(sizeof(struct xhci_run_regs) != (8+8*128)*32/8); @@ -5777,7 +5777,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> }; /* convert between an HCD pointer and the corresponding EHCI_HCD */ -@@ -1726,7 +1745,7 @@ void xhci_urb_free_priv(struct xhci_hcd +@@ -1726,7 +1745,7 @@ void xhci_urb_free_priv(struct xhci_hcd void xhci_free_command(struct xhci_hcd *xhci, struct xhci_command *command); diff --git a/target/linux/ramips/patches-3.14/0044-mtd-add-chunked-read-io-to-m25p80.patch b/target/linux/ramips/patches-3.14/0044-mtd-add-chunked-read-io-to-m25p80.patch index 8d6fac7221..ce4c5119e0 100644 --- a/target/linux/ramips/patches-3.14/0044-mtd-add-chunked-read-io-to-m25p80.patch +++ b/target/linux/ramips/patches-3.14/0044-mtd-add-chunked-read-io-to-m25p80.patch @@ -69,7 +69,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> /* * Write an address range to the flash chip. Data must be written in * FLASH_PAGESIZE chunks. The address range may be any size provided -@@ -649,6 +701,76 @@ static int m25p80_write(struct mtd_info +@@ -649,6 +701,76 @@ static int m25p80_write(struct mtd_info return 0; } @@ -146,7 +146,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -1260,6 +1382,12 @@ static int m25p_probe(struct spi_device +@@ -1260,6 +1382,12 @@ static int m25p_probe(struct spi_device return -EINVAL; } diff --git a/target/linux/ramips/patches-3.14/0047-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch b/target/linux/ramips/patches-3.14/0047-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch index 239cd07423..c3c5924405 100644 --- a/target/linux/ramips/patches-3.14/0047-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch +++ b/target/linux/ramips/patches-3.14/0047-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch @@ -18,10 +18,8 @@ Cc: linux-gpio@vger.kernel.org create mode 100644 arch/mips/include/asm/mach-ralink/gpio.h create mode 100644 drivers/gpio/gpio-ralink.c -Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/gpio.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/arch/mips/include/asm/mach-ralink/gpio.h 2014-09-13 02:13:22.536816660 +0200 +--- /dev/null ++++ b/arch/mips/include/asm/mach-ralink/gpio.h @@ -0,0 +1,24 @@ +/* + * Ralink SoC GPIO API support @@ -47,11 +45,9 @@ Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/gpio.h +#define gpio_to_irq __gpio_to_irq + +#endif /* __ASM_MACH_RALINK_GPIO_H */ -Index: linux-3.14.18/drivers/gpio/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/gpio/Kconfig 2014-09-06 01:34:59.000000000 +0200 -+++ linux-3.14.18/drivers/gpio/Kconfig 2014-10-02 21:52:28.693719524 +0200 -@@ -260,6 +260,12 @@ +--- a/drivers/gpio/Kconfig ++++ b/drivers/gpio/Kconfig +@@ -260,6 +260,12 @@ config GPIO_SCH311X To compile this driver as a module, choose M here: the module will be called gpio-sch311x. @@ -64,11 +60,9 @@ Index: linux-3.14.18/drivers/gpio/Kconfig config GPIO_SPEAR_SPICS bool "ST SPEAr13xx SPI Chip Select as GPIO support" depends on PLAT_SPEAR -Index: linux-3.14.18/drivers/gpio/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/gpio/Makefile 2014-09-06 01:34:59.000000000 +0200 -+++ linux-3.14.18/drivers/gpio/Makefile 2014-10-02 21:52:28.693719524 +0200 -@@ -63,6 +63,7 @@ +--- a/drivers/gpio/Makefile ++++ b/drivers/gpio/Makefile +@@ -63,6 +63,7 @@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf85 obj-$(CONFIG_GPIO_PCH) += gpio-pch.o obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o @@ -76,10 +70,8 @@ Index: linux-3.14.18/drivers/gpio/Makefile obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o -Index: linux-3.14.18/drivers/gpio/gpio-ralink.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/drivers/gpio/gpio-ralink.c 2014-10-02 21:52:24.081719605 +0200 +--- /dev/null ++++ b/drivers/gpio/gpio-ralink.c @@ -0,0 +1,353 @@ +/* + * This program is free software; you can redistribute it and/or modify it diff --git a/target/linux/ramips/patches-3.14/0048-GPIO-ralink-add-mt7621-gpio-controller.patch b/target/linux/ramips/patches-3.14/0048-GPIO-ralink-add-mt7621-gpio-controller.patch index d53bbe965b..25ef969a91 100644 --- a/target/linux/ramips/patches-3.14/0048-GPIO-ralink-add-mt7621-gpio-controller.patch +++ b/target/linux/ramips/patches-3.14/0048-GPIO-ralink-add-mt7621-gpio-controller.patch @@ -12,11 +12,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 4 files changed, 187 insertions(+) create mode 100644 drivers/gpio/gpio-mt7621.c -Index: linux-3.14.18/arch/mips/Kconfig -=================================================================== ---- linux-3.14.18.orig/arch/mips/Kconfig 2014-11-14 14:22:08.782141921 +0100 -+++ linux-3.14.18/arch/mips/Kconfig 2014-11-14 14:22:08.994149701 +0100 -@@ -437,6 +437,9 @@ +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -437,6 +437,9 @@ config RALINK select RESET_CONTROLLER select PINCTRL select PINCTRL_RT2880 @@ -26,11 +24,9 @@ Index: linux-3.14.18/arch/mips/Kconfig config SGI_IP22 bool "SGI IP22 (Indy/Indigo2)" -Index: linux-3.14.18/drivers/gpio/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/gpio/Kconfig 2014-11-14 14:22:08.982149261 +0100 -+++ linux-3.14.18/drivers/gpio/Kconfig 2014-11-14 14:22:08.998149848 +0100 -@@ -827,6 +827,12 @@ +--- a/drivers/gpio/Kconfig ++++ b/drivers/gpio/Kconfig +@@ -827,6 +827,12 @@ config GPIO_BCM_KONA help Turn on GPIO support for Broadcom "Kona" chips. @@ -43,19 +39,15 @@ Index: linux-3.14.18/drivers/gpio/Kconfig comment "USB GPIO expanders:" config GPIO_VIPERBOARD -Index: linux-3.14.18/drivers/gpio/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/gpio/Makefile 2014-11-14 14:22:08.982149261 +0100 -+++ linux-3.14.18/drivers/gpio/Makefile 2014-11-14 14:22:08.998149848 +0100 -@@ -100,3 +100,4 @@ +--- a/drivers/gpio/Makefile ++++ b/drivers/gpio/Makefile +@@ -100,3 +100,4 @@ obj-$(CONFIG_GPIO_WM8350) += gpio-wm8350 obj-$(CONFIG_GPIO_WM8994) += gpio-wm8994.o obj-$(CONFIG_GPIO_XILINX) += gpio-xilinx.o obj-$(CONFIG_GPIO_XTENSA) += gpio-xtensa.o +obj-$(CONFIG_GPIO_MT7621) += gpio-mt7621.o -Index: linux-3.14.18/drivers/gpio/gpio-mt7621.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/drivers/gpio/gpio-mt7621.c 2014-11-14 14:36:19.321724539 +0100 +--- /dev/null ++++ b/drivers/gpio/gpio-mt7621.c @@ -0,0 +1,178 @@ +/* + * This program is free software; you can redistribute it and/or modify it diff --git a/target/linux/ramips/patches-3.14/0052-i2c-MIPS-adds-ralink-I2C-driver.patch b/target/linux/ramips/patches-3.14/0052-i2c-MIPS-adds-ralink-I2C-driver.patch index 29cb52a776..cb421b1bdc 100644 --- a/target/linux/ramips/patches-3.14/0052-i2c-MIPS-adds-ralink-I2C-driver.patch +++ b/target/linux/ramips/patches-3.14/0052-i2c-MIPS-adds-ralink-I2C-driver.patch @@ -13,10 +13,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 Documentation/devicetree/bindings/i2c/i2c-ralink.txt create mode 100644 drivers/i2c/busses/i2c-ralink.c -Index: linux-3.14.18/Documentation/devicetree/bindings/i2c/i2c-ralink.txt -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/Documentation/devicetree/bindings/i2c/i2c-ralink.txt 2014-10-06 14:28:14.296590159 +0200 +--- /dev/null ++++ b/Documentation/devicetree/bindings/i2c/i2c-ralink.txt @@ -0,0 +1,27 @@ +I2C for Ralink platforms + @@ -45,11 +43,9 @@ Index: linux-3.14.18/Documentation/devicetree/bindings/i2c/i2c-ralink.txt + }; + }; +}; -Index: linux-3.14.18/drivers/i2c/busses/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/i2c/busses/Kconfig 2014-09-06 01:34:59.000000000 +0200 -+++ linux-3.14.18/drivers/i2c/busses/Kconfig 2014-10-06 14:28:14.296590159 +0200 -@@ -659,6 +659,10 @@ +--- a/drivers/i2c/busses/Kconfig ++++ b/drivers/i2c/busses/Kconfig +@@ -659,6 +659,10 @@ config I2C_RIIC This driver can also be built as a module. If so, the module will be called i2c-riic. @@ -60,11 +56,9 @@ Index: linux-3.14.18/drivers/i2c/busses/Kconfig config HAVE_S3C2410_I2C bool help -Index: linux-3.14.18/drivers/i2c/busses/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/i2c/busses/Makefile 2014-09-06 01:34:59.000000000 +0200 -+++ linux-3.14.18/drivers/i2c/busses/Makefile 2014-10-06 14:28:14.296590159 +0200 -@@ -63,6 +63,7 @@ +--- a/drivers/i2c/busses/Makefile ++++ b/drivers/i2c/busses/Makefile +@@ -63,6 +63,7 @@ obj-$(CONFIG_I2C_PNX) += i2c-pnx.o obj-$(CONFIG_I2C_PUV3) += i2c-puv3.o obj-$(CONFIG_I2C_PXA) += i2c-pxa.o obj-$(CONFIG_I2C_PXA_PCI) += i2c-pxa-pci.o @@ -72,10 +66,8 @@ Index: linux-3.14.18/drivers/i2c/busses/Makefile obj-$(CONFIG_I2C_RIIC) += i2c-riic.o obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o obj-$(CONFIG_I2C_S6000) += i2c-s6000.o -Index: linux-3.14.18/drivers/i2c/busses/i2c-ralink.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/drivers/i2c/busses/i2c-ralink.c 2014-10-09 19:38:29.242416182 +0200 +--- /dev/null ++++ b/drivers/i2c/busses/i2c-ralink.c @@ -0,0 +1,299 @@ +/* + * drivers/i2c/busses/i2c-ralink.c diff --git a/target/linux/ramips/patches-3.14/0053-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch b/target/linux/ramips/patches-3.14/0053-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch index e7849f6459..8b4a6685fa 100644 --- a/target/linux/ramips/patches-3.14/0053-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch +++ b/target/linux/ramips/patches-3.14/0053-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch @@ -23,20 +23,16 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 drivers/mmc/host/mtk-mmc/mt6575_sd.h create mode 100644 drivers/mmc/host/mtk-mmc/sd.c -Index: linux-3.14.18/drivers/mmc/host/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/mmc/host/Kconfig 2014-11-15 14:13:20.210278242 +0100 -+++ linux-3.14.18/drivers/mmc/host/Kconfig 2014-11-15 14:13:20.998305852 +0100 -@@ -714,3 +714,5 @@ +--- a/drivers/mmc/host/Kconfig ++++ b/drivers/mmc/host/Kconfig +@@ -714,3 +714,5 @@ config MMC_REALTEK_PCI help Say Y here to include driver code to support SD/MMC card interface of Realtek PCI-E card reader + +source "drivers/mmc/host/mtk-mmc/Kconfig" -Index: linux-3.14.18/drivers/mmc/host/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/mmc/host/Makefile 2014-11-15 14:13:20.210278242 +0100 -+++ linux-3.14.18/drivers/mmc/host/Makefile 2014-11-15 14:13:20.998305852 +0100 +--- a/drivers/mmc/host/Makefile ++++ b/drivers/mmc/host/Makefile @@ -2,6 +2,7 @@ # Makefile for MMC/SD host controller drivers # @@ -45,10 +41,8 @@ Index: linux-3.14.18/drivers/mmc/host/Makefile obj-$(CONFIG_MMC_ARMMMCI) += mmci.o obj-$(CONFIG_MMC_PXA) += pxamci.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o -Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/Kconfig -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/drivers/mmc/host/mtk-mmc/Kconfig 2014-11-15 14:13:20.998305852 +0100 +--- /dev/null ++++ b/drivers/mmc/host/mtk-mmc/Kconfig @@ -0,0 +1,16 @@ +config MTK_MMC + tristate "MTK SD/MMC" @@ -66,10 +60,8 @@ Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/Kconfig + bool "eMMC 8-bit support" + depends on MTK_MMC && RALINK_MT7628 + -Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/Makefile -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/drivers/mmc/host/mtk-mmc/Makefile 2014-11-15 14:13:20.998305852 +0100 +--- /dev/null ++++ b/drivers/mmc/host/mtk-mmc/Makefile @@ -0,0 +1,42 @@ +# Copyright Statement: +# @@ -113,10 +105,8 @@ Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/Makefile + +clean: + @rm -f *.o modules.order .*.cmd -Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/board.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/drivers/mmc/host/mtk-mmc/board.h 2014-11-15 14:13:20.998305852 +0100 +--- /dev/null ++++ b/drivers/mmc/host/mtk-mmc/board.h @@ -0,0 +1,137 @@ +/* Copyright Statement: + * @@ -255,10 +245,8 @@ Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/board.h + +#endif /* __ARCH_ARM_MACH_BOARD_H */ + -Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/dbg.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/drivers/mmc/host/mtk-mmc/dbg.c 2014-11-15 14:13:20.998305852 +0100 +--- /dev/null ++++ b/drivers/mmc/host/mtk-mmc/dbg.c @@ -0,0 +1,347 @@ +/* Copyright Statement: + * @@ -607,10 +595,8 @@ Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/dbg.c +} +EXPORT_SYMBOL_GPL(msdc_debug_proc_init); +#endif -Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/dbg.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/drivers/mmc/host/mtk-mmc/dbg.h 2014-11-15 14:13:20.998305852 +0100 +--- /dev/null ++++ b/drivers/mmc/host/mtk-mmc/dbg.h @@ -0,0 +1,156 @@ +/* Copyright Statement: + * @@ -768,10 +754,8 @@ Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/dbg.h +void msdc_performance(u32 opcode, u32 sizes, u32 bRx, u32 ticks); + +#endif -Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/mt6575_sd.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/drivers/mmc/host/mtk-mmc/mt6575_sd.h 2014-11-15 14:13:20.998305852 +0100 +--- /dev/null ++++ b/drivers/mmc/host/mtk-mmc/mt6575_sd.h @@ -0,0 +1,1001 @@ +/* Copyright Statement: + * @@ -1774,10 +1758,8 @@ Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/mt6575_sd.h + +#endif + -Index: linux-3.14.18/drivers/mmc/host/mtk-mmc/sd.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/drivers/mmc/host/mtk-mmc/sd.c 2014-11-15 14:41:50.334227875 +0100 +--- /dev/null ++++ b/drivers/mmc/host/mtk-mmc/sd.c @@ -0,0 +1,3047 @@ +/* Copyright Statement: + * diff --git a/target/linux/ramips/patches-3.14/0055-asoc-add-mt7620-support.patch b/target/linux/ramips/patches-3.14/0055-asoc-add-mt7620-support.patch index 815cc8ce07..645db0f168 100644 --- a/target/linux/ramips/patches-3.14/0055-asoc-add-mt7620-support.patch +++ b/target/linux/ramips/patches-3.14/0055-asoc-add-mt7620-support.patch @@ -19,10 +19,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 sound/soc/ralink/mt7620-i2s.c create mode 100644 sound/soc/ralink/mt7620-wm8960.c -Index: linux-3.14.18/arch/mips/ralink/of.c -=================================================================== ---- linux-3.14.18.orig/arch/mips/ralink/of.c 2014-11-18 10:45:55.010989756 +0100 -+++ linux-3.14.18/arch/mips/ralink/of.c 2014-11-18 13:54:21.586438562 +0100 +--- a/arch/mips/ralink/of.c ++++ b/arch/mips/ralink/of.c @@ -15,6 +15,7 @@ #include <linux/of_fdt.h> #include <linux/kernel.h> @@ -39,11 +37,9 @@ Index: linux-3.14.18/arch/mips/ralink/of.c __iomem void *rt_memc_membase; extern struct boot_param_header __dtb_start; -Index: linux-3.14.18/sound/soc/Kconfig -=================================================================== ---- linux-3.14.18.orig/sound/soc/Kconfig 2014-09-06 01:34:59.000000000 +0200 -+++ linux-3.14.18/sound/soc/Kconfig 2014-11-18 10:45:55.351159766 +0100 -@@ -47,6 +47,7 @@ +--- a/sound/soc/Kconfig ++++ b/sound/soc/Kconfig +@@ -47,6 +47,7 @@ source "sound/soc/kirkwood/Kconfig" source "sound/soc/intel/Kconfig" source "sound/soc/mxs/Kconfig" source "sound/soc/pxa/Kconfig" @@ -51,11 +47,9 @@ Index: linux-3.14.18/sound/soc/Kconfig source "sound/soc/samsung/Kconfig" source "sound/soc/s6000/Kconfig" source "sound/soc/sh/Kconfig" -Index: linux-3.14.18/sound/soc/Makefile -=================================================================== ---- linux-3.14.18.orig/sound/soc/Makefile 2014-09-06 01:34:59.000000000 +0200 -+++ linux-3.14.18/sound/soc/Makefile 2014-11-18 10:45:55.351159766 +0100 -@@ -24,6 +24,7 @@ +--- a/sound/soc/Makefile ++++ b/sound/soc/Makefile +@@ -24,6 +24,7 @@ obj-$(CONFIG_SND_SOC) += nuc900/ obj-$(CONFIG_SND_SOC) += omap/ obj-$(CONFIG_SND_SOC) += kirkwood/ obj-$(CONFIG_SND_SOC) += pxa/ @@ -63,10 +57,8 @@ Index: linux-3.14.18/sound/soc/Makefile obj-$(CONFIG_SND_SOC) += samsung/ obj-$(CONFIG_SND_SOC) += s6000/ obj-$(CONFIG_SND_SOC) += sh/ -Index: linux-3.14.18/sound/soc/ralink/Kconfig -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/sound/soc/ralink/Kconfig 2014-11-18 10:45:55.351159766 +0100 +--- /dev/null ++++ b/sound/soc/ralink/Kconfig @@ -0,0 +1,15 @@ +config SND_MT7620_SOC_I2S + depends on SOC_MT7620 && SND_SOC @@ -83,10 +75,8 @@ Index: linux-3.14.18/sound/soc/ralink/Kconfig + help + Say Y if you want to add support for ASoC audio on the Qi LB60 board + a.k.a Qi Ben NanoNote. -Index: linux-3.14.18/sound/soc/ralink/Makefile -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/sound/soc/ralink/Makefile 2014-11-18 10:45:55.351159766 +0100 +--- /dev/null ++++ b/sound/soc/ralink/Makefile @@ -0,0 +1,11 @@ +# +# Jz4740 Platform Support @@ -99,10 +89,8 @@ Index: linux-3.14.18/sound/soc/ralink/Makefile +snd-soc-mt7620-wm8960-objs := mt7620-wm8960.o + +obj-$(CONFIG_SND_MT7620_SOC_WM8960) += snd-soc-mt7620-wm8960.o -Index: linux-3.14.18/sound/soc/ralink/mt7620-i2s.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/sound/soc/ralink/mt7620-i2s.c 2014-11-18 10:45:55.351159766 +0100 +--- /dev/null ++++ b/sound/soc/ralink/mt7620-i2s.c @@ -0,0 +1,436 @@ +/* + * Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de> @@ -540,10 +528,8 @@ Index: linux-3.14.18/sound/soc/ralink/mt7620-i2s.c +MODULE_DESCRIPTION("Ingenic JZ4740 SoC I2S driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:mt7620-i2s"); -Index: linux-3.14.18/sound/soc/ralink/mt7620-wm8960.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.14.18/sound/soc/ralink/mt7620-wm8960.c 2014-11-18 11:56:57.570299500 +0100 +--- /dev/null ++++ b/sound/soc/ralink/mt7620-wm8960.c @@ -0,0 +1,233 @@ +/* + * Copyright 2013 Freescale Semiconductor, Inc. @@ -778,10 +764,8 @@ Index: linux-3.14.18/sound/soc/ralink/mt7620-wm8960.c +MODULE_DESCRIPTION("Freescale i.MX WM8962 ASoC machine driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:mt7620-wm8962"); -Index: linux-3.14.18/sound/soc/soc-io.c -=================================================================== ---- linux-3.14.18.orig/sound/soc/soc-io.c 2014-09-06 01:34:59.000000000 +0200 -+++ linux-3.14.18/sound/soc/soc-io.c 2014-11-18 10:45:55.355161766 +0100 +--- a/sound/soc/soc-io.c ++++ b/sound/soc/soc-io.c @@ -19,7 +19,6 @@ #include <trace/events/asoc.h> @@ -790,7 +774,7 @@ Index: linux-3.14.18/sound/soc/soc-io.c static int hw_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value) { -@@ -135,12 +134,3 @@ +@@ -135,12 +134,3 @@ int snd_soc_codec_set_cache_io(struct sn return PTR_ERR_OR_ZERO(codec->control_data); } EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io); diff --git a/target/linux/ramips/patches-3.14/0057-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-3.14/0057-uvc-add-iPassion-iP2970-support.patch index 43b2b33b5f..4576c8a7ba 100644 --- a/target/linux/ramips/patches-3.14/0057-uvc-add-iPassion-iP2970-support.patch +++ b/target/linux/ramips/patches-3.14/0057-uvc-add-iPassion-iP2970-support.patch @@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c -@@ -2467,6 +2467,20 @@ static struct usb_device_id uvc_ids[] = +@@ -2476,6 +2476,20 @@ static struct usb_device_id uvc_ids[] = .bInterfaceProtocol = 0, .driver_info = UVC_QUIRK_PROBE_MINMAX | UVC_QUIRK_IGNORE_SELECTOR_UNIT }, diff --git a/target/linux/ramips/patches-3.14/0060-soc_type.patch b/target/linux/ramips/patches-3.14/0060-soc_type.patch index 47bf066260..23ce6cf121 100644 --- a/target/linux/ramips/patches-3.14/0060-soc_type.patch +++ b/target/linux/ramips/patches-3.14/0060-soc_type.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/mt7620.h -=================================================================== ---- linux-3.14.18.orig/arch/mips/include/asm/mach-ralink/mt7620.h 2014-11-17 19:54:59.683128174 +0100 -+++ linux-3.14.18/arch/mips/include/asm/mach-ralink/mt7620.h 2014-11-17 19:54:59.975139185 +0100 +--- a/arch/mips/include/asm/mach-ralink/mt7620.h ++++ b/arch/mips/include/asm/mach-ralink/mt7620.h @@ -13,14 +13,6 @@ #ifndef _MT7620_REGS_H_ #define _MT7620_REGS_H_ @@ -17,10 +15,8 @@ Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/mt7620.h #define MT7620_SYSC_BASE 0x10000000 #define SYSC_REG_CHIP_NAME0 0x00 -Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/ralink_regs.h -=================================================================== ---- linux-3.14.18.orig/arch/mips/include/asm/mach-ralink/ralink_regs.h 2014-11-17 19:54:59.379116714 +0100 -+++ linux-3.14.18/arch/mips/include/asm/mach-ralink/ralink_regs.h 2014-11-17 19:54:59.975139185 +0100 +--- a/arch/mips/include/asm/mach-ralink/ralink_regs.h ++++ b/arch/mips/include/asm/mach-ralink/ralink_regs.h @@ -13,6 +13,20 @@ #ifndef _RALINK_REGS_H_ #define _RALINK_REGS_H_ @@ -42,10 +38,8 @@ Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/ralink_regs.h extern __iomem void *rt_sysc_membase; extern __iomem void *rt_memc_membase; -Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/rt305x.h -=================================================================== ---- linux-3.14.18.orig/arch/mips/include/asm/mach-ralink/rt305x.h 2014-11-17 19:54:59.663127421 +0100 -+++ linux-3.14.18/arch/mips/include/asm/mach-ralink/rt305x.h 2014-11-17 19:54:59.975139185 +0100 +--- a/arch/mips/include/asm/mach-ralink/rt305x.h ++++ b/arch/mips/include/asm/mach-ralink/rt305x.h @@ -13,25 +13,16 @@ #ifndef _RT305X_REGS_H_ #define _RT305X_REGS_H_ @@ -75,7 +69,7 @@ Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/rt305x.h } static inline int soc_is_rt305x(void) -@@ -41,17 +32,17 @@ +@@ -41,17 +32,17 @@ static inline int soc_is_rt305x(void) static inline int soc_is_rt3350(void) { @@ -96,10 +90,8 @@ Index: linux-3.14.18/arch/mips/include/asm/mach-ralink/rt305x.h } #define RT305X_SYSC_BASE 0x10000000 -Index: linux-3.14.18/arch/mips/ralink/mt7620.c -=================================================================== ---- linux-3.14.18.orig/arch/mips/ralink/mt7620.c 2014-11-17 19:54:59.663127421 +0100 -+++ linux-3.14.18/arch/mips/ralink/mt7620.c 2014-11-17 19:54:59.975139185 +0100 +--- a/arch/mips/ralink/mt7620.c ++++ b/arch/mips/ralink/mt7620.c @@ -43,8 +43,6 @@ #define CLKCFG_FFRAC_MASK 0x001f #define CLKCFG_FFRAC_USB_VAL 0x0003 @@ -109,7 +101,7 @@ Index: linux-3.14.18/arch/mips/ralink/mt7620.c /* does the board have sdram or ddram */ static int dram_type; -@@ -375,7 +373,7 @@ +@@ -375,7 +373,7 @@ void __init ralink_clk_init(void) #define RINT(x) ((x) / 1000000) #define RFRAC(x) (((x) / 1000) % 1000) @@ -118,7 +110,7 @@ Index: linux-3.14.18/arch/mips/ralink/mt7620.c if (xtal_rate == MHZ(40)) cpu_rate = MHZ(580); else -@@ -418,7 +416,7 @@ +@@ -418,7 +416,7 @@ void __init ralink_clk_init(void) ralink_clk_add("10000c00.uartlite", periph_rate); ralink_clk_add("10180000.wmac", xtal_rate); @@ -127,7 +119,7 @@ Index: linux-3.14.18/arch/mips/ralink/mt7620.c /* * When the CPU goes into sleep mode, the BUS clock will be too low for * USB to function properly -@@ -506,11 +504,11 @@ +@@ -506,11 +504,11 @@ void prom_soc_init(struct ralink_soc_inf if (n0 == MT7620_CHIP_NAME0 && n1 == MT7620_CHIP_NAME1) { if (bga) { @@ -141,7 +133,7 @@ Index: linux-3.14.18/arch/mips/ralink/mt7620.c name = "MT7620N"; soc_info->compatible = "ralink,mt7620n-soc"; #ifdef CONFIG_PCI -@@ -518,7 +516,7 @@ +@@ -518,7 +516,7 @@ void prom_soc_init(struct ralink_soc_inf #endif } } else if (n0 == MT7620_CHIP_NAME0 && n1 == MT7628_CHIP_NAME1) { @@ -150,7 +142,7 @@ Index: linux-3.14.18/arch/mips/ralink/mt7620.c name = "MT7628AN"; soc_info->compatible = "ralink,mt7628an-soc"; } else { -@@ -535,7 +533,7 @@ +@@ -535,7 +533,7 @@ void prom_soc_init(struct ralink_soc_inf dram_type = (cfg0 >> SYSCFG0_DRAM_TYPE_SHIFT) & SYSCFG0_DRAM_TYPE_MASK; soc_info->mem_base = MT7620_DRAM_BASE; @@ -159,7 +151,7 @@ Index: linux-3.14.18/arch/mips/ralink/mt7620.c mt7628_dram_init(soc_info); else mt7620_dram_init(soc_info); -@@ -548,7 +546,7 @@ +@@ -548,7 +546,7 @@ void prom_soc_init(struct ralink_soc_inf pr_info("Digital PMU set to %s control\n", (pmu1 & DIG_SW_SEL) ? ("sw") : ("hw")); @@ -168,10 +160,8 @@ Index: linux-3.14.18/arch/mips/ralink/mt7620.c rt2880_pinmux_data = mt7628an_pinmux_data; else rt2880_pinmux_data = mt7620a_pinmux_data; -Index: linux-3.14.18/arch/mips/ralink/rt305x.c -=================================================================== ---- linux-3.14.18.orig/arch/mips/ralink/rt305x.c 2014-11-17 19:54:59.715129381 +0100 -+++ linux-3.14.18/arch/mips/ralink/rt305x.c 2014-11-17 19:54:59.975139185 +0100 +--- a/arch/mips/ralink/rt305x.c ++++ b/arch/mips/ralink/rt305x.c @@ -21,8 +21,6 @@ #include "common.h" @@ -181,7 +171,7 @@ Index: linux-3.14.18/arch/mips/ralink/rt305x.c static struct rt2880_pmx_func i2c_func[] = { FUNC("i2c", 0, 1, 2) }; static struct rt2880_pmx_func spi_func[] = { FUNC("spi", 0, 3, 4) }; static struct rt2880_pmx_func uartf_func[] = { -@@ -234,24 +232,24 @@ +@@ -234,24 +232,24 @@ void prom_soc_init(struct ralink_soc_inf icache_sets = (read_c0_config1() >> 22) & 7; if (icache_sets == 1) { @@ -211,10 +201,8 @@ Index: linux-3.14.18/arch/mips/ralink/rt305x.c name = "RT5350"; soc_info->compatible = "ralink,rt5350-soc"; } else { -Index: linux-3.14.18/arch/mips/ralink/prom.c -=================================================================== ---- linux-3.14.18.orig/arch/mips/ralink/prom.c 2014-09-06 01:34:59.000000000 +0200 -+++ linux-3.14.18/arch/mips/ralink/prom.c 2014-11-17 19:54:59.975139185 +0100 +--- a/arch/mips/ralink/prom.c ++++ b/arch/mips/ralink/prom.c @@ -15,9 +15,13 @@ #include <asm/bootinfo.h> #include <asm/addrspace.h> @@ -229,11 +217,9 @@ Index: linux-3.14.18/arch/mips/ralink/prom.c const char *get_system_type(void) { -Index: linux-3.14.18/arch/mips/ralink/mt7621.c -=================================================================== ---- linux-3.14.18.orig/arch/mips/ralink/mt7621.c 2014-11-17 19:54:59.471120181 +0100 -+++ linux-3.14.18/arch/mips/ralink/mt7621.c 2014-11-17 19:58:52.667916008 +0100 -@@ -175,6 +175,7 @@ +--- a/arch/mips/ralink/mt7621.c ++++ b/arch/mips/ralink/mt7621.c +@@ -175,6 +175,7 @@ void prom_soc_init(struct ralink_soc_inf soc_info->mem_size_min = MT7621_DDR2_SIZE_MIN; soc_info->mem_size_max = MT7621_DDR2_SIZE_MAX; soc_info->mem_base = MT7621_DRAM_BASE; diff --git a/target/linux/ramips/patches-3.14/0100-mtd-split-remove-padding.patch b/target/linux/ramips/patches-3.14/0100-mtd-split-remove-padding.patch index f7da13a6d8..4d1a4ce6fb 100644 --- a/target/linux/ramips/patches-3.14/0100-mtd-split-remove-padding.patch +++ b/target/linux/ramips/patches-3.14/0100-mtd-split-remove-padding.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -807,10 +807,6 @@ static void split_uimage(struct mtd_info +@@ -808,10 +808,6 @@ static void split_uimage(struct mtd_info return; len = be32_to_cpu(hdr.size) + 0x40; diff --git a/target/linux/ramips/patches-3.14/0101-mtd-add-rtn56u-support.patch b/target/linux/ramips/patches-3.14/0101-mtd-add-rtn56u-support.patch index b3f7d85662..ec6ef462ba 100644 --- a/target/linux/ramips/patches-3.14/0101-mtd-add-rtn56u-support.patch +++ b/target/linux/ramips/patches-3.14/0101-mtd-add-rtn56u-support.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -795,8 +795,11 @@ static void split_uimage(struct mtd_info +@@ -796,8 +796,11 @@ static void split_uimage(struct mtd_info { struct { __be32 magic; @@ -13,7 +13,7 @@ } hdr; size_t len; -@@ -806,7 +809,11 @@ static void split_uimage(struct mtd_info +@@ -807,7 +810,11 @@ static void split_uimage(struct mtd_info if (len != sizeof(hdr) || hdr.magic != cpu_to_be32(UBOOT_MAGIC)) return; diff --git a/target/linux/ramips/patches-3.14/0104-rt5350-spi-second-device.patch b/target/linux/ramips/patches-3.14/0104-rt5350-spi-second-device.patch index 64c4150080..6cad8dbd0c 100644 --- a/target/linux/ramips/patches-3.14/0104-rt5350-spi-second-device.patch +++ b/target/linux/ramips/patches-3.14/0104-rt5350-spi-second-device.patch @@ -188,7 +188,7 @@ unsigned count = 0; u8 *rx = xfer->rx_buf; const u8 *tx = xfer->tx_buf; -@@ -279,9 +335,9 @@ rt2880_spi_write_read(struct spi_device +@@ -279,9 +335,9 @@ rt2880_spi_write_read(struct spi_device if (tx) { for (count = 0; count < xfer->len; count++) { @@ -201,7 +201,7 @@ if (err) { dev_err(&spi->dev, "TX failed, err=%d\n", err); goto out; -@@ -291,13 +347,13 @@ rt2880_spi_write_read(struct spi_device +@@ -291,13 +347,13 @@ rt2880_spi_write_read(struct spi_device if (rx) { for (count = 0; count < xfer->len; count++) { @@ -218,7 +218,7 @@ } } -@@ -364,7 +420,7 @@ mt7621_spi_write_read(struct spi_device +@@ -364,7 +420,7 @@ mt7621_spi_write_read(struct spi_device trans |= SPI_CTL_START; rt2880_spi_write(rs, MT7621_SPI_TRANS, trans); diff --git a/target/linux/ramips/patches-3.14/999-no-pm_poweroff.patch b/target/linux/ramips/patches-3.14/999-no-pm_poweroff.patch index ce2bc1c53b..fedfe37154 100644 --- a/target/linux/ramips/patches-3.14/999-no-pm_poweroff.patch +++ b/target/linux/ramips/patches-3.14/999-no-pm_poweroff.patch @@ -1,8 +1,6 @@ -Index: linux-3.14.18/arch/mips/ralink/reset.c -=================================================================== ---- linux-3.14.18.orig/arch/mips/ralink/reset.c 2014-09-06 01:34:59.000000000 +0200 -+++ linux-3.14.18/arch/mips/ralink/reset.c 2014-11-14 14:28:44.548764125 +0100 -@@ -98,7 +98,6 @@ +--- a/arch/mips/ralink/reset.c ++++ b/arch/mips/ralink/reset.c +@@ -98,7 +98,6 @@ static int __init mips_reboot_setup(void { _machine_restart = ralink_restart; _machine_halt = ralink_halt; diff --git a/target/linux/ramips/patches-3.14/999-non-pci-mt7620.patch b/target/linux/ramips/patches-3.14/999-non-pci-mt7620.patch index 6a6f3279f6..815b1c7447 100644 --- a/target/linux/ramips/patches-3.14/999-non-pci-mt7620.patch +++ b/target/linux/ramips/patches-3.14/999-non-pci-mt7620.patch @@ -1,8 +1,6 @@ -Index: linux-3.14.18/arch/mips/ralink/mt7620.c -=================================================================== ---- linux-3.14.18.orig/arch/mips/ralink/mt7620.c 2014-11-18 20:57:21.506801623 +0100 -+++ linux-3.14.18/arch/mips/ralink/mt7620.c 2014-11-18 22:12:05.133116492 +0100 -@@ -511,9 +511,6 @@ +--- a/arch/mips/ralink/mt7620.c ++++ b/arch/mips/ralink/mt7620.c +@@ -511,9 +511,6 @@ void prom_soc_init(struct ralink_soc_inf ralink_soc = MT762X_SOC_MT7620N; name = "MT7620N"; soc_info->compatible = "ralink,mt7620n-soc"; diff --git a/target/linux/ramips/patches-3.14/999-pci-reset.patch b/target/linux/ramips/patches-3.14/999-pci-reset.patch index f3d49694c2..6055731822 100644 --- a/target/linux/ramips/patches-3.14/999-pci-reset.patch +++ b/target/linux/ramips/patches-3.14/999-pci-reset.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/arch/mips/ralink/reset.c -=================================================================== ---- linux-3.14.18.orig/arch/mips/ralink/reset.c 2014-11-23 00:32:23.268612766 +0100 -+++ linux-3.14.18/arch/mips/ralink/reset.c 2014-11-23 02:55:41.492326840 +0100 +--- a/arch/mips/ralink/reset.c ++++ b/arch/mips/ralink/reset.c @@ -11,6 +11,7 @@ #include <linux/pm.h> #include <linux/io.h> @@ -23,7 +21,7 @@ Index: linux-3.14.18/arch/mips/ralink/reset.c static int ralink_assert_device(struct reset_controller_dev *rcdev, unsigned long id) -@@ -83,6 +86,11 @@ +@@ -83,6 +86,11 @@ void ralink_rst_init(void) static void ralink_restart(char *command) { |