Commit 7756332f authored by Toshiharu Okada's avatar Toshiharu Okada Committed by David S. Miller

pch_gbe: support ML7831 IOH

Support new device OKI SEMICONDUCTOR ML7831 IOH(Input/Output Hub)

ML7831 is for general purpose use.
ML7831 is companion chip for Intel Atom E6xx series.
ML7831 is completely compatible for Intel EG20T PCH.
Signed-off-by: default avatarToshiharu Okada <toshiharu-linux@dsn.okisemi.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 124d770a
...@@ -2535,7 +2535,7 @@ config S6GMAC ...@@ -2535,7 +2535,7 @@ config S6GMAC
source "drivers/net/stmmac/Kconfig" source "drivers/net/stmmac/Kconfig"
config PCH_GBE config PCH_GBE
tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE" tristate "Intel EG20T PCH/OKI SEMICONDUCTOR IOH(ML7223/ML7831) GbE"
depends on PCI depends on PCI
select MII select MII
---help--- ---help---
...@@ -2548,10 +2548,11 @@ config PCH_GBE ...@@ -2548,10 +2548,11 @@ config PCH_GBE
This driver enables Gigabit Ethernet function. This driver enables Gigabit Ethernet function.
This driver also can be used for OKI SEMICONDUCTOR IOH(Input/ This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
Output Hub), ML7223. Output Hub), ML7223/ML7831.
ML7223 IOH is for MP(Media Phone) use. ML7223 IOH is for MP(Media Phone) use. ML7831 IOH is for general
ML7223 is companion chip for Intel Atom E6xx series. purpose use.
ML7223 is completely compatible for Intel EG20T PCH. ML7223/ML7831 is companion chip for Intel Atom E6xx series.
ML7223/ML7831 is completely compatible for Intel EG20T PCH.
config FTGMAC100 config FTGMAC100
tristate "Faraday FTGMAC100 Gigabit Ethernet support" tristate "Faraday FTGMAC100 Gigabit Ethernet support"
......
...@@ -39,6 +39,9 @@ const char pch_driver_version[] = DRV_VERSION; ...@@ -39,6 +39,9 @@ const char pch_driver_version[] = DRV_VERSION;
#define PCI_VENDOR_ID_ROHM 0x10db #define PCI_VENDOR_ID_ROHM 0x10db
#define PCI_DEVICE_ID_ROHM_ML7223_GBE 0x8013 #define PCI_DEVICE_ID_ROHM_ML7223_GBE 0x8013
/* Macros for ML7831 */
#define PCI_DEVICE_ID_ROHM_ML7831_GBE 0x8802
#define PCH_GBE_TX_WEIGHT 64 #define PCH_GBE_TX_WEIGHT 64
#define PCH_GBE_RX_WEIGHT 64 #define PCH_GBE_RX_WEIGHT 64
#define PCH_GBE_RX_BUFFER_WRITE 16 #define PCH_GBE_RX_BUFFER_WRITE 16
...@@ -2526,6 +2529,13 @@ static DEFINE_PCI_DEVICE_TABLE(pch_gbe_pcidev_id) = { ...@@ -2526,6 +2529,13 @@ static DEFINE_PCI_DEVICE_TABLE(pch_gbe_pcidev_id) = {
.class = (PCI_CLASS_NETWORK_ETHERNET << 8), .class = (PCI_CLASS_NETWORK_ETHERNET << 8),
.class_mask = (0xFFFF00) .class_mask = (0xFFFF00)
}, },
{.vendor = PCI_VENDOR_ID_ROHM,
.device = PCI_DEVICE_ID_ROHM_ML7831_GBE,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.class = (PCI_CLASS_NETWORK_ETHERNET << 8),
.class_mask = (0xFFFF00)
},
/* required last entry */ /* required last entry */
{0} {0}
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment