From a4271871b9d69c8c09fcd8d8acccf209c16849e5 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 20 May 2011 19:48:55 -0700 Subject: [PATCH] --- yaml --- r: 265245 b: refs/heads/master c: 1c1538be1da768fe0209a11e1bdf9dd7ab38905a h: refs/heads/master i: 265243: 13d752f259487f10b21774bddc322c4038b8dae7 v: v3 --- [refs] | 2 +- trunk/drivers/net/Kconfig | 19 ---------------- trunk/drivers/net/Makefile | 1 - trunk/drivers/net/ethernet/Kconfig | 1 + trunk/drivers/net/ethernet/Makefile | 1 + trunk/drivers/net/ethernet/oki-semi/Kconfig | 22 +++++++++++++++++++ trunk/drivers/net/ethernet/oki-semi/Makefile | 5 +++++ .../net/ethernet/oki-semi/pch_gbe/Kconfig | 20 +++++++++++++++++ .../{ => ethernet/oki-semi}/pch_gbe/Makefile | 0 .../{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h | 0 .../oki-semi}/pch_gbe/pch_gbe_api.c | 0 .../oki-semi}/pch_gbe/pch_gbe_api.h | 0 .../oki-semi}/pch_gbe/pch_gbe_ethtool.c | 0 .../oki-semi}/pch_gbe/pch_gbe_main.c | 0 .../oki-semi}/pch_gbe/pch_gbe_param.c | 0 .../oki-semi}/pch_gbe/pch_gbe_phy.c | 0 .../oki-semi}/pch_gbe/pch_gbe_phy.h | 0 17 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 trunk/drivers/net/ethernet/oki-semi/Kconfig create mode 100644 trunk/drivers/net/ethernet/oki-semi/Makefile create mode 100644 trunk/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig rename trunk/drivers/net/{ => ethernet/oki-semi}/pch_gbe/Makefile (100%) rename trunk/drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe.h (100%) rename trunk/drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.c (100%) rename trunk/drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_api.h (100%) rename trunk/drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_ethtool.c (100%) rename trunk/drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_main.c (100%) rename trunk/drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_param.c (100%) rename trunk/drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.c (100%) rename trunk/drivers/net/{ => ethernet/oki-semi}/pch_gbe/pch_gbe_phy.h (100%) diff --git a/[refs] b/[refs] index ea5645b8a7dc..d649dce31c2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e13fbf7af3cb044f365e8df9c0e9277715cfc7c +refs/heads/master: 1c1538be1da768fe0209a11e1bdf9dd7ab38905a diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 696464cb0a93..87e7a1217851 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -996,25 +996,6 @@ config S6GMAC To compile this driver as a module, choose M here. The module will be called s6gmac. -config PCH_GBE - tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE" - depends on PCI - select MII - ---help--- - This is a gigabit ethernet driver for EG20T PCH. - EG20T PCH is the platform controller hub that is used in Intel's - general embedded platform. - EG20T PCH has Gigabit Ethernet interface. - Using this interface, it is able to access system devices connected - to Gigabit Ethernet. - This driver enables Gigabit Ethernet function. - - This driver also can be used for OKI SEMICONDUCTOR IOH(Input/ - Output Hub), ML7223. - ML7223 IOH is for MP(Media Phone) use. - ML7223 is companion chip for Intel Atom E6xx series. - ML7223 is completely compatible for Intel EG20T PCH. - endif # NETDEV_1000 # diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile index b1ead87b65c3..141ed251f52c 100644 --- a/trunk/drivers/net/Makefile +++ b/trunk/drivers/net/Makefile @@ -156,5 +156,4 @@ obj-$(CONFIG_WIMAX) += wimax/ obj-$(CONFIG_CAIF) += caif/ obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/ -obj-$(CONFIG_PCH_GBE) += pch_gbe/ obj-$(CONFIG_TILE_NET) += tile/ diff --git a/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig index 35ed4c21a454..0eaf95770ab7 100644 --- a/trunk/drivers/net/ethernet/Kconfig +++ b/trunk/drivers/net/ethernet/Kconfig @@ -32,6 +32,7 @@ source "drivers/net/ethernet/mellanox/Kconfig" source "drivers/net/ethernet/myricom/Kconfig" source "drivers/net/ethernet/natsemi/Kconfig" source "drivers/net/ethernet/8390/Kconfig" +source "drivers/net/ethernet/oki-semi/Kconfig" source "drivers/net/ethernet/pasemi/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/racal/Kconfig" diff --git a/trunk/drivers/net/ethernet/Makefile b/trunk/drivers/net/ethernet/Makefile index ea0999fd1494..b5ca872f2444 100644 --- a/trunk/drivers/net/ethernet/Makefile +++ b/trunk/drivers/net/ethernet/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ +obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/ obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ diff --git a/trunk/drivers/net/ethernet/oki-semi/Kconfig b/trunk/drivers/net/ethernet/oki-semi/Kconfig new file mode 100644 index 000000000000..97f5e72f0ec7 --- /dev/null +++ b/trunk/drivers/net/ethernet/oki-semi/Kconfig @@ -0,0 +1,22 @@ +# +# OKI Semiconductor device configuration +# + +config NET_VENDOR_OKI + bool "OKI Semiconductor devices" + depends on PCI + ---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 OKI Semiconductor cards. If you say Y, you will + be asked for your specific card in the following questions. + +if NET_VENDOR_OKI + +source "drivers/net/ethernet/oki-semi/pch_gbe/Kconfig" + +endif # NET_VENDOR_OKI diff --git a/trunk/drivers/net/ethernet/oki-semi/Makefile b/trunk/drivers/net/ethernet/oki-semi/Makefile new file mode 100644 index 000000000000..b6780c877c19 --- /dev/null +++ b/trunk/drivers/net/ethernet/oki-semi/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the OKI Semiconductor device drivers. +# + +obj-$(CONFIG_PCH_GBE) += pch_gbe/ diff --git a/trunk/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig new file mode 100644 index 000000000000..c85709d6ff1b --- /dev/null +++ b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig @@ -0,0 +1,20 @@ +# +# OKI Semiconductor device configuration +# + +config PCH_GBE + tristate "OKI SEMICONDUCTOR ML7223 IOH GbE (Intel EG20T PCH)" + depends on PCI + select MII + ---help--- + This is a gigabit ethernet driver for EG20T PCH. + EG20T PCH is the platform controller hub that is used in Intel's + general embedded platform. EG20T PCH has Gigabit Ethernet interface. + Using this interface, it is able to access system devices connected + to Gigabit Ethernet. This driver enables Gigabit Ethernet function. + + This driver also can be used for OKI SEMICONDUCTOR IOH(Input/ + Output Hub), ML7223. + ML7223 IOH is for MP(Media Phone) use. + ML7223 is companion chip for Intel Atom E6xx series. + ML7223 is completely compatible for Intel EG20T PCH. diff --git a/trunk/drivers/net/pch_gbe/Makefile b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/Makefile similarity index 100% rename from trunk/drivers/net/pch_gbe/Makefile rename to trunk/drivers/net/ethernet/oki-semi/pch_gbe/Makefile diff --git a/trunk/drivers/net/pch_gbe/pch_gbe.h b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h similarity index 100% rename from trunk/drivers/net/pch_gbe/pch_gbe.h rename to trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h diff --git a/trunk/drivers/net/pch_gbe/pch_gbe_api.c b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c similarity index 100% rename from trunk/drivers/net/pch_gbe/pch_gbe_api.c rename to trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c diff --git a/trunk/drivers/net/pch_gbe/pch_gbe_api.h b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h similarity index 100% rename from trunk/drivers/net/pch_gbe/pch_gbe_api.h rename to trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h diff --git a/trunk/drivers/net/pch_gbe/pch_gbe_ethtool.c b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c similarity index 100% rename from trunk/drivers/net/pch_gbe/pch_gbe_ethtool.c rename to trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c diff --git a/trunk/drivers/net/pch_gbe/pch_gbe_main.c b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c similarity index 100% rename from trunk/drivers/net/pch_gbe/pch_gbe_main.c rename to trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c diff --git a/trunk/drivers/net/pch_gbe/pch_gbe_param.c b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c similarity index 100% rename from trunk/drivers/net/pch_gbe/pch_gbe_param.c rename to trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c diff --git a/trunk/drivers/net/pch_gbe/pch_gbe_phy.c b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c similarity index 100% rename from trunk/drivers/net/pch_gbe/pch_gbe_phy.c rename to trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c diff --git a/trunk/drivers/net/pch_gbe/pch_gbe_phy.h b/trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h similarity index 100% rename from trunk/drivers/net/pch_gbe/pch_gbe_phy.h rename to trunk/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h