diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-10-23 12:51:05 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-10-23 12:51:05 +0000 |
commit | b6b06000ebe2ffd2ebca24417ea9b9080cb6d643 (patch) | |
tree | 678c75cb4f1655a0e42ccd1f12b2ec0dfebce14f /target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch | |
parent | d8d0e2c5368aeeb5ec2ddf06cfad0c919a3af8f4 (diff) | |
download | upstream-b6b06000ebe2ffd2ebca24417ea9b9080cb6d643.tar.gz upstream-b6b06000ebe2ffd2ebca24417ea9b9080cb6d643.tar.bz2 upstream-b6b06000ebe2ffd2ebca24417ea9b9080cb6d643.zip |
kernel: update 3.10 to 3.10.17
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38506
Diffstat (limited to 'target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch')
-rw-r--r-- | target/linux/ramips/patches-3.10/0111-NET-MIPS-add-ralink-SoC-ethernet-driver.patch | 138 |
1 files changed, 47 insertions, 91 deletions
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 |