diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-20 23:18:55 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 03:21:51 -0400 |
commit | 527a626601de6ff89859de90883cc546892bf3ca (patch) | |
tree | 5e30febb8d509e036cee5702676f386a0d4e4ad3 /drivers/net | |
parent | 1c1538be1da768fe0209a11e1bdf9dd7ab38905a (diff) |
skge/sky2/mv643xx/pxa168: Move the Marvell Ethernet drivers
Move the Marvell Ethernet drivers into drivers/net/ethernet/marvell/
and make the necessary Kconfig and Makefile changes.
CC: Sachin Sanap <ssanap@marvell.com>
CC: Zhangfei Gao <zgao6@marvell.com>
CC: Philip Rakity <prakity@marvell.com>
CC: Mark Brown <markb@marvell.com>
CC: Lennert Buytenhek <buytenh@marvell.com>
CC: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 90 | ||||
-rw-r--r-- | drivers/net/Makefile | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/Kconfig | 110 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/Makefile | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c (renamed from drivers/net/mv643xx_eth.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/pxa168_eth.c (renamed from drivers/net/pxa168_eth.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/skge.c (renamed from drivers/net/skge.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/skge.h (renamed from drivers/net/skge.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/sky2.c (renamed from drivers/net/sky2.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/sky2.h (renamed from drivers/net/sky2.h) | 0 |
12 files changed, 120 insertions, 94 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 87e7a1217851..cb6c6947b320 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -313,16 +313,6 @@ config BFIN_MAC_USE_HWSTAMP | |||
313 | help | 313 | help |
314 | To support the IEEE 1588 Precision Time Protocol (PTP), select y here | 314 | To support the IEEE 1588 Precision Time Protocol (PTP), select y here |
315 | 315 | ||
316 | config PXA168_ETH | ||
317 | tristate "Marvell pxa168 ethernet support" | ||
318 | depends on CPU_PXA168 | ||
319 | select PHYLIB | ||
320 | help | ||
321 | This driver supports the pxa168 Ethernet ports. | ||
322 | |||
323 | To compile this driver as a module, choose M here. The module | ||
324 | will be called pxa168_eth. | ||
325 | |||
326 | config NET_NETX | 316 | config NET_NETX |
327 | tristate "NetX Ethernet support" | 317 | tristate "NetX Ethernet support" |
328 | select MII | 318 | select MII |
@@ -803,73 +793,6 @@ config SIS190 | |||
803 | To compile this driver as a module, choose M here: the module | 793 | To compile this driver as a module, choose M here: the module |
804 | will be called sis190. This is recommended. | 794 | will be called sis190. This is recommended. |
805 | 795 | ||
806 | config SKGE | ||
807 | tristate "Marvell Yukon Gigabit Ethernet support" | ||
808 | depends on PCI | ||
809 | select CRC32 | ||
810 | ---help--- | ||
811 | This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx | ||
812 | and related Gigabit Ethernet adapters. It is a new smaller driver | ||
813 | with better performance and more complete ethtool support. | ||
814 | |||
815 | It does not support the link failover and network management | ||
816 | features that "portable" vendor supplied sk98lin driver does. | ||
817 | |||
818 | This driver supports adapters based on the original Yukon chipset: | ||
819 | Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T, | ||
820 | Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872. | ||
821 | |||
822 | It does not support the newer Yukon2 chipset: a separate driver, | ||
823 | sky2, is provided for these adapters. | ||
824 | |||
825 | To compile this driver as a module, choose M here: the module | ||
826 | will be called skge. This is recommended. | ||
827 | |||
828 | config SKGE_DEBUG | ||
829 | bool "Debugging interface" | ||
830 | depends on SKGE && DEBUG_FS | ||
831 | help | ||
832 | This option adds the ability to dump driver state for debugging. | ||
833 | The file /sys/kernel/debug/skge/ethX displays the state of the internal | ||
834 | transmit and receive rings. | ||
835 | |||
836 | If unsure, say N. | ||
837 | |||
838 | config SKGE_GENESIS | ||
839 | bool "Support for older SysKonnect Genesis boards" | ||
840 | depends on SKGE | ||
841 | help | ||
842 | This enables support for the older and uncommon SysKonnect Genesis | ||
843 | chips, which support MII via an external transceiver, instead of | ||
844 | an internal one. Disabling this option will save some memory | ||
845 | by making code smaller. If unsure say Y. | ||
846 | |||
847 | config SKY2 | ||
848 | tristate "Marvell Yukon 2 support" | ||
849 | depends on PCI | ||
850 | select CRC32 | ||
851 | ---help--- | ||
852 | This driver supports Gigabit Ethernet adapters based on the | ||
853 | Marvell Yukon 2 chipset: | ||
854 | Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/ | ||
855 | 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21 | ||
856 | |||
857 | There is companion driver for the older Marvell Yukon and | ||
858 | SysKonnect Genesis based adapters: skge. | ||
859 | |||
860 | To compile this driver as a module, choose M here: the module | ||
861 | will be called sky2. This is recommended. | ||
862 | |||
863 | config SKY2_DEBUG | ||
864 | bool "Debugging interface" | ||
865 | depends on SKY2 && DEBUG_FS | ||
866 | help | ||
867 | This option adds the ability to dump driver state for debugging. | ||
868 | The file /sys/kernel/debug/sky2/ethX displays the state of the internal | ||
869 | transmit and receive rings. | ||
870 | |||
871 | If unsure, say N. | ||
872 | |||
873 | config VIA_VELOCITY | 796 | config VIA_VELOCITY |
874 | tristate "VIA Velocity support" | 797 | tristate "VIA Velocity support" |
875 | depends on PCI | 798 | depends on PCI |
@@ -952,19 +875,6 @@ config UGETH_TX_ON_DEMAND | |||
952 | bool "Transmit on Demand support" | 875 | bool "Transmit on Demand support" |
953 | depends on UCC_GETH | 876 | depends on UCC_GETH |
954 | 877 | ||
955 | config MV643XX_ETH | ||
956 | tristate "Marvell Discovery (643XX) and Orion ethernet support" | ||
957 | depends on (MV64X60 || PPC32 || PLAT_ORION) && INET | ||
958 | select INET_LRO | ||
959 | select PHYLIB | ||
960 | help | ||
961 | This driver supports the gigabit ethernet MACs in the | ||
962 | Marvell Discovery PPC/MIPS chipset family (MV643XX) and | ||
963 | in the Marvell Orion ARM SoC family. | ||
964 | |||
965 | Some boards that use the Discovery chipset are the Momenco | ||
966 | Ocelot C and Jaguar ATX and Pegasos II. | ||
967 | |||
968 | config XILINX_LL_TEMAC | 878 | config XILINX_LL_TEMAC |
969 | tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver" | 879 | tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver" |
970 | depends on PPC || MICROBLAZE | 880 | depends on PPC || MICROBLAZE |
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 141ed251f52c..69ca6a009c59 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
@@ -46,8 +46,6 @@ obj-$(CONFIG_GELIC_NET) += ps3_gelic.o | |||
46 | gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o | 46 | gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o |
47 | ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y) | 47 | ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y) |
48 | obj-$(CONFIG_TC35815) += tc35815.o | 48 | obj-$(CONFIG_TC35815) += tc35815.o |
49 | obj-$(CONFIG_SKGE) += skge.o | ||
50 | obj-$(CONFIG_SKY2) += sky2.o | ||
51 | obj-$(CONFIG_SKFP) += skfp/ | 49 | obj-$(CONFIG_SKFP) += skfp/ |
52 | obj-$(CONFIG_KS8842) += ks8842.o | 50 | obj-$(CONFIG_KS8842) += ks8842.o |
53 | obj-$(CONFIG_KS8851) += ks8851.o | 51 | obj-$(CONFIG_KS8851) += ks8851.o |
@@ -75,7 +73,6 @@ endif | |||
75 | obj-$(CONFIG_FORCEDETH) += forcedeth.o | 73 | obj-$(CONFIG_FORCEDETH) += forcedeth.o |
76 | 74 | ||
77 | obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o | 75 | obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o |
78 | obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o | ||
79 | ll_temac-objs := ll_temac_main.o ll_temac_mdio.o | 76 | ll_temac-objs := ll_temac_main.o ll_temac_mdio.o |
80 | obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o | 77 | obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o |
81 | obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o | 78 | obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o |
@@ -111,7 +108,6 @@ obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o | |||
111 | obj-$(CONFIG_TUN) += tun.o | 108 | obj-$(CONFIG_TUN) += tun.o |
112 | obj-$(CONFIG_VETH) += veth.o | 109 | obj-$(CONFIG_VETH) += veth.o |
113 | obj-$(CONFIG_NET_NETX) += netx-eth.o | 110 | obj-$(CONFIG_NET_NETX) += netx-eth.o |
114 | obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o | ||
115 | obj-$(CONFIG_BFIN_MAC) += bfin_mac.o | 111 | obj-$(CONFIG_BFIN_MAC) += bfin_mac.o |
116 | obj-$(CONFIG_DM9000) += dm9000.o | 112 | obj-$(CONFIG_DM9000) += dm9000.o |
117 | obj-$(CONFIG_ENC28J60) += enc28j60.o | 113 | obj-$(CONFIG_ENC28J60) += enc28j60.o |
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 0eaf95770ab7..1c447d96d7e5 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig | |||
@@ -28,6 +28,7 @@ source "drivers/net/ethernet/ibm/Kconfig" | |||
28 | source "drivers/net/ethernet/intel/Kconfig" | 28 | source "drivers/net/ethernet/intel/Kconfig" |
29 | source "drivers/net/ethernet/i825xx/Kconfig" | 29 | source "drivers/net/ethernet/i825xx/Kconfig" |
30 | source "drivers/net/ethernet/xscale/Kconfig" | 30 | source "drivers/net/ethernet/xscale/Kconfig" |
31 | source "drivers/net/ethernet/marvell/Kconfig" | ||
31 | source "drivers/net/ethernet/mellanox/Kconfig" | 32 | source "drivers/net/ethernet/mellanox/Kconfig" |
32 | source "drivers/net/ethernet/myricom/Kconfig" | 33 | source "drivers/net/ethernet/myricom/Kconfig" |
33 | source "drivers/net/ethernet/natsemi/Kconfig" | 34 | source "drivers/net/ethernet/natsemi/Kconfig" |
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index b5ca872f2444..48c8656b96c2 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile | |||
@@ -20,6 +20,7 @@ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/ | |||
20 | obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ | 20 | obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ |
21 | obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ | 21 | obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ |
22 | obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/ | 22 | obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/ |
23 | obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ | ||
23 | obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ | 24 | obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ |
24 | obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ | 25 | obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ |
25 | obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ | 26 | obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ |
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig new file mode 100644 index 000000000000..e525408367b6 --- /dev/null +++ b/drivers/net/ethernet/marvell/Kconfig | |||
@@ -0,0 +1,110 @@ | |||
1 | # | ||
2 | # Marvell device configuration | ||
3 | # | ||
4 | |||
5 | config NET_VENDOR_MARVELL | ||
6 | bool "Marvell devices" | ||
7 | depends on PCI || CPU_PXA168 || MV64X60 || PPC32 || PLAT_ORION || INET | ||
8 | ---help--- | ||
9 | If you have a network (Ethernet) card belonging to this class, say Y | ||
10 | and read the Ethernet-HOWTO, available from | ||
11 | <http://www.tldp.org/docs.html#howto>. | ||
12 | |||
13 | Note that the answer to this question doesn't directly affect the | ||
14 | kernel: saying N will just cause the configurator to skip all | ||
15 | the questions about Marvell devices. If you say Y, you will be | ||
16 | asked for your specific card in the following questions. | ||
17 | |||
18 | if NET_VENDOR_MARVELL | ||
19 | |||
20 | config MV643XX_ETH | ||
21 | tristate "Marvell Discovery (643XX) and Orion ethernet support" | ||
22 | depends on (MV64X60 || PPC32 || PLAT_ORION) && INET | ||
23 | select INET_LRO | ||
24 | select PHYLIB | ||
25 | ---help--- | ||
26 | This driver supports the gigabit ethernet MACs in the | ||
27 | Marvell Discovery PPC/MIPS chipset family (MV643XX) and | ||
28 | in the Marvell Orion ARM SoC family. | ||
29 | |||
30 | Some boards that use the Discovery chipset are the Momenco | ||
31 | Ocelot C and Jaguar ATX and Pegasos II. | ||
32 | |||
33 | config PXA168_ETH | ||
34 | tristate "Marvell pxa168 ethernet support" | ||
35 | depends on CPU_PXA168 | ||
36 | select PHYLIB | ||
37 | ---help--- | ||
38 | This driver supports the pxa168 Ethernet ports. | ||
39 | |||
40 | To compile this driver as a module, choose M here. The module | ||
41 | will be called pxa168_eth. | ||
42 | |||
43 | config SKGE | ||
44 | tristate "Marvell Yukon Gigabit Ethernet support" | ||
45 | depends on PCI | ||
46 | select CRC32 | ||
47 | ---help--- | ||
48 | This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx | ||
49 | and related Gigabit Ethernet adapters. It is a new smaller driver | ||
50 | with better performance and more complete ethtool support. | ||
51 | |||
52 | It does not support the link failover and network management | ||
53 | features that "portable" vendor supplied sk98lin driver does. | ||
54 | |||
55 | This driver supports adapters based on the original Yukon chipset: | ||
56 | Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T, | ||
57 | Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872. | ||
58 | |||
59 | It does not support the newer Yukon2 chipset: a separate driver, | ||
60 | sky2, is provided for these adapters. | ||
61 | |||
62 | To compile this driver as a module, choose M here: the module | ||
63 | will be called skge. This is recommended. | ||
64 | |||
65 | config SKGE_DEBUG | ||
66 | bool "Debugging interface" | ||
67 | depends on SKGE && DEBUG_FS | ||
68 | ---help--- | ||
69 | This option adds the ability to dump driver state for debugging. | ||
70 | The file /sys/kernel/debug/skge/ethX displays the state of the internal | ||
71 | transmit and receive rings. | ||
72 | |||
73 | If unsure, say N. | ||
74 | |||
75 | config SKGE_GENESIS | ||
76 | bool "Support for older SysKonnect Genesis boards" | ||
77 | depends on SKGE | ||
78 | ---help--- | ||
79 | This enables support for the older and uncommon SysKonnect Genesis | ||
80 | chips, which support MII via an external transceiver, instead of | ||
81 | an internal one. Disabling this option will save some memory | ||
82 | by making code smaller. If unsure say Y. | ||
83 | |||
84 | config SKY2 | ||
85 | tristate "Marvell Yukon 2 support" | ||
86 | depends on PCI | ||
87 | select CRC32 | ||
88 | ---help--- | ||
89 | This driver supports Gigabit Ethernet adapters based on the | ||
90 | Marvell Yukon 2 chipset: | ||
91 | Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/ | ||
92 | 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21 | ||
93 | |||
94 | There is companion driver for the older Marvell Yukon and | ||
95 | SysKonnect Genesis based adapters: skge. | ||
96 | |||
97 | To compile this driver as a module, choose M here: the module | ||
98 | will be called sky2. This is recommended. | ||
99 | |||
100 | config SKY2_DEBUG | ||
101 | bool "Debugging interface" | ||
102 | depends on SKY2 && DEBUG_FS | ||
103 | ---help--- | ||
104 | This option adds the ability to dump driver state for debugging. | ||
105 | The file /sys/kernel/debug/sky2/ethX displays the state of the internal | ||
106 | transmit and receive rings. | ||
107 | |||
108 | If unsure, say N. | ||
109 | |||
110 | endif # NET_VENDOR_MARVELL | ||
diff --git a/drivers/net/ethernet/marvell/Makefile b/drivers/net/ethernet/marvell/Makefile new file mode 100644 index 000000000000..57e3234a37ba --- /dev/null +++ b/drivers/net/ethernet/marvell/Makefile | |||
@@ -0,0 +1,8 @@ | |||
1 | # | ||
2 | # Makefile for the Marvell device drivers. | ||
3 | # | ||
4 | |||
5 | obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o | ||
6 | obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o | ||
7 | obj-$(CONFIG_SKGE) += skge.o | ||
8 | obj-$(CONFIG_SKY2) += sky2.o | ||
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 259699983ca5..259699983ca5 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c | |||
diff --git a/drivers/net/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index 1a3033d8e7ed..1a3033d8e7ed 100644 --- a/drivers/net/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c | |||
diff --git a/drivers/net/skge.c b/drivers/net/ethernet/marvell/skge.c index 98ec614c5690..98ec614c5690 100644 --- a/drivers/net/skge.c +++ b/drivers/net/ethernet/marvell/skge.c | |||
diff --git a/drivers/net/skge.h b/drivers/net/ethernet/marvell/skge.h index a2eb34115844..a2eb34115844 100644 --- a/drivers/net/skge.h +++ b/drivers/net/ethernet/marvell/skge.h | |||
diff --git a/drivers/net/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 57339da76326..57339da76326 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c | |||
diff --git a/drivers/net/sky2.h b/drivers/net/ethernet/marvell/sky2.h index 0af31b8b5f10..0af31b8b5f10 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/ethernet/marvell/sky2.h | |||