KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: fix fypo in ethernet driver rt288x, rt3883

Browse source 
Signed-off-by: Serge Vasilugin <vasilugin@yandex.ru>

SVN-Revision: 36565
This commit is contained in:
John Crispin 2013-05-06 16:45:43 +00:00
parent eddd7f5773
commit 849ff98669
1 changed files with 44 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
target/linux/ramips/patches-3.8/0136-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
View file

@ -26,8 +26,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
create mode 100644 drivers/net/ethernet/ramips/ramips_eth.h create mode 100644 drivers/net/ethernet/ramips/ramips_eth.h
create mode 100644 drivers/net/ethernet/ramips/ramips_main.c create mode 100644 drivers/net/ethernet/ramips/ramips_main.c
--- /dev/null Index: linux-3.8.11/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
+++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8.11/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h 2013-05-06 12:43:38.148652601 +0200
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
+/* +/*
+ * Ralink RT305x SoC platform device registration + * Ralink RT305x SoC platform device registration
@ -56,9 +58,11 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+}; +};
+ +
+#endif /* _RT305X_ESW_PLATFORM_H */ +#endif /* _RT305X_ESW_PLATFORM_H */
--- a/arch/mips/ralink/rt305x.c Index: linux-3.8.11/arch/mips/ralink/rt305x.c
+++ b/arch/mips/ralink/rt305x.c ===================================================================
@@ -221,6 +221,7 @@ void __init ralink_clk_init(void) --- linux-3.8.11.orig/arch/mips/ralink/rt305x.c 2013-05-06 12:43:38.016652594 +0200
+++ linux-3.8.11/arch/mips/ralink/rt305x.c 2013-05-06 12:43:38.148652601 +0200
@@ -221,6 +221,7 @@
} }
ralink_clk_add("cpu", cpu_rate); ralink_clk_add("cpu", cpu_rate);
@ -66,9 +70,11 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
ralink_clk_add("10000b00.spi", sys_rate); ralink_clk_add("10000b00.spi", sys_rate);
ralink_clk_add("10000100.timer", wdt_rate); ralink_clk_add("10000100.timer", wdt_rate);
ralink_clk_add("10000120.watchdog", wdt_rate); ralink_clk_add("10000120.watchdog", wdt_rate);
--- a/drivers/net/ethernet/Kconfig Index: linux-3.8.11/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig ===================================================================
@@ -136,6 +136,7 @@ source "drivers/net/ethernet/packetengin --- linux-3.8.11.orig/drivers/net/ethernet/Kconfig 2013-05-01 18:56:10.000000000 +0200
+++ linux-3.8.11/drivers/net/ethernet/Kconfig 2013-05-06 12:43:38.148652601 +0200
@@ -136,6 +136,7 @@
source "drivers/net/ethernet/pasemi/Kconfig" source "drivers/net/ethernet/pasemi/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig" source "drivers/net/ethernet/racal/Kconfig"
@ -76,9 +82,11 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
source "drivers/net/ethernet/realtek/Kconfig" source "drivers/net/ethernet/realtek/Kconfig"
source "drivers/net/ethernet/renesas/Kconfig" source "drivers/net/ethernet/renesas/Kconfig"
source "drivers/net/ethernet/rdc/Kconfig" source "drivers/net/ethernet/rdc/Kconfig"
--- a/drivers/net/ethernet/Makefile Index: linux-3.8.11/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile ===================================================================
@@ -54,6 +54,7 @@ obj-$(CONFIG_NET_PACKET_ENGINE) += packe --- linux-3.8.11.orig/drivers/net/ethernet/Makefile 2013-05-01 18:56:10.000000000 +0200
+++ linux-3.8.11/drivers/net/ethernet/Makefile 2013-05-06 12:43:38.148652601 +0200
@@ -54,6 +54,7 @@
obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/ obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
@ -86,8 +94,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
obj-$(CONFIG_SH_ETH) += renesas/ obj-$(CONFIG_SH_ETH) += renesas/
obj-$(CONFIG_NET_VENDOR_RDC) += rdc/ obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
--- /dev/null Index: linux-3.8.11/drivers/net/ethernet/ramips/Kconfig
+++ b/drivers/net/ethernet/ramips/Kconfig ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8.11/drivers/net/ethernet/ramips/Kconfig 2013-05-06 12:43:38.148652601 +0200
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+config NET_RAMIPS +config NET_RAMIPS
+ tristate "Ralink RT288X/RT3X5X/RT3662/RT3883 ethernet driver" + tristate "Ralink RT288X/RT3X5X/RT3662/RT3883 ethernet driver"
@ -107,8 +117,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ depends on DEBUG_FS + depends on DEBUG_FS
+ +
+endif +endif
--- /dev/null Index: linux-3.8.11/drivers/net/ethernet/ramips/Makefile
+++ b/drivers/net/ethernet/ramips/Makefile ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8.11/drivers/net/ethernet/ramips/Makefile 2013-05-06 12:43:38.148652601 +0200
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
+# +#
+# Makefile for the Ramips SoCs built-in ethernet macs +# Makefile for the Ramips SoCs built-in ethernet macs
@ -119,8 +131,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ramips-$(CONFIG_NET_RAMIPS_DEBUG_FS) += ramips_debugfs.o +ramips-$(CONFIG_NET_RAMIPS_DEBUG_FS) += ramips_debugfs.o
+ +
+obj-$(CONFIG_NET_RAMIPS) += ramips.o +obj-$(CONFIG_NET_RAMIPS) += ramips.o
--- /dev/null Index: linux-3.8.11/drivers/net/ethernet/ramips/ramips_debugfs.c
+++ b/drivers/net/ethernet/ramips/ramips_debugfs.c ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8.11/drivers/net/ethernet/ramips/ramips_debugfs.c 2013-05-06 12:43:38.148652601 +0200
@@ -0,0 +1,127 @@ @@ -0,0 +1,127 @@
+/* +/*
+ * Ralink SoC ethernet driver debugfs code + * Ralink SoC ethernet driver debugfs code
@ -249,8 +263,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ debugfs_remove(raeth_debugfs_root); + debugfs_remove(raeth_debugfs_root);
+ raeth_debugfs_root = NULL; + raeth_debugfs_root = NULL;
+} +}
--- /dev/null Index: linux-3.8.11/drivers/net/ethernet/ramips/ramips_esw.c
+++ b/drivers/net/ethernet/ramips/ramips_esw.c ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8.11/drivers/net/ethernet/ramips/ramips_esw.c 2013-05-06 12:43:38.148652601 +0200
@@ -0,0 +1,1221 @@ @@ -0,0 +1,1221 @@
+#include <linux/ioport.h> +#include <linux/ioport.h>
+#include <linux/switch.h> +#include <linux/switch.h>
@ -1473,8 +1489,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+{ +{
+ platform_driver_unregister(&rt305x_esw_driver); + platform_driver_unregister(&rt305x_esw_driver);
+} +}
--- /dev/null Index: linux-3.8.11/drivers/net/ethernet/ramips/ramips_eth.h
+++ b/drivers/net/ethernet/ramips/ramips_eth.h ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8.11/drivers/net/ethernet/ramips/ramips_eth.h 2013-05-06 12:43:38.152652600 +0200
@@ -0,0 +1,375 @@ @@ -0,0 +1,375 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -1851,8 +1869,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+#endif /* CONFIG_NET_RAMIPS_DEBUG_FS */ +#endif /* CONFIG_NET_RAMIPS_DEBUG_FS */
+ +
+#endif /* RAMIPS_ETH_H */ +#endif /* RAMIPS_ETH_H */
--- /dev/null Index: linux-3.8.11/drivers/net/ethernet/ramips/ramips_main.c
+++ b/drivers/net/ethernet/ramips/ramips_main.c ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.8.11/drivers/net/ethernet/ramips/ramips_main.c 2013-05-06 13:55:12.572838852 +0200
@@ -0,0 +1,1281 @@ @@ -0,0 +1,1281 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify
@ -2148,7 +2168,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ } + }
+ +
+ mdio_cfg = RAMIPS_MDIO_CFG_TX_CLK_SKEW_200 | + mdio_cfg = RAMIPS_MDIO_CFG_TX_CLK_SKEW_200 |
+ RAMIPS_MDIO_CFG_TX_CLK_SKEW_200 | + RAMIPS_MDIO_CFG_RX_CLK_SKEW_200 |
+ RAMIPS_MDIO_CFG_GP1_FRC_EN; + RAMIPS_MDIO_CFG_GP1_FRC_EN;
+ +
+ if (re->duplex == DUPLEX_FULL) + if (re->duplex == DUPLEX_FULL)