kernel: update 3.10 to 3.10.17

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38506

3 files changed, 87 insertions, 161 deletions

diff --git a/target/linux/ramips/patches-3.10/0011-MIPS-ralink-add-support-for-systick-timer-found-on-n.patch b/target/linux/ramips/patches-3.10/0011-MIPS-ralink-add-support-for-systick-timer-found-on-n.patch
index a69739bb06..5626ada551 100644
--- a/target/linux/ramips/patches-3.10/0011-MIPS-ralink-add-support-for-systick-timer-found-on-n.patch
+++ b/target/linux/ramips/patches-3.10/0011-MIPS-ralink-add-support-for-systick-timer-found-on-n.patch
@@ -16,10 +16,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  3 files changed, 154 insertions(+)
  create mode 100644 arch/mips/ralink/cevt-rt3352.c
 
-Index: linux-3.10.13/arch/mips/ralink/Kconfig
-===================================================================
---- linux-3.10.13.orig/arch/mips/ralink/Kconfig	2013-09-27 02:18:49.000000000 +0200
-+++ linux-3.10.13/arch/mips/ralink/Kconfig	2013-10-02 21:40:41.252368892 +0200
+--- a/arch/mips/ralink/Kconfig
++++ b/arch/mips/ralink/Kconfig
 @@ -1,5 +1,12 @@
  if RALINK
  
@@ -33,10 +31,8 @@ Index: linux-3.10.13/arch/mips/ralink/Kconfig
  choice
  	prompt "Ralink SoC selection"
  	default SOC_RT305X
-Index: linux-3.10.13/arch/mips/ralink/Makefile
-===================================================================
---- linux-3.10.13.orig/arch/mips/ralink/Makefile	2013-10-02 20:46:43.856230578 +0200
-+++ linux-3.10.13/arch/mips/ralink/Makefile	2013-10-02 21:13:11.584298451 +0200
+--- a/arch/mips/ralink/Makefile
++++ b/arch/mips/ralink/Makefile
 @@ -8,6 +8,8 @@
  
  obj-y := prom.o of.o reset.o clk.o irq.o timer.o
@@ -46,10 +42,8 @@ Index: linux-3.10.13/arch/mips/ralink/Makefile
  obj-$(CONFIG_SOC_RT288X) += rt288x.o
  obj-$(CONFIG_SOC_RT305X) += rt305x.o
  obj-$(CONFIG_SOC_RT3883) += rt3883.o
-Index: linux-3.10.13/arch/mips/ralink/cevt-rt3352.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/arch/mips/ralink/cevt-rt3352.c	2013-10-02 21:13:19.396298787 +0200
+--- /dev/null
++++ b/arch/mips/ralink/cevt-rt3352.c
 @@ -0,0 +1,145 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
diff --git a/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch b/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
index 962dbd3d17..055a776ab7 100644
--- a/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
+++ b/target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
@@ -46,10 +46,8 @@ 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
 
-Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
 @@ -0,0 +1,27 @@
 +/*
 + *  Ralink RT305x SoC platform device registration
@@ -78,11 +76,9 @@ Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
 +};
 +
 +#endif /* _RT305X_ESW_PLATFORM_H */
-Index: linux-3.10.13/arch/mips/ralink/rt305x.c
-===================================================================
---- linux-3.10.13.orig/arch/mips/ralink/rt305x.c	2013-09-27 02:18:49.000000000 +0200
-+++ linux-3.10.13/arch/mips/ralink/rt305x.c	2013-10-08 22:40:10.480133783 +0200
-@@ -221,6 +221,7 @@
+--- a/arch/mips/ralink/rt305x.c
++++ b/arch/mips/ralink/rt305x.c
+@@ -221,6 +221,7 @@ void __init ralink_clk_init(void)
  	}
  
  	ralink_clk_add("cpu", cpu_rate);
@@ -90,11 +86,9 @@ Index: linux-3.10.13/arch/mips/ralink/rt305x.c
  	ralink_clk_add("10000b00.spi", sys_rate);
  	ralink_clk_add("10000100.timer", wdt_rate);
  	ralink_clk_add("10000120.watchdog", wdt_rate);
