diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-07-22 15:31:13 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-07-22 15:31:13 +0000 |
| commit | ef944dcb85dea57bdc4b42b8b6fcecacf00b2e92 (patch) | |
| tree | 111f67b615233af594bc5e29460af254bf85274e /target/linux/ramips | |
| parent | 6a5b4ec7dc2abeecd47345e2fb5aeb83ea50f322 (diff) | |
| download | upstream-ef944dcb85dea57bdc4b42b8b6fcecacf00b2e92.tar.gz upstream-ef944dcb85dea57bdc4b42b8b6fcecacf00b2e92.tar.bz2 upstream-ef944dcb85dea57bdc4b42b8b6fcecacf00b2e92.zip | |
kernel: update 3.10 to 3.10.2
Also refresh 3.10 patches.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37502
Diffstat (limited to 'target/linux/ramips')
36 files changed, 74 insertions, 406 deletions
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index cdf2070bce..bb3f4f1392 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883 mt7620a CFLAGS:=-Os -pipe -fno-caller-saves -mno-branch-likely FEATURES:=squashfs gpio -LINUX_VERSION:=3.10.1 +LINUX_VERSION:=3.10.2 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/ramips/patches-3.10/0001-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch b/target/linux/ramips/patches-3.10/0001-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch index 26556b6a59..f6ff89804f 100644 --- a/target/linux/ramips/patches-3.10/0001-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch +++ b/target/linux/ramips/patches-3.10/0001-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch @@ -9,11 +9,9 @@ Subject: [PATCH 01/33] MIPS: use set_mode() to enable/disable the cevt-r4k arch/mips/kernel/cevt-r4k.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) -diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c -index 02033ea..da4a003 100644 --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c -@@ -38,12 +38,6 @@ static int mips_next_event(unsigned long delta, +@@ -38,12 +38,6 @@ static int mips_next_event(unsigned long #endif /* CONFIG_MIPS_MT_SMTC */ @@ -26,7 +24,7 @@ index 02033ea..da4a003 100644 DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device); int cp0_timer_irq_installed; -@@ -90,6 +84,32 @@ struct irqaction c0_compare_irqaction = { +@@ -90,6 +84,32 @@ struct irqaction c0_compare_irqaction = .name = "timer", }; @@ -73,6 +71,3 @@ index 02033ea..da4a003 100644 return 0; } --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0002-MIPS-ralink-add-pinmux-driver.patch b/target/linux/ramips/patches-3.10/0002-MIPS-ralink-add-pinmux-driver.patch index f515bb3818..1d17e4d54f 100644 --- a/target/linux/ramips/patches-3.10/0002-MIPS-ralink-add-pinmux-driver.patch +++ b/target/linux/ramips/patches-3.10/0002-MIPS-ralink-add-pinmux-driver.patch @@ -16,8 +16,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 4 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 arch/mips/ralink/pinmux.c -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index 38cf1a8..341b4de 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile @@ -6,7 +6,7 @@ @@ -29,19 +27,15 @@ index 38cf1a8..341b4de 100644 obj-$(CONFIG_SOC_RT288X) += rt288x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o -diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h -index 83144c3..f113fd6 100644 --- a/arch/mips/ralink/common.h +++ b/arch/mips/ralink/common.h -@@ -50,4 +50,6 @@ extern void prom_soc_init(struct ralink_soc_info *soc_info); +@@ -50,4 +50,6 @@ extern void prom_soc_init(struct ralink_ __iomem void *plat_of_remap_node(const char *node); +void ralink_pinmux(void); + #endif /* _RALINK_COMMON_H__ */ -diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c -index 6b5f340..b25c1f2 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -110,6 +110,8 @@ static int __init plat_of_setup(void) @@ -53,9 +47,6 @@ index 6b5f340..b25c1f2 100644 return 0; } -diff --git a/arch/mips/ralink/pinmux.c b/arch/mips/ralink/pinmux.c -new file mode 100644 -index 0000000..1720216 --- /dev/null +++ b/arch/mips/ralink/pinmux.c @@ -0,0 +1,77 @@ @@ -136,6 +127,3 @@ index 0000000..1720216 + + rt_sysc_w32(mode, SYSC_REG_GPIO_MODE); +} --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0003-MIPS-ralink-add-support-for-periodic-timer-irq.patch b/target/linux/ramips/patches-3.10/0003-MIPS-ralink-add-support-for-periodic-timer-irq.patch index 2d8009581e..5436750d68 100644 --- a/target/linux/ramips/patches-3.10/0003-MIPS-ralink-add-support-for-periodic-timer-irq.patch +++ b/target/linux/ramips/patches-3.10/0003-MIPS-ralink-add-support-for-periodic-timer-irq.patch @@ -12,8 +12,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 2 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 arch/mips/ralink/timer.c -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index 341b4de..cae7d88 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile @@ -6,7 +6,7 @@ @@ -25,9 +23,6 @@ index 341b4de..cae7d88 100644 obj-$(CONFIG_SOC_RT288X) += rt288x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o -diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c -new file mode 100644 -index 0000000..0a6856c --- /dev/null +++ b/arch/mips/ralink/timer.c @@ -0,0 +1,192 @@ @@ -223,6 +218,3 @@ index 0000000..0a6856c +MODULE_DESCRIPTION("Ralink RT2880 timer"); +MODULE_AUTHOR("John Crispin <blogic@openwrt.org"); +MODULE_LICENSE("GPL"); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0004-MIPS-ralink-add-rt_sysc_m32-helper.patch b/target/linux/ramips/patches-3.10/0004-MIPS-ralink-add-rt_sysc_m32-helper.patch index 7466c4d2f3..915c5bed5c 100644 --- a/target/linux/ramips/patches-3.10/0004-MIPS-ralink-add-rt_sysc_m32-helper.patch +++ b/target/linux/ramips/patches-3.10/0004-MIPS-ralink-add-rt_sysc_m32-helper.patch @@ -8,11 +8,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/include/asm/mach-ralink/ralink_regs.h | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/arch/mips/include/asm/mach-ralink/ralink_regs.h b/arch/mips/include/asm/mach-ralink/ralink_regs.h -index 5a508f9..bd93014 100644 --- a/arch/mips/include/asm/mach-ralink/ralink_regs.h +++ b/arch/mips/include/asm/mach-ralink/ralink_regs.h -@@ -26,6 +26,13 @@ static inline u32 rt_sysc_r32(unsigned reg) +@@ -26,6 +26,13 @@ static inline u32 rt_sysc_r32(unsigned r return __raw_readl(rt_sysc_membase + reg); } @@ -26,6 +24,3 @@ index 5a508f9..bd93014 100644 static inline void rt_memc_w32(u32 val, unsigned reg) { __raw_writel(val, rt_memc_membase + reg); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0005-MIPS-ralink-make-mt7620-ram-detect-verbose.patch b/target/linux/ramips/patches-3.10/0005-MIPS-ralink-make-mt7620-ram-detect-verbose.patch index c777419f12..c0249a235b 100644 --- a/target/linux/ramips/patches-3.10/0005-MIPS-ralink-make-mt7620-ram-detect-verbose.patch +++ b/target/linux/ramips/patches-3.10/0005-MIPS-ralink-make-mt7620-ram-detect-verbose.patch @@ -10,11 +10,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/ralink/mt7620.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -index 0018b1a..ccdec5a 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c -@@ -214,16 +214,19 @@ void prom_soc_init(struct ralink_soc_info *soc_info) +@@ -214,16 +214,19 @@ void prom_soc_init(struct ralink_soc_inf switch (dram_type) { case SYSCFG0_DRAM_TYPE_SDRAM: @@ -34,6 +32,3 @@ index 0018b1a..ccdec5a 100644 soc_info->mem_size_min = MT7620_DDR2_SIZE_MIN; soc_info->mem_size_max = MT7620_DDR2_SIZE_MAX; break; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0006-MIPS-ralink-add-verbose-pmu-info.patch b/target/linux/ramips/patches-3.10/0006-MIPS-ralink-add-verbose-pmu-info.patch index c2d959d354..6349bd3ee7 100644 --- a/target/linux/ramips/patches-3.10/0006-MIPS-ralink-add-verbose-pmu-info.patch +++ b/target/linux/ramips/patches-3.10/0006-MIPS-ralink-add-verbose-pmu-info.patch @@ -10,8 +10,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/ralink/mt7620.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -index ccdec5a..62356a0 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -20,6 +20,22 @@ @@ -37,7 +35,7 @@ index ccdec5a..62356a0 100644 /* does the board have sdram or ddram */ static int dram_type; -@@ -187,6 +203,8 @@ void prom_soc_init(struct ralink_soc_info *soc_info) +@@ -187,6 +203,8 @@ void prom_soc_init(struct ralink_soc_inf u32 n1; u32 rev; u32 cfg0; @@ -46,7 +44,7 @@ index ccdec5a..62356a0 100644 n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0); n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1); -@@ -234,4 +252,12 @@ void prom_soc_init(struct ralink_soc_info *soc_info) +@@ -234,4 +252,12 @@ void prom_soc_init(struct ralink_soc_inf BUG(); } soc_info->mem_base = MT7620_DRAM_BASE; @@ -59,6 +57,3 @@ index ccdec5a..62356a0 100644 + pr_info("Digital PMU set to %s control\n", + (pmu1 & DIG_SW_SEL) ? ("sw") : ("hw")); } --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0007-MIPS-ralink-adds-a-bootrom-dumper-module.patch b/target/linux/ramips/patches-3.10/0007-MIPS-ralink-adds-a-bootrom-dumper-module.patch index d22a1c9880..2b439c6202 100644 --- a/target/linux/ramips/patches-3.10/0007-MIPS-ralink-adds-a-bootrom-dumper-module.patch +++ b/target/linux/ramips/patches-3.10/0007-MIPS-ralink-adds-a-bootrom-dumper-module.patch @@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 2 files changed, 50 insertions(+) create mode 100644 arch/mips/ralink/bootrom.c -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index cae7d88..5fa6129 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile @@ -15,4 +15,6 @@ obj-$(CONFIG_SOC_MT7620) += mt7620.o @@ -24,9 +22,6 @@ index cae7d88..5fa6129 100644 +obj-$(CONFIG_DEBUG_FS) += bootrom.o + obj-y += dts/ -diff --git a/arch/mips/ralink/bootrom.c b/arch/mips/ralink/bootrom.c -new file mode 100644 -index 0000000..f926f6f --- /dev/null +++ b/arch/mips/ralink/bootrom.c @@ -0,0 +1,48 @@ @@ -78,6 +73,3 @@ index 0000000..f926f6f +} + +postcore_initcall(bootrom_setup); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0008-MIPS-ralink-add-illegal-access-driver.patch b/target/linux/ramips/patches-3.10/0008-MIPS-ralink-add-illegal-access-driver.patch index b79d5cdcaa..e3e58232c2 100644 --- a/target/linux/ramips/patches-3.10/0008-MIPS-ralink-add-illegal-access-driver.patch +++ b/target/linux/ramips/patches-3.10/0008-MIPS-ralink-add-illegal-access-driver.patch @@ -10,8 +10,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 2 files changed, 89 insertions(+) create mode 100644 arch/mips/ralink/ill_acc.c -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index 5fa6129..03af636 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile @@ -8,6 +8,8 @@ @@ -23,9 +21,6 @@ index 5fa6129..03af636 100644 obj-$(CONFIG_SOC_RT288X) += rt288x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o obj-$(CONFIG_SOC_RT3883) += rt3883.o -diff --git a/arch/mips/ralink/ill_acc.c b/arch/mips/ralink/ill_acc.c -new file mode 100644 -index 0000000..4a3f696 --- /dev/null +++ b/arch/mips/ralink/ill_acc.c @@ -0,0 +1,87 @@ @@ -116,6 +111,3 @@ index 0000000..4a3f696 +} + +arch_initcall(ill_acc_of_setup); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0009-MIPS-ralink-workaround-DTB-memory-issue.patch b/target/linux/ramips/patches-3.10/0009-MIPS-ralink-workaround-DTB-memory-issue.patch index cf7168bf5f..662b356304 100644 --- a/target/linux/ramips/patches-3.10/0009-MIPS-ralink-workaround-DTB-memory-issue.patch +++ b/target/linux/ramips/patches-3.10/0009-MIPS-ralink-workaround-DTB-memory-issue.patch @@ -11,8 +11,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/ralink/of.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c -index b25c1f2..8efb02b 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -74,7 +74,7 @@ void __init device_tree_init(void) @@ -24,6 +22,3 @@ index b25c1f2..8efb02b 100644 } void __init plat_mem_setup(void) --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0010-MIPS-ralink-add-spi-clock-definition-to-mt7620a.patch b/target/linux/ramips/patches-3.10/0010-MIPS-ralink-add-spi-clock-definition-to-mt7620a.patch index ebb58980f7..f768942fd1 100644 --- a/target/linux/ramips/patches-3.10/0010-MIPS-ralink-add-spi-clock-definition-to-mt7620a.patch +++ b/target/linux/ramips/patches-3.10/0010-MIPS-ralink-add-spi-clock-definition-to-mt7620a.patch @@ -8,8 +8,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/ralink/mt7620.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -index 62356a0..96422e5 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -183,6 +183,7 @@ void __init ralink_clk_init(void) @@ -20,6 +18,3 @@ index 62356a0..96422e5 100644 ralink_clk_add("10000c00.uartlite", 40000000); } --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0011-PCI-MIPS-adds-rt2880-pci-support.patch b/target/linux/ramips/patches-3.10/0011-PCI-MIPS-adds-rt2880-pci-support.patch index 6641985fd2..8db77a6ad6 100644 --- a/target/linux/ramips/patches-3.10/0011-PCI-MIPS-adds-rt2880-pci-support.patch +++ b/target/linux/ramips/patches-3.10/0011-PCI-MIPS-adds-rt2880-pci-support.patch @@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 3 files changed, 283 insertions(+) create mode 100644 arch/mips/pci/pci-rt2880.c -diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile -index 2cb1d31..77974ba 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile -@@ -41,6 +41,7 @@ obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1480.o pci-bcm1480ht.o +@@ -41,6 +41,7 @@ obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1 obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o obj-$(CONFIG_LANTIQ) += fixup-lantiq.o obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o @@ -25,9 +23,6 @@ index 2cb1d31..77974ba 100644 obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o -diff --git a/arch/mips/pci/pci-rt2880.c b/arch/mips/pci/pci-rt2880.c -new file mode 100644 -index 0000000..e2c4730 --- /dev/null +++ b/arch/mips/pci/pci-rt2880.c @@ -0,0 +1,281 @@ @@ -312,8 +307,6 @@ index 0000000..e2c4730 +} + +arch_initcall(pcibios_init); -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index 026e823..cd13da8 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -8,6 +8,7 @@ choice @@ -324,6 +317,3 @@ index 026e823..cd13da8 100644 config SOC_RT305X bool "RT305x" --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0012-PCI-MIPS-adds-rt3883-pci-support.patch b/target/linux/ramips/patches-3.10/0012-PCI-MIPS-adds-rt3883-pci-support.patch index ababca7962..b28ed194ea 100644 --- a/target/linux/ramips/patches-3.10/0012-PCI-MIPS-adds-rt3883-pci-support.patch +++ b/target/linux/ramips/patches-3.10/0012-PCI-MIPS-adds-rt3883-pci-support.patch @@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 3 files changed, 642 insertions(+) create mode 100644 arch/mips/pci/pci-rt3883.c -diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile -index 77974ba..3cbfd9b 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile -@@ -42,6 +42,7 @@ obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o +@@ -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_RT2880) += pci-rt2880.o @@ -25,9 +23,6 @@ index 77974ba..3cbfd9b 100644 obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o -diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c -new file mode 100644 -index 0000000..212c90b --- /dev/null +++ b/arch/mips/pci/pci-rt3883.c @@ -0,0 +1,640 @@ @@ -671,8 +666,6 @@ index 0000000..212c90b +} + +postcore_initcall(rt3883_pci_init); -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index cd13da8..592e5f9 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -20,6 +20,7 @@ choice @@ -683,6 +676,3 @@ index cd13da8..592e5f9 100644 config SOC_MT7620 bool "MT7620" --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0013-PCI-MIPS-adds-mt7620a-pcie-driver.patch b/target/linux/ramips/patches-3.10/0013-PCI-MIPS-adds-mt7620a-pcie-driver.patch index 1da472c0a3..0d31f73976 100644 --- a/target/linux/ramips/patches-3.10/0013-PCI-MIPS-adds-mt7620a-pcie-driver.patch +++ b/target/linux/ramips/patches-3.10/0013-PCI-MIPS-adds-mt7620a-pcie-driver.patch @@ -11,8 +11,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 3 files changed, 365 insertions(+) create mode 100644 arch/mips/pci/pci-mt7620a.c -diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile -index 3cbfd9b..025d3a7 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_LANTIQ) += fixup-lantiq.o @@ -23,9 +21,6 @@ index 3cbfd9b..025d3a7 100644 obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o -diff --git a/arch/mips/pci/pci-mt7620a.c b/arch/mips/pci/pci-mt7620a.c -new file mode 100644 -index 0000000..271763c --- /dev/null +++ b/arch/mips/pci/pci-mt7620a.c @@ -0,0 +1,363 @@ @@ -392,8 +387,6 @@ index 0000000..271763c +} + +arch_initcall(mt7620a_pci_init); -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index 592e5f9..992e365 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -24,6 +24,7 @@ choice @@ -404,6 +397,3 @@ index 592e5f9..992e365 100644 endchoice --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0014-NET-multi-phy-support.patch b/target/linux/ramips/patches-3.10/0014-NET-multi-phy-support.patch index 94f63aac7f..345ee14434 100644 --- a/target/linux/ramips/patches-3.10/0014-NET-multi-phy-support.patch +++ b/target/linux/ramips/patches-3.10/0014-NET-multi-phy-support.patch @@ -9,11 +9,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> include/linux/phy.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) -diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c -index 38f0b31..ad64a75 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -773,7 +773,8 @@ void phy_state_machine(struct work_struct *work) +@@ -820,7 +820,8 @@ void phy_state_machine(struct work_struc * negotiation for now */ if (!phydev->link) { phydev->state = PHY_NOLINK; @@ -23,7 +21,7 @@ index 38f0b31..ad64a75 100644 phydev->adjust_link(phydev->attached_dev); break; } -@@ -843,7 +844,8 @@ void phy_state_machine(struct work_struct *work) +@@ -890,7 +891,8 @@ void phy_state_machine(struct work_struc netif_carrier_on(phydev->attached_dev); } else { phydev->state = PHY_NOLINK; @@ -33,7 +31,7 @@ index 38f0b31..ad64a75 100644 } phydev->adjust_link(phydev->attached_dev); -@@ -855,7 +857,8 @@ void phy_state_machine(struct work_struct *work) +@@ -902,7 +904,8 @@ void phy_state_machine(struct work_struc case PHY_HALTED: if (phydev->link) { phydev->link = 0; @@ -43,8 +41,6 @@ index 38f0b31..ad64a75 100644 phydev->adjust_link(phydev->attached_dev); } break; -diff --git a/include/linux/phy.h b/include/linux/phy.h -index 9e11039..9a8ca78 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -298,7 +298,7 @@ struct phy_device { @@ -56,6 +52,3 @@ index 9e11039..9a8ca78 100644 enum phy_state state; u32 dev_flags; --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0015-NET-add-of_get_mac_address_mtd.patch b/target/linux/ramips/patches-3.10/0015-NET-add-of_get_mac_address_mtd.patch index 1bc2977de2..408326d40b 100644 --- a/target/linux/ramips/patches-3.10/0015-NET-add-of_get_mac_address_mtd.patch +++ b/target/linux/ramips/patches-3.10/0015-NET-add-of_get_mac_address_mtd.patch @@ -14,8 +14,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> include/linux/of_net.h | 1 + 2 files changed, 38 insertions(+) -diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c -index ffab033..15f4a71 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c @@ -10,6 +10,7 @@ @@ -26,7 +24,7 @@ index ffab033..15f4a71 100644 /** * It maps 'enum phy_interface_t' found in include/linux/phy.h -@@ -92,3 +93,39 @@ const void *of_get_mac_address(struct device_node *np) +@@ -92,3 +93,39 @@ const void *of_get_mac_address(struct de return NULL; } EXPORT_SYMBOL(of_get_mac_address); @@ -66,8 +64,6 @@ index ffab033..15f4a71 100644 + return ret; +} +EXPORT_SYMBOL_GPL(of_get_mac_address_mtd); -diff --git a/include/linux/of_net.h b/include/linux/of_net.h -index 61bf53b..6e6b4a9 100644 --- a/include/linux/of_net.h +++ b/include/linux/of_net.h @@ -11,6 +11,7 @@ @@ -78,6 +74,3 @@ index 61bf53b..6e6b4a9 100644 #else static inline const int of_get_phy_mode(struct device_node *np) { --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0016-NET-MIPS-add-ralink-SoC-ethernet-driver.patch b/target/linux/ramips/patches-3.10/0016-NET-MIPS-add-ralink-SoC-ethernet-driver.patch index fbd45b829a..4b20d623a3 100644 --- a/target/linux/ramips/patches-3.10/0016-NET-MIPS-add-ralink-SoC-ethernet-driver.patch +++ b/target/linux/ramips/patches-3.10/0016-NET-MIPS-add-ralink-SoC-ethernet-driver.patch @@ -46,9 +46,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 drivers/net/ethernet/ralink/soc_rt305x.c create mode 100644 drivers/net/ethernet/ralink/soc_rt3883.c -diff --git a/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h -new file mode 100644 -index 0000000..2098c5c --- /dev/null +++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h @@ -0,0 +1,27 @@ @@ -79,8 +76,6 @@ index 0000000..2098c5c +}; + +#endif /* _RT305X_ESW_PLATFORM_H */ -diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c -index ca7ee3a..1a6b458 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c @@ -221,6 +221,7 @@ void __init ralink_clk_init(void) @@ -91,8 +86,6 @@ index ca7ee3a..1a6b458 100644 ralink_clk_add("10000b00.spi", sys_rate); ralink_clk_add("10000100.timer", wdt_rate); ralink_clk_add("10000120.watchdog", wdt_rate); -diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig -index ed956e0..0b3caa1 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -135,6 +135,7 @@ config ETHOC @@ -103,8 +96,6 @@ index ed956e0..0b3caa1 100644 source "drivers/net/ethernet/realtek/Kconfig" source "drivers/net/ethernet/renesas/Kconfig" source "drivers/net/ethernet/rdc/Kconfig" -diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile -index 8268d85..508c494 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -53,6 +53,7 @@ obj-$(CONFIG_ETHOC) += ethoc.o @@ -115,9 +106,6 @@ index 8268d85..508c494 100644 obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ obj-$(CONFIG_SH_ETH) += renesas/ obj-$(CONFIG_NET_VENDOR_RDC) += rdc/ -diff --git a/drivers/net/ethernet/ralink/Kconfig b/drivers/net/ethernet/ralink/Kconfig -new file mode 100644 -index 0000000..ca2c9ad --- /dev/null +++ b/drivers/net/ethernet/ralink/Kconfig @@ -0,0 +1,31 @@ @@ -152,9 +140,6 @@ index 0000000..ca2c9ad + select PHYLIB + select SWCONFIG +endif -diff --git a/drivers/net/ethernet/ralink/Makefile b/drivers/net/ethernet/ralink/Makefile -new file mode 100644 -index 0000000..a38fa21 --- /dev/null +++ b/drivers/net/ethernet/ralink/Makefile @@ -0,0 +1,18 @@ @@ -176,9 +161,6 @@ index 0000000..a38fa21 +ralink-eth-$(CONFIG_SOC_MT7620) += soc_mt7620.o + +obj-$(CONFIG_NET_RALINK) += ralink-eth.o -diff --git a/drivers/net/ethernet/ralink/esw_rt3052.c b/drivers/net/ethernet/ralink/esw_rt3052.c -new file mode 100644 -index 0000000..b937062 --- /dev/null +++ b/drivers/net/ethernet/ralink/esw_rt3052.c @@ -0,0 +1,1463 @@ @@ -1645,9 +1627,6 @@ index 0000000..b937062 +{ + platform_driver_unregister(&esw_driver); +} -diff --git a/drivers/net/ethernet/ralink/esw_rt3052.h b/drivers/net/ethernet/ralink/esw_rt3052.h -new file mode 100644 -index 0000000..2ced3dff --- /dev/null +++ b/drivers/net/ethernet/ralink/esw_rt3052.h @@ -0,0 +1,32 @@ @@ -1683,9 +1662,6 @@ index 0000000..2ced3dff + +#endif +#endif -diff --git a/drivers/net/ethernet/ralink/gsw_mt7620a.c b/drivers/net/ethernet/ralink/gsw_mt7620a.c -new file mode 100644 -index 0000000..9fa6a54 --- /dev/null +++ b/drivers/net/ethernet/ralink/gsw_mt7620a.c @@ -0,0 +1,1027 @@ @@ -2716,9 +2692,6 @@ index 0000000..9fa6a54 + + return 0; +} -diff --git a/drivers/net/ethernet/ralink/gsw_mt7620a.h b/drivers/net/ethernet/ralink/gsw_mt7620a.h -new file mode 100644 -index 0000000..fd4add5 --- /dev/null +++ b/drivers/net/ethernet/ralink/gsw_mt7620a.h @@ -0,0 +1,29 @@ @@ -2751,9 +2724,6 @@ index 0000000..fd4add5 +extern int mt7620a_has_carrier(struct fe_priv *priv); + +#endif -diff --git a/drivers/net/ethernet/ralink/mdio.c b/drivers/net/ethernet/ralink/mdio.c -new file mode 100644 -index 0000000..b265c75 --- /dev/null +++ b/drivers/net/ethernet/ralink/mdio.c @@ -0,0 +1,245 @@ @@ -3002,9 +2972,6 @@ index 0000000..b265c75 + of_node_put(priv->mii_bus->dev.of_node); + kfree(priv->mii_bus); +} -diff --git a/drivers/net/ethernet/ralink/mdio.h b/drivers/net/ethernet/ralink/mdio.h -new file mode 100644 -index 0000000..c3910a0 --- /dev/null +++ b/drivers/net/ethernet/ralink/mdio.h @@ -0,0 +1,29 @@ @@ -3037,9 +3004,6 @@ index 0000000..c3910a0 +static inline void fe_mdio_cleanup(struct fe_priv *priv) {} +#endif +#endif -diff --git a/drivers/net/ethernet/ralink/mdio_rt2880.c b/drivers/net/ethernet/ralink/mdio_rt2880.c -new file mode 100644 -index 0000000..701c7b6 --- /dev/null +++ b/drivers/net/ethernet/ralink/mdio_rt2880.c @@ -0,0 +1,232 @@ @@ -3275,9 +3239,6 @@ index 0000000..701c7b6 + + return; +} -diff --git a/drivers/net/ethernet/ralink/mdio_rt2880.h b/drivers/net/ethernet/ralink/mdio_rt2880.h -new file mode 100644 -index 0000000..51e3633 --- /dev/null +++ b/drivers/net/ethernet/ralink/mdio_rt2880.h @@ -0,0 +1,26 @@ @@ -3307,9 +3268,6 @@ index 0000000..51e3633 +void rt2880_port_init(struct fe_priv *priv, struct device_node *np); + +#endif -diff --git a/drivers/net/ethernet/ralink/ralink_soc_eth.c b/drivers/net/ethernet/ralink/ralink_soc_eth.c -new file mode 100644 -index 0000000..8c36dba --- /dev/null +++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c @@ -0,0 +1,735 @@ @@ -4048,9 +4006,6 @@ index 0000000..8c36dba +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("John Crispin <blogic@openwrt.org>"); +MODULE_DESCRIPTION("Ethernet driver for Ralink SoC"); -diff --git a/drivers/net/ethernet/ralink/ralink_soc_eth.h b/drivers/net/ethernet/ralink/ralink_soc_eth.h -new file mode 100644 -index 0000000..85bc881 --- /dev/null +++ b/drivers/net/ethernet/ralink/ralink_soc_eth.h @@ -0,0 +1,374 @@ @@ -4428,9 +4383,6 @@ index 0000000..85bc881 +u32 fe_r32(unsigned reg); + +#endif /* FE_ETH_H */ -diff --git a/drivers/net/ethernet/ralink/soc_mt7620.c b/drivers/net/ethernet/ralink/soc_mt7620.c -new file mode 100644 -index 0000000..55e303f --- /dev/null +++ b/drivers/net/ethernet/ralink/soc_mt7620.c @@ -0,0 +1,111 @@ @@ -4545,9 +4497,6 @@ index 0000000..55e303f +}; + +MODULE_DEVICE_TABLE(of, of_fe_match); -diff --git a/drivers/net/ethernet/ralink/soc_rt2880.c b/drivers/net/ethernet/ralink/soc_rt2880.c -new file mode 100644 -index 0000000..1110947 --- /dev/null +++ b/drivers/net/ethernet/ralink/soc_rt2880.c @@ -0,0 +1,51 @@ @@ -4602,9 +4551,6 @@ index 0000000..1110947 +}; + +MODULE_DEVICE_TABLE(of, of_fe_match); -diff --git a/drivers/net/ethernet/ralink/soc_rt305x.c b/drivers/net/ethernet/ralink/soc_rt305x.c -new file mode 100644 -index 0000000..482ca1f --- /dev/null +++ b/drivers/net/ethernet/ralink/soc_rt305x.c @@ -0,0 +1,113 @@ @@ -4721,9 +4667,6 @@ index 0000000..482ca1f +}; + +MODULE_DEVICE_TABLE(of, of_fe_match); -diff --git a/drivers/net/ethernet/ralink/soc_rt3883.c b/drivers/net/ethernet/ralink/soc_rt3883.c -new file mode 100644 -index 0000000..c660529 --- /dev/null +++ b/drivers/net/ethernet/ralink/soc_rt3883.c @@ -0,0 +1,60 @@ @@ -4787,6 +4730,3 @@ index 0000000..c660529 + +MODULE_DEVICE_TABLE(of, of_fe_match); + --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0017-USB-MIPS-ralink-fix-usb-issue-on-mt7620.patch b/target/linux/ramips/patches-3.10/0017-USB-MIPS-ralink-fix-usb-issue-on-mt7620.patch index c86a4a37ee..aa00e87ad3 100644 --- a/target/linux/ramips/patches-3.10/0017-USB-MIPS-ralink-fix-usb-issue-on-mt7620.patch +++ b/target/linux/ramips/patches-3.10/0017-USB-MIPS-ralink-fix-usb-issue-on-mt7620.patch @@ -12,8 +12,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/ralink/mt7620.c | 8 ++++++++ 2 files changed, 9 insertions(+) -diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h -index 9809972..d469c69 100644 --- a/arch/mips/include/asm/mach-ralink/mt7620.h +++ b/arch/mips/include/asm/mach-ralink/mt7620.h @@ -20,6 +20,7 @@ @@ -24,8 +22,6 @@ index 9809972..d469c69 100644 #define SYSC_REG_CPLL_CONFIG0 0x54 #define SYSC_REG_CPLL_CONFIG1 0x58 -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -index 96422e5..6f6b1c8 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -185,6 +185,14 @@ void __init ralink_clk_init(void) @@ -43,6 +39,3 @@ index 96422e5..6f6b1c8 100644 } void __init ralink_of_remap(void) --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0018-USB-phy-add-ralink-SoC-driver.patch b/target/linux/ramips/patches-3.10/0018-USB-phy-add-ralink-SoC-driver.patch index daa351a70f..ddfc856687 100644 --- a/target/linux/ramips/patches-3.10/0018-USB-phy-add-ralink-SoC-driver.patch +++ b/target/linux/ramips/patches-3.10/0018-USB-phy-add-ralink-SoC-driver.patch @@ -11,8 +11,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 3 files changed, 200 insertions(+) create mode 100644 drivers/usb/phy/ralink-phy.c -diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig -index 2311b1e..2944b8c 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -210,4 +210,12 @@ config USB_ULPI_VIEWPORT @@ -28,18 +26,13 @@ index 2311b1e..2944b8c 100644 + SoCs. + endif # USB_PHY -diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile -index a9169cb..f7da66b 100644 --- a/drivers/usb/phy/Makefile +++ b/drivers/usb/phy/Makefile -@@ -31,3 +31,4 @@ obj-$(CONFIG_USB_MXS_PHY) += phy-mxs-usb.o +@@ -31,3 +31,4 @@ obj-$(CONFIG_USB_MXS_PHY) += phy-mxs-us obj-$(CONFIG_USB_RCAR_PHY) += phy-rcar-usb.o obj-$(CONFIG_USB_ULPI) += phy-ulpi.o obj-$(CONFIG_USB_ULPI_VIEWPORT) += phy-ulpi-viewport.o +obj-$(CONFIG_RALINK_USBPHY) += ralink-phy.o -diff --git a/drivers/usb/phy/ralink-phy.c b/drivers/usb/phy/ralink-phy.c -new file mode 100644 -index 0000000..269cff4 --- /dev/null +++ b/drivers/usb/phy/ralink-phy.c @@ -0,0 +1,191 @@ @@ -234,6 +227,3 @@ index 0000000..269cff4 +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Ralink USB phy"); +MODULE_AUTHOR("John Crispin <blogic@openwrt.org>"); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0019-USB-add-OHCI-EHCI-OF-binding.patch b/target/linux/ramips/patches-3.10/0019-USB-add-OHCI-EHCI-OF-binding.patch index e442f2f2a2..14da4ae816 100644 --- a/target/linux/ramips/patches-3.10/0019-USB-add-OHCI-EHCI-OF-binding.patch +++ b/target/linux/ramips/patches-3.10/0019-USB-add-OHCI-EHCI-OF-binding.patch @@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> drivers/usb/host/ohci-platform.c | 37 ++++++++++++++++++++++++++++++++----- 4 files changed, 51 insertions(+), 10 deletions(-) -Index: linux-3.10.1/arch/mips/ralink/Kconfig -=================================================================== ---- linux-3.10.1.orig/arch/mips/ralink/Kconfig 2013-07-15 17:35:28.021178556 +0200 -+++ linux-3.10.1/arch/mips/ralink/Kconfig 2013-07-15 20:00:19.501385660 +0200 -@@ -24,6 +24,8 @@ +--- a/arch/mips/ralink/Kconfig ++++ b/arch/mips/ralink/Kconfig +@@ -24,6 +24,8 @@ choice config SOC_MT7620 bool "MT7620" @@ -26,11 +24,9 @@ Index: linux-3.10.1/arch/mips/ralink/Kconfig select HW_HAS_PCI endchoice -Index: linux-3.10.1/drivers/usb/Makefile -=================================================================== ---- linux-3.10.1.orig/drivers/usb/Makefile 2013-07-13 20:42:41.000000000 +0200 -+++ linux-3.10.1/drivers/usb/Makefile 2013-07-15 19:47:26.725367249 +0200 -@@ -10,6 +10,8 @@ +--- a/drivers/usb/Makefile ++++ b/drivers/usb/Makefile +@@ -10,6 +10,8 @@ obj-$(CONFIG_USB_DWC3) += dwc3/ obj-$(CONFIG_USB_MON) += mon/ @@ -39,7 +35,7 @@ Index: linux-3.10.1/drivers/usb/Makefile obj-$(CONFIG_PCI) += host/ obj-$(CONFIG_USB_EHCI_HCD) += host/ obj-$(CONFIG_USB_ISP116X_HCD) += host/ -@@ -44,7 +46,6 @@ +@@ -44,7 +46,6 @@ obj-$(CONFIG_USB_MICROTEK) += image/ obj-$(CONFIG_USB_SERIAL) += serial/ obj-$(CONFIG_USB) += misc/ @@ -47,10 +43,8 @@ Index: linux-3.10.1/drivers/usb/Makefile obj-$(CONFIG_EARLY_PRINTK_DBGP) += early/ obj-$(CONFIG_USB_ATM) += atm/ -Index: linux-3.10.1/drivers/usb/host/ehci-platform.c -=================================================================== ---- linux-3.10.1.orig/drivers/usb/host/ehci-platform.c 2013-07-15 17:35:22.761178428 +0200 -+++ linux-3.10.1/drivers/usb/host/ehci-platform.c 2013-07-15 19:47:14.525366961 +0200 +--- a/drivers/usb/host/ehci-platform.c ++++ b/drivers/usb/host/ehci-platform.c @@ -29,6 +29,8 @@ #include <linux/usb.h> #include <linux/usb/hcd.h> @@ -60,7 +54,7 @@ Index: linux-3.10.1/drivers/usb/host/ehci-platform.c #include "ehci.h" -@@ -118,6 +120,15 @@ +@@ -118,6 +120,15 @@ static int ehci_platform_probe(struct pl hcd->rsrc_start = res_mem->start; hcd->rsrc_len = resource_size(res_mem); @@ -76,7 +70,7 @@ Index: linux-3.10.1/drivers/usb/host/ehci-platform.c hcd->regs = devm_ioremap_resource(&dev->dev, res_mem); if (IS_ERR(hcd->regs)) { err = PTR_ERR(hcd->regs); -@@ -155,6 +166,9 @@ +@@ -155,6 +166,9 @@ static int ehci_platform_remove(struct p if (pdata == &ehci_platform_defaults) dev->dev.platform_data = NULL; @@ -86,7 +80,7 @@ Index: linux-3.10.1/drivers/usb/host/ehci-platform.c return 0; } -@@ -199,9 +213,8 @@ +@@ -199,9 +213,8 @@ static int ehci_platform_resume(struct d #define ehci_platform_resume NULL #endif /* CONFIG_PM */ @@ -98,7 +92,7 @@ Index: linux-3.10.1/drivers/usb/host/ehci-platform.c {} }; -@@ -225,7 +238,7 @@ +@@ -225,7 +238,7 @@ static struct platform_driver ehci_platf .owner = THIS_MODULE, .name = "ehci-platform", .pm = &ehci_platform_pm_ops, @@ -107,10 +101,8 @@ Index: linux-3.10.1/drivers/usb/host/ehci-platform.c } }; -Index: linux-3.10.1/drivers/usb/host/ohci-platform.c -=================================================================== ---- linux-3.10.1.orig/drivers/usb/host/ohci-platform.c 2013-07-13 20:42:41.000000000 +0200 -+++ linux-3.10.1/drivers/usb/host/ohci-platform.c 2013-07-15 19:55:15.913378428 +0200 +--- a/drivers/usb/host/ohci-platform.c ++++ b/drivers/usb/host/ohci-platform.c @@ -16,6 +16,10 @@ #include <linux/err.h> #include <linux/platform_device.h> @@ -122,7 +114,7 @@ Index: linux-3.10.1/drivers/usb/host/ohci-platform.c static int ohci_platform_reset(struct usb_hcd *hcd) { -@@ -88,14 +92,22 @@ +@@ -88,14 +92,22 @@ static int ohci_platform_probe(struct pl { struct usb_hcd *hcd; struct resource *res_mem; @@ -150,7 +142,7 @@ Index: linux-3.10.1/drivers/usb/host/ohci-platform.c if (usb_disabled()) return -ENODEV; -@@ -128,6 +140,12 @@ +@@ -128,6 +140,12 @@ static int ohci_platform_probe(struct pl hcd->rsrc_start = res_mem->start; hcd->rsrc_len = resource_size(res_mem); @@ -163,7 +155,7 @@ Index: linux-3.10.1/drivers/usb/host/ohci-platform.c hcd->regs = devm_ioremap_resource(&dev->dev, res_mem); if (IS_ERR(hcd->regs)) { err = PTR_ERR(hcd->regs); -@@ -162,6 +180,9 @@ +@@ -162,6 +180,9 @@ static int ohci_platform_remove(struct p if (pdata->power_off) pdata->power_off(dev); @@ -173,7 +165,7 @@ Index: linux-3.10.1/drivers/usb/host/ohci-platform.c return 0; } -@@ -201,6 +222,11 @@ +@@ -201,6 +222,11 @@ static int ohci_platform_resume(struct d #define ohci_platform_resume NULL #endif /* CONFIG_PM */ @@ -185,7 +177,7 @@ Index: linux-3.10.1/drivers/usb/host/ohci-platform.c static const struct platform_device_id ohci_platform_table[] = { { "ohci-platform", 0 }, { } -@@ -221,5 +247,6 @@ +@@ -221,5 +247,6 @@ static struct platform_driver ohci_platf .owner = THIS_MODULE, .name = "ohci-platform", .pm = &ohci_platform_pm_ops, diff --git a/target/linux/ramips/patches-3.10/0020-serial-ralink-adds-mt7620-serial.patch b/target/linux/ramips/patches-3.10/0020-serial-ralink-adds-mt7620-serial.patch index 98516c4464..2772aef738 100644 --- a/target/linux/ramips/patches-3.10/0020-serial-ralink-adds-mt7620-serial.patch +++ b/target/linux/ramips/patches-3.10/0020-serial-ralink-adds-mt7620-serial.patch @@ -10,11 +10,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> drivers/tty/serial/8250/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig -index 80fe91e..f6d6820 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig -@@ -296,7 +296,7 @@ config SERIAL_8250_EM +@@ -300,7 +300,7 @@ config SERIAL_8250_EM config SERIAL_8250_RT288X bool "Ralink RT288x/RT305x/RT3662/RT3883 serial port support" @@ -23,6 +21,3 @@ index 80fe91e..f6d6820 100644 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 --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0021-serial-of-allow-au1x00-and-rt288x-to-load-from-OF.patch b/target/linux/ramips/patches-3.10/0021-serial-of-allow-au1x00-and-rt288x-to-load-from-OF.patch index 73fbab97f7..b12817e000 100644 --- a/target/linux/ramips/patches-3.10/0021-serial-of-allow-au1x00-and-rt288x-to-load-from-OF.patch +++ b/target/linux/ramips/patches-3.10/0021-serial-of-allow-au1x00-and-rt288x-to-load-from-OF.patch @@ -11,11 +11,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> drivers/tty/serial/of_serial.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c -index 39c7ea4..0f333f3 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c -@@ -103,7 +103,10 @@ static int of_platform_serial_setup(struct platform_device *ofdev, +@@ -103,7 +103,10 @@ static int of_platform_serial_setup(stru port->fifosize = prop; port->irq = irq_of_parse_and_map(np, 0); @@ -27,6 +25,3 @@ index 39c7ea4..0f333f3 100644 if (of_property_read_u32(np, "reg-io-width", &prop) == 0) { switch (prop) { case 1: --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0022-clocksource-MIPS-ralink-add-support-for-systick-time.patch b/target/linux/ramips/patches-3.10/0022-clocksource-MIPS-ralink-add-support-for-systick-time.patch index c5924ffe27..6a3b947cc8 100644 --- a/target/linux/ramips/patches-3.10/0022-clocksource-MIPS-ralink-add-support-for-systick-time.patch +++ b/target/linux/ramips/patches-3.10/0022-clocksource-MIPS-ralink-add-support-for-systick-time.patch @@ -14,8 +14,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 5 files changed, 172 insertions(+) create mode 100644 drivers/clocksource/cevt-rt3352.c -diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig -index 8f49ed7..f5d97b8 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -15,6 +15,7 @@ choice @@ -34,8 +32,6 @@ index 8f49ed7..f5d97b8 100644 endchoice -diff --git a/arch/mips/ralink/clk.c b/arch/mips/ralink/clk.c -index 8dfa22f..bba0cdf 100644 --- a/arch/mips/ralink/clk.c +++ b/arch/mips/ralink/clk.c @@ -69,4 +69,5 @@ void __init plat_time_init(void) @@ -44,8 +40,6 @@ index 8dfa22f..bba0cdf 100644 clk_put(clk); + clocksource_of_init(); } -diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index f151c6c..0e58a49 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -7,6 +7,12 @@ config CLKSRC_I8253 @@ -61,8 +55,6 @@ index f151c6c..0e58a49 100644 config I8253_LOCK bool -diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile -index 8d979c7..423a2ef 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_SH_TIMER_TMU) += sh_tmu.o @@ -73,9 +65,6 @@ index 8d979c7..423a2ef 100644 obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o obj-$(CONFIG_CLKSRC_NOMADIK_MTU) += nomadik-mtu.o -diff --git a/drivers/clocksource/cevt-rt3352.c b/drivers/clocksource/cevt-rt3352.c -new file mode 100644 -index 0000000..bd50edd --- /dev/null +++ b/drivers/clocksource/cevt-rt3352.c @@ -0,0 +1,162 @@ @@ -241,6 +230,3 @@ index 0000000..bd50edd +} + +CLOCKSOURCE_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0023-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch b/target/linux/ramips/patches-3.10/0023-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch index e39443ad82..62b395e77e 100644 --- a/target/linux/ramips/patches-3.10/0023-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch +++ b/target/linux/ramips/patches-3.10/0023-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch @@ -17,8 +17,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 arch/mips/include/asm/mach-ralink/gpio.h create mode 100644 drivers/gpio/gpio-ralink.c -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 7a58ab9..5737c4b 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -443,6 +443,7 @@ config RALINK @@ -29,9 +27,6 @@ index 7a58ab9..5737c4b 100644 config SGI_IP22 bool "SGI IP22 (Indy/Indigo2)" -diff --git a/arch/mips/include/asm/mach-ralink/gpio.h b/arch/mips/include/asm/mach-ralink/gpio.h -new file mode 100644 -index 0000000..f68ee16 --- /dev/null +++ b/arch/mips/include/asm/mach-ralink/gpio.h @@ -0,0 +1,24 @@ @@ -59,8 +54,6 @@ index 0000000..f68ee16 +#define gpio_to_irq __gpio_to_irq + +#endif /* __ASM_MACH_RALINK_GPIO_H */ -diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index 573c449..4f2f7c2 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -209,6 +209,12 @@ config GPIO_RCAR @@ -76,11 +69,9 @@ index 573c449..4f2f7c2 100644 config GPIO_SPEAR_SPICS bool "ST SPEAr13xx SPI Chip Select as GPIO support" depends on PLAT_SPEAR -diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index 0cb2d65..feb9647 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -56,6 +56,7 @@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o +@@ -56,6 +56,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 @@ -88,9 +79,6 @@ index 0cb2d65..feb9647 100644 obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o -diff --git a/drivers/gpio/gpio-ralink.c b/drivers/gpio/gpio-ralink.c -new file mode 100644 -index 0000000..12984f1 --- /dev/null +++ b/drivers/gpio/gpio-ralink.c @@ -0,0 +1,326 @@ @@ -420,6 +408,3 @@ index 0000000..12984f1 +} + +subsys_initcall(ralink_gpio_init); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0024-SPI-ralink-add-Ralink-SoC-spi-driver.patch b/target/linux/ramips/patches-3.10/0024-SPI-ralink-add-Ralink-SoC-spi-driver.patch index 8170bf4d08..087ead1a8c 100644 --- a/target/linux/ramips/patches-3.10/0024-SPI-ralink-add-Ralink-SoC-spi-driver.patch +++ b/target/linux/ramips/patches-3.10/0024-SPI-ralink-add-Ralink-SoC-spi-driver.patch @@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 3 files changed, 482 insertions(+) create mode 100644 drivers/spi/spi-ralink.c -diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig -index 92a9345..30e73ea 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -345,6 +345,12 @@ config SPI_RSPI +@@ -354,6 +354,12 @@ config SPI_RSPI help SPI driver for Renesas RSPI blocks. @@ -30,11 +28,9 @@ index 92a9345..30e73ea 100644 config SPI_S3C24XX tristate "Samsung S3C24XX series SPI" depends on ARCH_S3C24XX -diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile -index 33f9c09..724e8de1 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile -@@ -55,6 +55,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_DMA) += spi-pxa2xx-dma.o +@@ -56,6 +56,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_ obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx-platform.o obj-$(CONFIG_SPI_PXA2XX_PCI) += spi-pxa2xx-pci.o obj-$(CONFIG_SPI_RSPI) += spi-rspi.o @@ -42,9 +38,6 @@ index 33f9c09..724e8de1 100644 obj-$(CONFIG_SPI_S3C24XX) += spi-s3c24xx-hw.o spi-s3c24xx-hw-y := spi-s3c24xx.o spi-s3c24xx-hw-$(CONFIG_SPI_S3C24XX_FIQ) += spi-s3c24xx-fiq.o -diff --git a/drivers/spi/spi-ralink.c b/drivers/spi/spi-ralink.c -new file mode 100644 -index 0000000..b07cbaa --- /dev/null +++ b/drivers/spi/spi-ralink.c @@ -0,0 +1,475 @@ @@ -523,6 +516,3 @@ index 0000000..b07cbaa +MODULE_AUTHOR("Sergiy <piratfm@gmail.com>"); +MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>"); +MODULE_LICENSE("GPL"); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0025-watchdog-adds-ralink-wdt.patch b/target/linux/ramips/patches-3.10/0025-watchdog-adds-ralink-wdt.patch index 63e54c672e..dd69d57b4a 100644 --- a/target/linux/ramips/patches-3.10/0025-watchdog-adds-ralink-wdt.patch +++ b/target/linux/ramips/patches-3.10/0025-watchdog-adds-ralink-wdt.patch @@ -14,8 +14,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> 4 files changed, 216 insertions(+) create mode 100644 drivers/watchdog/rt2880_wdt.c -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -index 6f6b1c8..14c28b0 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -182,6 +182,7 @@ void __init ralink_clk_init(void) @@ -26,8 +24,6 @@ index 6f6b1c8..14c28b0 100644 ralink_clk_add("10000500.uart", 40000000); ralink_clk_add("10000b00.spi", 40000000); ralink_clk_add("10000c00.uartlite", 40000000); -diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig -index e89fc31..5e34760 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1104,6 +1104,13 @@ config LANTIQ_WDT @@ -44,8 +40,6 @@ index e89fc31..5e34760 100644 # PARISC Architecture # POWERPC Architecture -diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile -index a300b94..2681e3d 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -134,6 +134,7 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o @@ -56,9 +50,6 @@ index a300b94..2681e3d 100644 # PARISC Architecture -diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c -new file mode 100644 -index 0000000..ebba535 --- /dev/null +++ b/drivers/watchdog/rt2880_wdt.c @@ -0,0 +1,207 @@ @@ -269,6 +260,3 @@ index 0000000..ebba535 +MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0026-i2c-MIPS-adds-ralink-I2C-driver.patch b/target/linux/ramips/patches-3.10/0026-i2c-MIPS-adds-ralink-I2C-driver.patch index bee64f83fe..0e72ef02c7 100644 --- a/target/linux/ramips/patches-3.10/0026-i2c-MIPS-adds-ralink-I2C-driver.patch +++ b/target/linux/ramips/patches-3.10/0026-i2c-MIPS-adds-ralink-I2C-driver.patch @@ -13,9 +13,6 @@ 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 -diff --git a/Documentation/devicetree/bindings/i2c/i2c-ralink.txt b/Documentation/devicetree/bindings/i2c/i2c-ralink.txt -new file mode 100644 -index 0000000..8fa8ac3 --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/i2c-ralink.txt @@ -0,0 +1,27 @@ @@ -46,8 +43,6 @@ index 0000000..8fa8ac3 + }; + }; +}; -diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index 631736e..e2c2381 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -628,6 +628,10 @@ config I2C_PXA_SLAVE @@ -61,8 +56,6 @@ index 631736e..e2c2381 100644 config HAVE_S3C2410_I2C bool help -diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile -index 8f4fc23..7e39a13 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -62,6 +62,7 @@ obj-$(CONFIG_I2C_PNX) += i2c-pnx.o @@ -73,9 +66,6 @@ index 8f4fc23..7e39a13 100644 obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o obj-$(CONFIG_I2C_S6000) += i2c-s6000.o obj-$(CONFIG_I2C_SH7760) += i2c-sh7760.o -diff --git a/drivers/i2c/busses/i2c-ralink.c b/drivers/i2c/busses/i2c-ralink.c -new file mode 100644 -index 0000000..f4dc13d --- /dev/null +++ b/drivers/i2c/busses/i2c-ralink.c @@ -0,0 +1,274 @@ @@ -353,6 +343,3 @@ index 0000000..f4dc13d +MODULE_DESCRIPTION("Ralink I2c host driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:Ralink-I2C"); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0027-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch b/target/linux/ramips/patches-3.10/0027-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch index 50ab0886bd..4950a701fb 100644 --- a/target/linux/ramips/patches-3.10/0027-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch +++ b/target/linux/ramips/patches-3.10/0027-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch @@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> create mode 100644 drivers/mmc/host/mt6575_sd.h create mode 100644 drivers/mmc/host/sdhci-mt7620.c -diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index 9ab8f8d..ef6bf59 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -260,6 +260,17 @@ config MMC_SDHCI_BCM2835 @@ -35,11 +33,9 @@ index 9ab8f8d..ef6bf59 100644 config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" depends on ARCH_OMAP -diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index cd32280..c800bed 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile -@@ -61,6 +61,7 @@ obj-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci-tegra.o +@@ -62,6 +62,7 @@ obj-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci- obj-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o obj-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o obj-$(CONFIG_MMC_SDHCI_BCM2835) += sdhci-bcm2835.o @@ -47,9 +43,6 @@ index cd32280..c800bed 100644 ifeq ($(CONFIG_CB710_DEBUG),y) CFLAGS-cb710-mmc += -DDEBUG -diff --git a/drivers/mmc/host/mt6575_sd.h b/drivers/mmc/host/mt6575_sd.h -new file mode 100644 -index 0000000..406382c --- /dev/null +++ b/drivers/mmc/host/mt6575_sd.h @@ -0,0 +1,1068 @@ @@ -1121,9 +1114,6 @@ index 0000000..406382c + +#endif + -diff --git a/drivers/mmc/host/sdhci-mt7620.c b/drivers/mmc/host/sdhci-mt7620.c -new file mode 100644 -index 0000000..a3cb5e4 --- /dev/null +++ b/drivers/mmc/host/sdhci-mt7620.c @@ -0,0 +1,2314 @@ @@ -3441,6 +3431,3 @@ index 0000000..a3cb5e4 +MODULE_AUTHOR("Infinity Chen <infinity.chen@mediatek.com>"); + +EXPORT_SYMBOL(msdc_6575_host); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0028-reset-MIPS-ralink-add-core-device-reset-wrapper.patch b/target/linux/ramips/patches-3.10/0028-reset-MIPS-ralink-add-core-device-reset-wrapper.patch index beae34e0d4..2878755f22 100644 --- a/target/linux/ramips/patches-3.10/0028-reset-MIPS-ralink-add-core-device-reset-wrapper.patch +++ b/target/linux/ramips/patches-3.10/0028-reset-MIPS-ralink-add-core-device-reset-wrapper.patch @@ -12,8 +12,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/ralink/reset.c | 1 + 3 files changed, 61 insertions(+) -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 5737c4b..8258e8e 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -444,6 +444,7 @@ config RALINK @@ -24,8 +22,6 @@ index 5737c4b..8258e8e 100644 config SGI_IP22 bool "SGI IP22 (Indy/Indigo2)" -diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c -index 8efb02b..2faf478 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -14,16 +14,22 @@ @@ -118,8 +114,6 @@ index 8efb02b..2faf478 100644 ralink_pinmux(); return 0; -diff --git a/arch/mips/ralink/reset.c b/arch/mips/ralink/reset.c -index 22120e5..6c15f4f 100644 --- a/arch/mips/ralink/reset.c +++ b/arch/mips/ralink/reset.c @@ -10,6 +10,7 @@ @@ -130,6 +124,3 @@ index 22120e5..6c15f4f 100644 #include <asm/reboot.h> --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0029-owrt-GPIO-add-gpio_export_with_name.patch b/target/linux/ramips/patches-3.10/0029-owrt-GPIO-add-gpio_export_with_name.patch index 8789812cf1..6ba536a893 100644 --- a/target/linux/ramips/patches-3.10/0029-owrt-GPIO-add-gpio_export_with_name.patch +++ b/target/linux/ramips/patches-3.10/0029-owrt-GPIO-add-gpio_export_with_name.patch @@ -14,8 +14,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> include/linux/gpio.h | 26 ++++++++- 5 files changed, 172 insertions(+), 12 deletions(-) -diff --git a/Documentation/devicetree/bindings/gpio/gpio.txt b/Documentation/devicetree/bindings/gpio/gpio.txt -index d933af3..c264748 100644 --- a/Documentation/devicetree/bindings/gpio/gpio.txt +++ b/Documentation/devicetree/bindings/gpio/gpio.txt @@ -112,3 +112,63 @@ where, @@ -82,8 +80,6 @@ index d933af3..c264748 100644 + gpio-export,output = <1>; + }; +}; -diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c -index 665f953..15ec5e5 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -21,6 +21,8 @@ @@ -95,7 +91,7 @@ index 665f953..15ec5e5 100644 /* Private data structure for of_gpiochip_find_and_xlate */ struct gg_data { -@@ -242,3 +244,69 @@ void of_gpiochip_remove(struct gpio_chip *chip) +@@ -242,3 +244,69 @@ void of_gpiochip_remove(struct gpio_chip if (chip->of_node) of_node_put(chip->of_node); } @@ -165,11 +161,9 @@ index 665f953..15ec5e5 100644 + return platform_driver_probe(&gpio_export_driver, of_gpio_export_probe); +} +device_initcall(of_gpio_export_init); -diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c -index c2534d6..8697c82 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -96,7 +96,7 @@ static int gpiod_get_value(const struct gpio_desc *desc); +@@ -96,7 +96,7 @@ static int gpiod_get_value(const struct static void gpiod_set_value(struct gpio_desc *desc, int value); static int gpiod_cansleep(const struct gpio_desc *desc); static int gpiod_to_irq(const struct gpio_desc *desc); @@ -178,7 +172,7 @@ index c2534d6..8697c82 100644 static int gpiod_export_link(struct device *dev, const char *name, struct gpio_desc *desc); static int gpiod_sysfs_set_active_low(struct gpio_desc *desc, int value); -@@ -674,7 +674,7 @@ static ssize_t export_store(struct class *class, +@@ -674,7 +674,7 @@ static ssize_t export_store(struct class status = -ENODEV; goto done; } @@ -208,7 +202,7 @@ index c2534d6..8697c82 100644 { unsigned long flags; int status; -@@ -783,6 +784,8 @@ static int gpiod_export(struct gpio_desc *desc, bool direction_may_change) +@@ -783,6 +784,8 @@ static int gpiod_export(struct gpio_desc goto fail_unlock; } @@ -232,7 +226,7 @@ index c2534d6..8697c82 100644 static int match_export(struct device *dev, const void *data) { -@@ -1092,7 +1095,7 @@ static inline void gpiochip_unexport(struct gpio_chip *chip) +@@ -1092,7 +1095,7 @@ static inline void gpiochip_unexport(str } static inline int gpiod_export(struct gpio_desc *desc, @@ -241,7 +235,7 @@ index c2534d6..8697c82 100644 { return -ENOSYS; } -@@ -1521,6 +1524,9 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label) +@@ -1521,6 +1524,9 @@ int gpio_request_one(unsigned gpio, unsi if (flags & GPIOF_OPEN_SOURCE) set_bit(FLAG_OPEN_SOURCE, &desc->flags); @@ -251,7 +245,7 @@ index c2534d6..8697c82 100644 if (flags & GPIOF_DIR_IN) err = gpiod_direction_input(desc); else -@@ -1531,7 +1537,7 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label) +@@ -1531,7 +1537,7 @@ int gpio_request_one(unsigned gpio, unsi goto free_gpio; if (flags & GPIOF_EXPORT) { @@ -260,11 +254,9 @@ index c2534d6..8697c82 100644 if (err) goto free_gpio; } -diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h -index bde6469..3290572 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h -@@ -202,7 +202,8 @@ extern void gpio_free_array(const struct gpio *array, size_t num); +@@ -202,7 +202,8 @@ extern void gpio_free_array(const struct * A sysfs interface can be exported by individual drivers if they want, * but more typically is configured entirely from userspace. */ @@ -284,8 +276,6 @@ index bde6469..3290572 100644 { return -ENOSYS; } -diff --git a/include/linux/gpio.h b/include/linux/gpio.h -index 552e3f4..07bbbcc7 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h @@ -27,6 +27,9 @@ @@ -298,7 +288,7 @@ index 552e3f4..07bbbcc7 100644 /** * struct gpio - a structure describing a GPIO with configuration * @gpio: the GPIO number -@@ -169,7 +172,8 @@ static inline void gpio_set_value_cansleep(unsigned gpio, int value) +@@ -169,7 +172,8 @@ static inline void gpio_set_value_cansle WARN_ON(1); } @@ -308,7 +298,7 @@ index 552e3f4..07bbbcc7 100644 { /* GPIO can never have been requested or set as {in,out}put */ WARN_ON(1); -@@ -236,4 +240,24 @@ int devm_gpio_request_one(struct device *dev, unsigned gpio, +@@ -236,4 +240,24 @@ int devm_gpio_request_one(struct device unsigned long flags, const char *label); void devm_gpio_free(struct device *dev, unsigned int gpio); @@ -333,6 +323,3 @@ index 552e3f4..07bbbcc7 100644 +} + #endif /* __LINUX_GPIO_H */ --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0030-owrt-MIPS-ralink-add-pseudo-pwm-led-trigger-based-on.patch b/target/linux/ramips/patches-3.10/0030-owrt-MIPS-ralink-add-pseudo-pwm-led-trigger-based-on.patch index 687487005b..4f9bb78b06 100644 --- a/target/linux/ramips/patches-3.10/0030-owrt-MIPS-ralink-add-pseudo-pwm-led-trigger-based-on.patch +++ b/target/linux/ramips/patches-3.10/0030-owrt-MIPS-ralink-add-pseudo-pwm-led-trigger-based-on.patch @@ -9,8 +9,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/ralink/timer.c | 213 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 197 insertions(+), 16 deletions(-) -diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c -index 0a6856c..b156419 100644 --- a/arch/mips/ralink/timer.c +++ b/arch/mips/ralink/timer.c @@ -12,6 +12,8 @@ @@ -63,7 +61,7 @@ index 0a6856c..b156419 100644 }; static inline void rt_timer_w32(struct rt_timer *rt, u8 reg, u32 val) -@@ -48,18 +68,46 @@ static inline u32 rt_timer_r32(struct rt_timer *rt, u8 reg) +@@ -48,18 +68,46 @@ static inline u32 rt_timer_r32(struct rt static irqreturn_t rt_timer_irq(int irq, void *_rt) { struct rt_timer *rt = (struct rt_timer *) _rt; @@ -114,7 +112,7 @@ index 0a6856c..b156419 100644 if (err) { dev_err(rt->dev, "failed to request irq\n"); } else { -@@ -81,8 +129,6 @@ static int rt_timer_config(struct rt_timer *rt, unsigned long divisor) +@@ -81,8 +129,6 @@ static int rt_timer_config(struct rt_tim else rt->timer_div = divisor; @@ -123,7 +121,7 @@ index 0a6856c..b156419 100644 return 0; } -@@ -108,11 +154,128 @@ static void rt_timer_disable(struct rt_timer *rt) +@@ -108,11 +154,128 @@ static void rt_timer_disable(struct rt_t rt_timer_w32(rt, TIMER_REG_TMR0CTL, t); } @@ -252,7 +250,7 @@ index 0a6856c..b156419 100644 if (!res) { dev_err(&pdev->dev, "no memory resource found\n"); -@@ -147,12 +310,29 @@ static int rt_timer_probe(struct platform_device *pdev) +@@ -147,12 +310,29 @@ static int rt_timer_probe(struct platfor if (!rt->timer_freq) return -EINVAL; @@ -285,7 +283,7 @@ index 0a6856c..b156419 100644 dev_info(&pdev->dev, "maximum frequncy is %luHz\n", rt->timer_freq); -@@ -163,6 +343,7 @@ static int rt_timer_remove(struct platform_device *pdev) +@@ -163,6 +343,7 @@ static int rt_timer_remove(struct platfo { struct rt_timer *rt = platform_get_drvdata(pdev); @@ -293,7 +291,7 @@ index 0a6856c..b156419 100644 rt_timer_disable(rt); rt_timer_free(rt); -@@ -187,6 +368,6 @@ static struct platform_driver rt_timer_driver = { +@@ -187,6 +368,6 @@ static struct platform_driver rt_timer_d module_platform_driver(rt_timer_driver); @@ -301,6 +299,3 @@ index 0a6856c..b156419 100644 +MODULE_DESCRIPTION("Ralink RT2880 timer / pseudo pwm"); MODULE_AUTHOR("John Crispin <blogic@openwrt.org"); MODULE_LICENSE("GPL"); --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0031-owrt-MIPS-add-OWRTDTB-secion.patch b/target/linux/ramips/patches-3.10/0031-owrt-MIPS-add-OWRTDTB-secion.patch index 77606cf385..578e614aac 100644 --- a/target/linux/ramips/patches-3.10/0031-owrt-MIPS-add-OWRTDTB-secion.patch +++ b/target/linux/ramips/patches-3.10/0031-owrt-MIPS-add-OWRTDTB-secion.patch @@ -10,13 +10,11 @@ Signed-off-by: John Crispin <blogic@openwrt.org> arch/mips/ralink/of.c | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) -diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S -index c61cdae..b4e55bb 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S -@@ -140,6 +140,9 @@ FEXPORT(__kernel_entry) - j kernel_entry - #endif +@@ -146,6 +146,9 @@ EXPORT(__image_cmdline) + .fill 0x400 + #endif /* CONFIG_IMAGE_CMDLINE_HACK */ + .ascii "OWRTDTB:" + EXPORT(__image_dtb) @@ -24,18 +22,14 @@ index c61cdae..b4e55bb 100644 __REF NESTED(kernel_entry, 16, sp) # kernel entry point -diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile -index 03af636..9b32626 100644 --- a/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile -@@ -19,4 +19,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +@@ -19,4 +19,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin obj-$(CONFIG_DEBUG_FS) += bootrom.o -obj-y += dts/ +#obj-y += dts/ -diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c -index 2faf478..d87222f 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -83,6 +83,8 @@ void __init device_tree_init(void) @@ -56,6 +50,3 @@ index 2faf478..d87222f 100644 if (soc_info.mem_size) add_memory_region(soc_info.mem_base, soc_info.mem_size * SZ_1M, --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0032-mtd-fix-cfi-cmdset-0002-erase-status-check.patch b/target/linux/ramips/patches-3.10/0032-mtd-fix-cfi-cmdset-0002-erase-status-check.patch index e3797eb60f..709d1d8271 100644 --- a/target/linux/ramips/patches-3.10/0032-mtd-fix-cfi-cmdset-0002-erase-status-check.patch +++ b/target/linux/ramips/patches-3.10/0032-mtd-fix-cfi-cmdset-0002-erase-status-check.patch @@ -7,11 +7,9 @@ Subject: [PATCH 32/33] mtd: fix cfi cmdset 0002 erase status check drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c -index fff665d..ab8eb03 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1956,7 +1956,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip) +@@ -1957,7 +1957,7 @@ static int __xipram do_erase_chip(struct chip->erase_suspended = 0; } @@ -20,7 +18,7 @@ index fff665d..ab8eb03 100644 break; if (time_after(jiffies, timeo)) { -@@ -2045,7 +2045,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, +@@ -2046,7 +2046,7 @@ static int __xipram do_erase_oneblock(st chip->erase_suspended = 0; } @@ -29,6 +27,3 @@ index fff665d..ab8eb03 100644 xip_enable(map, chip, adr); break; } --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0033-mtd-cfi-cmdset-0002-force-word-write.patch b/target/linux/ramips/patches-3.10/0033-mtd-cfi-cmdset-0002-force-word-write.patch index 62fc1cdd35..73edcb470e 100644 --- a/target/linux/ramips/patches-3.10/0033-mtd-cfi-cmdset-0002-force-word-write.patch +++ b/target/linux/ramips/patches-3.10/0033-mtd-cfi-cmdset-0002-force-word-write.patch @@ -7,8 +7,6 @@ Subject: [PATCH 33/33] mtd: cfi cmdset 0002 force word write drivers/mtd/chips/cfi_cmdset_0002.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c -index ab8eb03..d84668d 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -41,7 +41,7 @@ @@ -30,7 +28,7 @@ index ab8eb03..d84668d 100644 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 *); -@@ -192,6 +194,7 @@ static void fixup_amd_bootblock(struct mtd_info *mtd) +@@ -192,6 +194,7 @@ static void fixup_amd_bootblock(struct m } #endif @@ -38,7 +36,7 @@ index ab8eb03..d84668d 100644 static void fixup_use_write_buffers(struct mtd_info *mtd) { struct map_info *map = mtd->priv; -@@ -201,6 +204,7 @@ static void fixup_use_write_buffers(struct mtd_info *mtd) +@@ -201,6 +204,7 @@ static void fixup_use_write_buffers(stru mtd->_write = cfi_amdstd_write_buffers; } } @@ -46,7 +44,7 @@ index ab8eb03..d84668d 100644 /* Atmel chips don't use the same PRI format as AMD chips */ static void fixup_convert_atmel_pri(struct mtd_info *mtd) -@@ -1461,6 +1465,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len, +@@ -1461,6 +1465,7 @@ static int cfi_amdstd_write_words(struct /* * FIXME: interleaved mode not tested, and probably not supported! */ @@ -54,7 +52,7 @@ index ab8eb03..d84668d 100644 static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, unsigned long adr, const u_char *buf, int len) -@@ -1584,7 +1589,6 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, +@@ -1585,7 +1590,6 @@ static int __xipram do_write_buffer(stru return ret; } @@ -62,7 +60,7 @@ index ab8eb03..d84668d 100644 static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -1659,6 +1663,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, +@@ -1660,6 +1664,7 @@ static int cfi_amdstd_write_buffers(stru return 0; } @@ -70,6 +68,3 @@ index ab8eb03..d84668d 100644 /* * Wait for the flash chip to become ready to write data --- -1.7.10.4 - diff --git a/target/linux/ramips/patches-3.10/0034-mtd-split-remove-padding.patch b/target/linux/ramips/patches-3.10/0034-mtd-split-remove-padding.patch index b08fb1dad1..f7da13a6d8 100644 --- a/target/linux/ramips/patches-3.10/0034-mtd-split-remove-padding.patch +++ b/target/linux/ramips/patches-3.10/0034-mtd-split-remove-padding.patch @@ -1,8 +1,6 @@ -Index: linux-3.10.1/drivers/mtd/mtdpart.c -=================================================================== ---- linux-3.10.1.orig/drivers/mtd/mtdpart.c 2013-07-15 11:39:25.376669514 +0200 -+++ linux-3.10.1/drivers/mtd/mtdpart.c 2013-07-15 11:49:53.040684471 +0200 -@@ -807,10 +807,6 @@ +--- a/drivers/mtd/mtdpart.c ++++ b/drivers/mtd/mtdpart.c +@@ -807,10 +807,6 @@ static void split_uimage(struct mtd_info return; len = be32_to_cpu(hdr.size) + 0x40; diff --git a/target/linux/ramips/patches-3.10/0035-USB-dwc2.patch b/target/linux/ramips/patches-3.10/0035-USB-dwc2.patch index 0b494d5fc0..90e8ee5e6b 100644 --- a/target/linux/ramips/patches-3.10/0035-USB-dwc2.patch +++ b/target/linux/ramips/patches-3.10/0035-USB-dwc2.patch @@ -1,7 +1,5 @@ -Index: linux-3.10.1/drivers/staging/dwc2/hcd.c -=================================================================== ---- linux-3.10.1.orig/drivers/staging/dwc2/hcd.c 2013-07-13 20:42:41.000000000 +0200 -+++ linux-3.10.1/drivers/staging/dwc2/hcd.c 2013-07-15 18:23:20.193246998 +0200 +--- a/drivers/staging/dwc2/hcd.c ++++ b/drivers/staging/dwc2/hcd.c @@ -47,6 +47,7 @@ #include <linux/io.h> #include <linux/slab.h> @@ -10,7 +8,7 @@ Index: linux-3.10.1/drivers/staging/dwc2/hcd.c #include <linux/usb/hcd.h> #include <linux/usb/ch11.h> -@@ -2712,6 +2713,8 @@ +@@ -2712,6 +2713,8 @@ int dwc2_hcd_init(struct dwc2_hsotg *hso dev_dbg(hsotg->dev, "DWC OTG HCD INIT\n"); |