From 87ebdf6b47a4a73d7111cc8752fe92d70ee26615 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Mon, 16 May 2011 00:05:19 -0700 Subject: [PATCH] --- yaml --- r: 265231 b: refs/heads/master c: 7ac6653a085b41405758bc16b2525db56ee0a23f h: refs/heads/master i: 265229: 2c86bc5677f7b813f8c4332dae1227d856801cc1 265227: 520476ff9bbb7db2bda7bf727f64a1937047f9ac 265223: e640b2656b1af3a3efb4713f77b725ab70b38ad5 265215: cc8580b9643e3bfbac955a6ad4433ee999fc0924 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 2 +- trunk/drivers/net/Kconfig | 2 -- trunk/drivers/net/Makefile | 1 - trunk/drivers/net/ethernet/Kconfig | 1 + trunk/drivers/net/ethernet/Makefile | 1 + trunk/drivers/net/ethernet/stmicro/Kconfig | 22 +++++++++++++++++++ trunk/drivers/net/ethernet/stmicro/Makefile | 5 +++++ .../net/{ => ethernet/stmicro}/stmmac/Kconfig | 14 ++++++------ .../{ => ethernet/stmicro}/stmmac/Makefile | 0 .../{ => ethernet/stmicro}/stmmac/common.h | 0 .../net/{ => ethernet/stmicro}/stmmac/descs.h | 0 .../{ => ethernet/stmicro}/stmmac/dwmac100.h | 0 .../{ => ethernet/stmicro}/stmmac/dwmac1000.h | 0 .../stmicro}/stmmac/dwmac1000_core.c | 0 .../stmicro}/stmmac/dwmac1000_dma.c | 0 .../stmicro}/stmmac/dwmac100_core.c | 0 .../stmicro}/stmmac/dwmac100_dma.c | 0 .../{ => ethernet/stmicro}/stmmac/dwmac_dma.h | 0 .../{ => ethernet/stmicro}/stmmac/dwmac_lib.c | 0 .../{ => ethernet/stmicro}/stmmac/enh_desc.c | 0 .../{ => ethernet/stmicro}/stmmac/norm_desc.c | 0 .../{ => ethernet/stmicro}/stmmac/stmmac.h | 0 .../stmicro}/stmmac/stmmac_ethtool.c | 0 .../stmicro}/stmmac/stmmac_main.c | 0 .../stmicro}/stmmac/stmmac_mdio.c | 0 .../stmicro}/stmmac/stmmac_timer.c | 0 .../stmicro}/stmmac/stmmac_timer.h | 0 28 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 trunk/drivers/net/ethernet/stmicro/Kconfig create mode 100644 trunk/drivers/net/ethernet/stmicro/Makefile rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (93%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%) rename trunk/drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%) diff --git a/[refs] b/[refs] index 4092fafdfd95..8e60ec6a6ff5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef7f54297df683665145859501f63c801f6c7ea8 +refs/heads/master: 7ac6653a085b41405758bc16b2525db56ee0a23f diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index c789b6fbdd90..5dffc8ed4af6 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2029,7 +2029,7 @@ M: Giuseppe Cavallaro L: netdev@vger.kernel.org W: http://www.stlinux.com S: Supported -F: drivers/net/stmmac/ +F: drivers/net/ethernet/stmicro/stmmac/ CYBERPRO FB DRIVER M: Russell King diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index d3d2febeda17..a7ec50f197fc 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -1406,8 +1406,6 @@ config S6GMAC To compile this driver as a module, choose M here. The module will be called s6gmac. -source "drivers/net/stmmac/Kconfig" - config PCH_GBE tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE" depends on PCI diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile index 8d2d677da2ee..b54e308fc19b 100644 --- a/trunk/drivers/net/Makefile +++ b/trunk/drivers/net/Makefile @@ -67,7 +67,6 @@ obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o obj-$(CONFIG_RIONET) += rionet.o obj-$(CONFIG_SH_ETH) += sh_eth.o -obj-$(CONFIG_STMMAC_ETH) += stmmac/ # # end link order section diff --git a/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig index 8375b8b5dd73..c38e9026fe07 100644 --- a/trunk/drivers/net/ethernet/Kconfig +++ b/trunk/drivers/net/ethernet/Kconfig @@ -30,6 +30,7 @@ source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/racal/Kconfig" source "drivers/net/ethernet/sfc/Kconfig" source "drivers/net/ethernet/smsc/Kconfig" +source "drivers/net/ethernet/stmicro/Kconfig" source "drivers/net/ethernet/sun/Kconfig" source "drivers/net/ethernet/tehuti/Kconfig" diff --git a/trunk/drivers/net/ethernet/Makefile b/trunk/drivers/net/ethernet/Makefile index 26324a115905..75d7a0280c53 100644 --- a/trunk/drivers/net/ethernet/Makefile +++ b/trunk/drivers/net/ethernet/Makefile @@ -21,5 +21,6 @@ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ obj-$(CONFIG_SFC) += sfc/ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ +obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/ obj-$(CONFIG_NET_VENDOR_SUN) += sun/ obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/ diff --git a/trunk/drivers/net/ethernet/stmicro/Kconfig b/trunk/drivers/net/ethernet/stmicro/Kconfig new file mode 100644 index 000000000000..e40df6433860 --- /dev/null +++ b/trunk/drivers/net/ethernet/stmicro/Kconfig @@ -0,0 +1,22 @@ +# +# STMicroelectronics device configuration +# + +config NET_VENDOR_STMICRO + bool "STMicroelectronics devices" + depends on HAS_IOMEM + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + . + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about STMicroelectronics cards. If you say Y, you will + be asked for your specific card in the following questions. + +if NET_VENDOR_STMICRO + +source "drivers/net/ethernet/stmicro/stmmac/Kconfig" + +endif # NET_VENDOR_STMICRO diff --git a/trunk/drivers/net/ethernet/stmicro/Makefile b/trunk/drivers/net/ethernet/stmicro/Makefile new file mode 100644 index 000000000000..9b3bfddda7dd --- /dev/null +++ b/trunk/drivers/net/ethernet/stmicro/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the STMicroelectronics device drivers. +# + +obj-$(CONFIG_STMMAC_ETH) += stmmac/ diff --git a/trunk/drivers/net/stmmac/Kconfig b/trunk/drivers/net/ethernet/stmicro/stmmac/Kconfig similarity index 93% rename from trunk/drivers/net/stmmac/Kconfig rename to trunk/drivers/net/ethernet/stmicro/stmmac/Kconfig index 7df7df4e79c5..cda61e37c357 100644 --- a/trunk/drivers/net/stmmac/Kconfig +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -1,10 +1,10 @@ config STMMAC_ETH tristate "STMicroelectronics 10/100/1000 Ethernet driver" + depends on HAS_IOMEM select MII select PHYLIB select CRC32 - depends on NETDEVICES && HAS_IOMEM - help + ---help--- This is the driver for the Ethernet IPs are built around a Synopsys IP Core and only tested on the STMicroelectronics platforms. @@ -14,7 +14,7 @@ if STMMAC_ETH config STMMAC_DA bool "STMMAC DMA arbitration scheme" default n - help + ---help--- Selecting this option, rx has priority over Tx (only for Giga Ethernet device). By default, the DMA arbitration scheme is based on Round-robin @@ -24,7 +24,7 @@ config STMMAC_DUAL_MAC bool "STMMAC: dual mac support (EXPERIMENTAL)" default n depends on EXPERIMENTAL && STMMAC_ETH && !STMMAC_TIMER - help + ---help--- Some ST SoCs (for example the stx7141 and stx7200c2) have two Ethernet Controllers. This option turns on the second Ethernet device on this kind of platforms. @@ -33,7 +33,7 @@ config STMMAC_TIMER bool "STMMAC Timer optimisation" default n depends on RTC_HCTOSYS_DEVICE - help + ---help--- Use an external timer for mitigating the number of network interrupts. Currently, for SH architectures, it is possible to use the TMU channel 2 and the SH-RTC device. @@ -45,12 +45,12 @@ choice config STMMAC_TMU_TIMER bool "TMU channel 2" depends on CPU_SH4 - help + ---help--- config STMMAC_RTC_TIMER bool "Real time clock" depends on RTC_CLASS - help + ---help--- endchoice diff --git a/trunk/drivers/net/stmmac/Makefile b/trunk/drivers/net/ethernet/stmicro/stmmac/Makefile similarity index 100% rename from trunk/drivers/net/stmmac/Makefile rename to trunk/drivers/net/ethernet/stmicro/stmmac/Makefile diff --git a/trunk/drivers/net/stmmac/common.h b/trunk/drivers/net/ethernet/stmicro/stmmac/common.h similarity index 100% rename from trunk/drivers/net/stmmac/common.h rename to trunk/drivers/net/ethernet/stmicro/stmmac/common.h diff --git a/trunk/drivers/net/stmmac/descs.h b/trunk/drivers/net/ethernet/stmicro/stmmac/descs.h similarity index 100% rename from trunk/drivers/net/stmmac/descs.h rename to trunk/drivers/net/ethernet/stmicro/stmmac/descs.h diff --git a/trunk/drivers/net/stmmac/dwmac100.h b/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac100.h similarity index 100% rename from trunk/drivers/net/stmmac/dwmac100.h rename to trunk/drivers/net/ethernet/stmicro/stmmac/dwmac100.h diff --git a/trunk/drivers/net/stmmac/dwmac1000.h b/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h similarity index 100% rename from trunk/drivers/net/stmmac/dwmac1000.h rename to trunk/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h diff --git a/trunk/drivers/net/stmmac/dwmac1000_core.c b/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c similarity index 100% rename from trunk/drivers/net/stmmac/dwmac1000_core.c rename to trunk/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c diff --git a/trunk/drivers/net/stmmac/dwmac1000_dma.c b/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c similarity index 100% rename from trunk/drivers/net/stmmac/dwmac1000_dma.c rename to trunk/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c diff --git a/trunk/drivers/net/stmmac/dwmac100_core.c b/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c similarity index 100% rename from trunk/drivers/net/stmmac/dwmac100_core.c rename to trunk/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c diff --git a/trunk/drivers/net/stmmac/dwmac100_dma.c b/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c similarity index 100% rename from trunk/drivers/net/stmmac/dwmac100_dma.c rename to trunk/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c diff --git a/trunk/drivers/net/stmmac/dwmac_dma.h b/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h similarity index 100% rename from trunk/drivers/net/stmmac/dwmac_dma.h rename to trunk/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h diff --git a/trunk/drivers/net/stmmac/dwmac_lib.c b/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c similarity index 100% rename from trunk/drivers/net/stmmac/dwmac_lib.c rename to trunk/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c diff --git a/trunk/drivers/net/stmmac/enh_desc.c b/trunk/drivers/net/ethernet/stmicro/stmmac/enh_desc.c similarity index 100% rename from trunk/drivers/net/stmmac/enh_desc.c rename to trunk/drivers/net/ethernet/stmicro/stmmac/enh_desc.c diff --git a/trunk/drivers/net/stmmac/norm_desc.c b/trunk/drivers/net/ethernet/stmicro/stmmac/norm_desc.c similarity index 100% rename from trunk/drivers/net/stmmac/norm_desc.c rename to trunk/drivers/net/ethernet/stmicro/stmmac/norm_desc.c diff --git a/trunk/drivers/net/stmmac/stmmac.h b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac.h similarity index 100% rename from trunk/drivers/net/stmmac/stmmac.h rename to trunk/drivers/net/ethernet/stmicro/stmmac/stmmac.h diff --git a/trunk/drivers/net/stmmac/stmmac_ethtool.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c similarity index 100% rename from trunk/drivers/net/stmmac/stmmac_ethtool.c rename to trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c diff --git a/trunk/drivers/net/stmmac/stmmac_main.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c similarity index 100% rename from trunk/drivers/net/stmmac/stmmac_main.c rename to trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff --git a/trunk/drivers/net/stmmac/stmmac_mdio.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c similarity index 100% rename from trunk/drivers/net/stmmac/stmmac_mdio.c rename to trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c diff --git a/trunk/drivers/net/stmmac/stmmac_timer.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c similarity index 100% rename from trunk/drivers/net/stmmac/stmmac_timer.c rename to trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c diff --git a/trunk/drivers/net/stmmac/stmmac_timer.h b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h similarity index 100% rename from trunk/drivers/net/stmmac/stmmac_timer.h rename to trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h