-Index: linux-3.10.13/drivers/net/ethernet/Kconfig
-===================================================================
---- linux-3.10.13.orig/drivers/net/ethernet/Kconfig	2013-09-27 02:18:49.000000000 +0200
-+++ linux-3.10.13/drivers/net/ethernet/Kconfig	2013-10-08 18:51:20.136389536 +0200
-@@ -135,6 +135,7 @@
+--- a/drivers/net/ethernet/Kconfig
++++ b/drivers/net/ethernet/Kconfig
+@@ -135,6 +135,7 @@ config ETHOC
  source "drivers/net/ethernet/packetengines/Kconfig"
  source "drivers/net/ethernet/pasemi/Kconfig"
  source "drivers/net/ethernet/qlogic/Kconfig"
@@ -102,11 +96,9 @@ Index: linux-3.10.13/drivers/net/ethernet/Kconfig
  source "drivers/net/ethernet/realtek/Kconfig"
  source "drivers/net/ethernet/renesas/Kconfig"
  source "drivers/net/ethernet/rdc/Kconfig"
-Index: linux-3.10.13/drivers/net/ethernet/Makefile
-===================================================================
---- linux-3.10.13.orig/drivers/net/ethernet/Makefile	2013-09-27 02:18:49.000000000 +0200
-+++ linux-3.10.13/drivers/net/ethernet/Makefile	2013-10-08 18:51:20.136389536 +0200
-@@ -53,6 +53,7 @@
+--- a/drivers/net/ethernet/Makefile
++++ b/drivers/net/ethernet/Makefile
+@@ -53,6 +53,7 @@ obj-$(CONFIG_ETHOC) += ethoc.o
  obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
  obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
  obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
@@ -114,10 +106,8 @@ Index: linux-3.10.13/drivers/net/ethernet/Makefile
  obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
  obj-$(CONFIG_SH_ETH) += renesas/
  obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
-Index: linux-3.10.13/drivers/net/ethernet/ralink/Kconfig
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/Kconfig	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/Kconfig
 @@ -0,0 +1,31 @@
 +config NET_RALINK
 +	tristate "Ralink RT288X/RT3X5X/RT3662/RT3883/MT7620 ethernet driver"
@@ -150,10 +140,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/Kconfig
 +	select PHYLIB
 +	select SWCONFIG
 +endif
-Index: linux-3.10.13/drivers/net/ethernet/ralink/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/Makefile	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/Makefile
 @@ -0,0 +1,18 @@
 +#
 +# Makefile for the Ralink SoCs built-in ethernet macs
@@ -173,10 +161,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/Makefile
 +ralink-eth-$(CONFIG_SOC_MT7620)			+= soc_mt7620.o
 +
 +obj-$(CONFIG_NET_RALINK)			+= ralink-eth.o
-Index: linux-3.10.13/drivers/net/ethernet/ralink/esw_rt3052.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/esw_rt3052.c	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/esw_rt3052.c
 @@ -0,0 +1,1463 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -1641,10 +1627,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/esw_rt3052.c
 +{
 +	platform_driver_unregister(&esw_driver);
 +}
-Index: linux-3.10.13/drivers/net/ethernet/ralink/esw_rt3052.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/esw_rt3052.h	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/esw_rt3052.h
 @@ -0,0 +1,32 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -1678,10 +1662,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/esw_rt3052.h
 +
 +#endif
 +#endif
-Index: linux-3.10.13/drivers/net/ethernet/ralink/gsw_mt7620a.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/gsw_mt7620a.c	2013-10-08 22:38:18.884129024 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/gsw_mt7620a.c
 @@ -0,0 +1,566 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2249,10 +2231,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/gsw_mt7620a.c
 +
 +	return 0;
 +}
-Index: linux-3.10.13/drivers/net/ethernet/ralink/gsw_mt7620a.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/gsw_mt7620a.h	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/gsw_mt7620a.h
 @@ -0,0 +1,30 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2284,10 +2264,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/gsw_mt7620a.h
 +extern int mt7620a_has_carrier(struct fe_priv *priv);
 +
 +#endif
-Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/mdio.c	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/mdio.c
 @@ -0,0 +1,244 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2533,10 +2511,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio.c
 +	of_node_put(priv->mii_bus->dev.of_node);
 +	kfree(priv->mii_bus);
 +}
-Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/mdio.h	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/mdio.h
 @@ -0,0 +1,29 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2567,10 +2543,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio.h
 +static inline void fe_mdio_cleanup(struct fe_priv *priv) {}
 +#endif
 +#endif
-Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio_rt2880.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/mdio_rt2880.c	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/mdio_rt2880.c
 @@ -0,0 +1,232 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2804,10 +2778,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio_rt2880.c
 +
 +	return;
 +}
-Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio_rt2880.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/mdio_rt2880.h	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/mdio_rt2880.h
 @@ -0,0 +1,26 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2835,10 +2807,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/mdio_rt2880.h
 +void rt2880_port_init(struct fe_priv *priv, struct device_node *np);
 +
 +#endif
-Index: linux-3.10.13/drivers/net/ethernet/ralink/ralink_soc_eth.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/ralink_soc_eth.c	2013-10-08 20:19:33.904615836 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c
 @@ -0,0 +1,741 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -3581,10 +3551,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/ralink_soc_eth.c
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
 +MODULE_DESCRIPTION("Ethernet driver for Ralink SoC");
-Index: linux-3.10.13/drivers/net/ethernet/ralink/ralink_soc_eth.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/ralink_soc_eth.h	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/ralink_soc_eth.h
 @@ -0,0 +1,375 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -3961,10 +3929,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/ralink_soc_eth.h
 +u32 fe_r32(unsigned reg);
 +
 +#endif /* FE_ETH_H */
-Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_mt7620.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/soc_mt7620.c	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/soc_mt7620.c
 @@ -0,0 +1,112 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -4078,10 +4044,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_mt7620.c
 +};
 +
 +MODULE_DEVICE_TABLE(of, of_fe_match);
-Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_rt2880.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/soc_rt2880.c	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/soc_rt2880.c
 @@ -0,0 +1,51 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -4134,10 +4098,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_rt2880.c
 +};
 +
 +MODULE_DEVICE_TABLE(of, of_fe_match);
-Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_rt305x.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/soc_rt305x.c	2013-10-08 18:51:20.136389536 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/soc_rt305x.c
 @@ -0,0 +1,113 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -4252,10 +4214,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_rt305x.c
 +};
 +
 +MODULE_DEVICE_TABLE(of, of_fe_match);
-Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_rt3883.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/soc_rt3883.c	2013-10-08 18:51:20.140389534 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/soc_rt3883.c
 @@ -0,0 +1,60 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -4317,10 +4277,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/soc_rt3883.c
 +
 +MODULE_DEVICE_TABLE(of, of_fe_match);
 +
-Index: linux-3.10.13/drivers/net/ethernet/ralink/mt7530.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/mt7530.c	2013-10-08 22:36:55.640125451 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/mt7530.c
 @@ -0,0 +1,467 @@
 +/*
 + * This program is free software; you can redistribute it and/or
@@ -4789,10 +4747,8 @@ Index: linux-3.10.13/drivers/net/ethernet/ralink/mt7530.c
 +
 +	return 0;
 +}
-Index: linux-3.10.13/drivers/net/ethernet/ralink/mt7530.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/net/ethernet/ralink/mt7530.h	2013-10-08 18:51:20.140389534 +0200
+--- /dev/null
++++ b/drivers/net/ethernet/ralink/mt7530.h
 @@ -0,0 +1,20 @@
 +/*
 + * This program is free software; you can redistribute it and/or
diff --git a/target/linux/ramips/patches-3.10/0122-pinmux.patch b/target/linux/ramips/patches-3.10/0122-pinmux.patch
index 6923355306..84f713bd5b 100644
--- a/target/linux/ramips/patches-3.10/0122-pinmux.patch
+++ b/target/linux/ramips/patches-3.10/0122-pinmux.patch
@@ -14,11 +14,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  6 files changed, 385 insertions(+), 19 deletions(-)
  create mode 100644 drivers/pinctrl/pinctrl-rt2880.c
 
-Index: linux-3.10.13/arch/mips/Kconfig
-===================================================================
---- linux-3.10.13.orig/arch/mips/Kconfig	2013-10-02 16:59:28.532051276 +0200
-+++ linux-3.10.13/arch/mips/Kconfig	2013-10-02 16:59:29.440051316 +0200
-@@ -446,6 +446,8 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -446,6 +446,8 @@ config RALINK
  	select HAVE_MACH_CLKDEV
  	select CLKDEV_LOOKUP
  	select ARCH_REQUIRE_GPIOLIB
@@ -27,11 +25,9 @@ Index: linux-3.10.13/arch/mips/Kconfig
  
  config SGI_IP22
  	bool "SGI IP22 (Indy/Indigo2)"
-Index: linux-3.10.13/drivers/pinctrl/Kconfig
-===================================================================
---- linux-3.10.13.orig/drivers/pinctrl/Kconfig	2013-09-27 02:18:49.000000000 +0200
-+++ linux-3.10.13/drivers/pinctrl/Kconfig	2013-10-02 16:59:29.440051316 +0200
-@@ -114,6 +114,11 @@
+--- a/drivers/pinctrl/Kconfig
++++ b/drivers/pinctrl/Kconfig
+@@ -114,6 +114,11 @@ config PINCTRL_LANTIQ
  	select PINMUX
  	select PINCONF
  
@@ -43,11 +39,9 @@ Index: linux-3.10.13/drivers/pinctrl/Kconfig
  config PINCTRL_FALCON
  	bool
  	depends on SOC_FALCON
-Index: linux-3.10.13/drivers/pinctrl/Makefile
-===================================================================
---- linux-3.10.13.orig/drivers/pinctrl/Makefile	2013-09-27 02:18:49.000000000 +0200
-+++ linux-3.10.13/drivers/pinctrl/Makefile	2013-10-02 16:59:29.440051316 +0200
-@@ -45,6 +45,7 @@
+--- a/drivers/pinctrl/Makefile
++++ b/drivers/pinctrl/Makefile
+@@ -45,6 +45,7 @@ obj-$(CONFIG_PINCTRL_EXYNOS5440)	+= pinc
  obj-$(CONFIG_PINCTRL_S3C64XX)	+= pinctrl-s3c64xx.o
  obj-$(CONFIG_PINCTRL_XWAY)	+= pinctrl-xway.o
  obj-$(CONFIG_PINCTRL_LANTIQ)	+= pinctrl-lantiq.o
@@ -55,10 +49,8 @@ Index: linux-3.10.13/drivers/pinctrl/Makefile
  
  obj-$(CONFIG_PLAT_ORION)        += mvebu/
  obj-$(CONFIG_ARCH_SHMOBILE)	+= sh-pfc/
-Index: linux-3.10.13/drivers/pinctrl/pinctrl-rt2880.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/drivers/pinctrl/pinctrl-rt2880.c	2013-10-02 18:24:18.556268869 +0200
+--- /dev/null
++++ b/drivers/pinctrl/pinctrl-rt2880.c
 @@ -0,0 +1,456 @@
 +/*
 + *  linux/drivers/pinctrl/pinctrl-rt2880.c
@@ -516,10 +508,8 @@ Index: linux-3.10.13/drivers/pinctrl/pinctrl-rt2880.c
 +}
 +
 +core_initcall_sync(rt2880_pinmux_init);
-Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/pinmux.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/pinmux.h	2013-10-02 16:59:29.444051317 +0200
+--- /dev/null
++++ b/arch/mips/include/asm/mach-ralink/pinmux.h
 @@ -0,0 +1,47 @@
 +/*
 + *  This program is free software; you can redistribute it and/or modify
@@ -568,10 +558,8 @@ Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/pinmux.h
 +extern struct rt2880_pmx_group *rt2880_pinmux_data;
 +
 +#endif
-Index: linux-3.10.13/arch/mips/ralink/mt7620.c
-===================================================================
---- linux-3.10.13.orig/arch/mips/ralink/mt7620.c	2013-10-02 16:59:28.912051293 +0200
-+++ linux-3.10.13/arch/mips/ralink/mt7620.c	2013-10-02 18:23:35.940267055 +0200
+--- a/arch/mips/ralink/mt7620.c
++++ b/arch/mips/ralink/mt7620.c
 @@ -17,6 +17,7 @@
  #include <asm/mipsregs.h>
  #include <asm/mach-ralink/ralink_regs.h>
@@ -580,7 +568,7 @@ Index: linux-3.10.13/arch/mips/ralink/mt7620.c
  
  #include "common.h"
  
-@@ -48,118 +49,40 @@
+@@ -48,118 +49,40 @@ static int dram_type;
  /* the pll dividers */
  static u32 mt7620_clk_divider[] = { 2, 3, 4, 8 };
  
@@ -732,17 +720,15 @@ Index: linux-3.10.13/arch/mips/ralink/mt7620.c
  };
  
  void __init ralink_clk_init(void)
-@@ -281,4 +204,6 @@
+@@ -281,4 +204,6 @@ void prom_soc_init(struct ralink_soc_inf
  		(pmu0 & PMU_SW_SET) ? ("sw") : ("hw"));
  	pr_info("Digital PMU set to %s control\n",
  		(pmu1 & DIG_SW_SEL) ? ("sw") : ("hw"));
 +
 +	rt2880_pinmux_data = mt7620a_pinmux_data;
  }
-Index: linux-3.10.13/arch/mips/ralink/rt305x.c
-===================================================================
---- linux-3.10.13.orig/arch/mips/ralink/rt305x.c	2013-10-02 16:59:29.140051302 +0200
-+++ linux-3.10.13/arch/mips/ralink/rt305x.c	2013-10-02 16:59:29.444051317 +0200
+--- a/arch/mips/ralink/rt305x.c
++++ b/arch/mips/ralink/rt305x.c
 @@ -17,90 +17,71 @@
  #include <asm/mipsregs.h>
  #include <asm/mach-ralink/ralink_regs.h>
@@ -892,7 +878,7 @@ Index: linux-3.10.13/arch/mips/ralink/rt305x.c
  };
  
  static void rt305x_wdt_reset(void)
-@@ -114,14 +95,6 @@
+@@ -114,14 +95,6 @@ static void rt305x_wdt_reset(void)
  	rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);
  }
  
@@ -907,7 +893,7 @@ Index: linux-3.10.13/arch/mips/ralink/rt305x.c
  static unsigned long rt5350_get_mem_size(void)
  {
  	void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
-@@ -291,11 +264,14 @@
+@@ -291,11 +264,14 @@ void prom_soc_init(struct ralink_soc_inf
  	soc_info->mem_base = RT305X_SDRAM_BASE;
  	if (soc_is_rt5350()) {
  		soc_info->mem_size = rt5350_get_mem_size();
@@ -922,11 +908,9 @@ Index: linux-3.10.13/arch/mips/ralink/rt305x.c
 +		rt2880_pinmux_data = rt3352_pinmux_data;
  	}
  }
-Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x.h
-===================================================================
---- linux-3.10.13.orig/arch/mips/include/asm/mach-ralink/rt305x.h	2013-09-27 02:18:49.000000000 +0200
-+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x.h	2013-10-02 16:59:29.444051317 +0200
-@@ -125,24 +125,28 @@
+--- a/arch/mips/include/asm/mach-ralink/rt305x.h
++++ b/arch/mips/include/asm/mach-ralink/rt305x.h
+@@ -125,24 +125,28 @@ static inline int soc_is_rt5350(void)
  #define RT305X_GPIO_GE0_TXD0		40
  #define RT305X_GPIO_GE0_RXCLK		51
  
@@ -970,10 +954,8 @@ Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x.h
  
  #define RT3352_SYSC_REG_SYSCFG0		0x010
  #define RT3352_SYSC_REG_SYSCFG1         0x014
-Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/mt7620.h
-===================================================================
---- linux-3.10.13.orig/arch/mips/include/asm/mach-ralink/mt7620.h	2013-10-02 16:59:28.708051287 +0200
-+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/mt7620.h	2013-10-02 16:59:29.444051317 +0200
+--- a/arch/mips/include/asm/mach-ralink/mt7620.h
++++ b/arch/mips/include/asm/mach-ralink/mt7620.h
 @@ -59,7 +59,6 @@
  #define MT7620_DDR2_SIZE_MIN		32
  #define MT7620_DDR2_SIZE_MAX		256
@@ -1010,10 +992,8 @@ Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/mt7620.h
 +#define MT7620_GPIO_MODE_WDT		22
  
  #endif
-Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt3883.h
-===================================================================
---- linux-3.10.13.orig/arch/mips/include/asm/mach-ralink/rt3883.h	2013-09-27 02:18:49.000000000 +0200
-+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/rt3883.h	2013-10-02 16:59:29.444051317 +0200
+--- a/arch/mips/include/asm/mach-ralink/rt3883.h
++++ b/arch/mips/include/asm/mach-ralink/rt3883.h
 @@ -112,8 +112,6 @@
  #define RT3883_CLKCFG1_PCI_CLK_EN	BIT(19)
  #define RT3883_CLKCFG1_UPHY0_CLK_EN	BIT(18)
@@ -1044,10 +1024,8 @@ Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt3883.h
  #define RT3883_GPIO_MODE_PCI_SHIFT	11
  #define RT3883_GPIO_MODE_PCI_MASK	0x7
  #define RT3883_GPIO_MODE_PCI		(RT3883_GPIO_MODE_PCI_MASK << RT3883_GPIO_MODE_PCI_SHIFT)
-Index: linux-3.10.13/arch/mips/ralink/common.h
-===================================================================
---- linux-3.10.13.orig/arch/mips/ralink/common.h	2013-10-02 16:59:28.532051276 +0200
-+++ linux-3.10.13/arch/mips/ralink/common.h	2013-10-02 16:59:29.444051317 +0200
+--- a/arch/mips/ralink/common.h
++++ b/arch/mips/ralink/common.h
 @@ -11,25 +11,6 @@
  
  #define RAMIPS_SYS_TYPE_LEN	32
@@ -1074,10 +1052,8 @@ Index: linux-3.10.13/arch/mips/ralink/common.h
  struct ralink_soc_info {
  	unsigned char sys_type[RAMIPS_SYS_TYPE_LEN];
  	unsigned char *compatible;
-Index: linux-3.10.13/arch/mips/ralink/rt3883.c
-===================================================================
---- linux-3.10.13.orig/arch/mips/ralink/rt3883.c	2013-09-27 02:18:49.000000000 +0200
-+++ linux-3.10.13/arch/mips/ralink/rt3883.c	2013-10-02 16:59:29.444051317 +0200
+--- a/arch/mips/ralink/rt3883.c
++++ b/arch/mips/ralink/rt3883.c
 @@ -17,132 +17,50 @@
  #include <asm/mipsregs.h>
  #include <asm/mach-ralink/ralink_regs.h>
@@ -1249,7 +1225,7 @@ Index: linux-3.10.13/arch/mips/ralink/rt3883.c
  };
  
  static void rt3883_wdt_reset(void)
-@@ -155,17 +73,6 @@
+@@ -155,17 +73,6 @@ static void rt3883_wdt_reset(void)
  	rt_sysc_w32(t, RT3883_SYSC_REG_SYSCFG1);
  }
  
@@ -1267,7 +1243,7 @@ Index: linux-3.10.13/arch/mips/ralink/rt3883.c
  void __init ralink_clk_init(void)
  {
  	unsigned long cpu_rate, sys_rate;
-@@ -243,4 +150,6 @@
+@@ -243,4 +150,6 @@ void prom_soc_init(struct ralink_soc_inf
  	soc_info->mem_base = RT3883_SDRAM_BASE;
  	soc_info->mem_size_min = RT3883_MEM_SIZE_MIN;
  	soc_info->mem_size_max = RT3883_MEM_SIZE_MAX;