diff options
-rw-r--r-- | drivers/net/Kconfig | 11 | ||||
-rw-r--r-- | drivers/net/pch_gbe/pch_gbe_main.c | 10 |
2 files changed, 16 insertions, 5 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 8d0314dbd946..a44874e24f2a 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2535,7 +2535,7 @@ config S6GMAC | |||
2535 | source "drivers/net/stmmac/Kconfig" | 2535 | source "drivers/net/stmmac/Kconfig" |
2536 | 2536 | ||
2537 | config PCH_GBE | 2537 | config PCH_GBE |
2538 | tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE" | 2538 | tristate "Intel EG20T PCH/OKI SEMICONDUCTOR IOH(ML7223/ML7831) GbE" |
2539 | depends on PCI | 2539 | depends on PCI |
2540 | select MII | 2540 | select MII |
2541 | ---help--- | 2541 | ---help--- |
@@ -2548,10 +2548,11 @@ config PCH_GBE | |||
2548 | This driver enables Gigabit Ethernet function. | 2548 | This driver enables Gigabit Ethernet function. |
2549 | 2549 | ||
2550 | This driver also can be used for OKI SEMICONDUCTOR IOH(Input/ | 2550 | This driver also can be used for OKI SEMICONDUCTOR IOH(Input/ |
2551 | Output Hub), ML7223. | 2551 | Output Hub), ML7223/ML7831. |
2552 | ML7223 IOH is for MP(Media Phone) use. | 2552 | ML7223 IOH is for MP(Media Phone) use. ML7831 IOH is for general |
2553 | ML7223 is companion chip for Intel Atom E6xx series. | 2553 | purpose use. |
2554 | ML7223 is completely compatible for Intel EG20T PCH. | 2554 | ML7223/ML7831 is companion chip for Intel Atom E6xx series. |
2555 | ML7223/ML7831 is completely compatible for Intel EG20T PCH. | ||
2555 | 2556 | ||
2556 | config FTGMAC100 | 2557 | config FTGMAC100 |
2557 | tristate "Faraday FTGMAC100 Gigabit Ethernet support" | 2558 | tristate "Faraday FTGMAC100 Gigabit Ethernet support" |
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c index 39ce0ee44ad7..567ff10889be 100644 --- a/drivers/net/pch_gbe/pch_gbe_main.c +++ b/drivers/net/pch_gbe/pch_gbe_main.c | |||
@@ -39,6 +39,9 @@ const char pch_driver_version[] = DRV_VERSION; | |||
39 | #define PCI_VENDOR_ID_ROHM 0x10db | 39 | #define PCI_VENDOR_ID_ROHM 0x10db |
40 | #define PCI_DEVICE_ID_ROHM_ML7223_GBE 0x8013 | 40 | #define PCI_DEVICE_ID_ROHM_ML7223_GBE 0x8013 |
41 | 41 | ||
42 | /* Macros for ML7831 */ | ||
43 | #define PCI_DEVICE_ID_ROHM_ML7831_GBE 0x8802 | ||
44 | |||
42 | #define PCH_GBE_TX_WEIGHT 64 | 45 | #define PCH_GBE_TX_WEIGHT 64 |
43 | #define PCH_GBE_RX_WEIGHT 64 | 46 | #define PCH_GBE_RX_WEIGHT 64 |
44 | #define PCH_GBE_RX_BUFFER_WRITE 16 | 47 | #define PCH_GBE_RX_BUFFER_WRITE 16 |
@@ -2526,6 +2529,13 @@ static DEFINE_PCI_DEVICE_TABLE(pch_gbe_pcidev_id) = { | |||
2526 | .class = (PCI_CLASS_NETWORK_ETHERNET << 8), | 2529 | .class = (PCI_CLASS_NETWORK_ETHERNET << 8), |
2527 | .class_mask = (0xFFFF00) | 2530 | .class_mask = (0xFFFF00) |
2528 | }, | 2531 | }, |
2532 | {.vendor = PCI_VENDOR_ID_ROHM, | ||
2533 | .device = PCI_DEVICE_ID_ROHM_ML7831_GBE, | ||
2534 | .subvendor = PCI_ANY_ID, | ||
2535 | .subdevice = PCI_ANY_ID, | ||
2536 | .class = (PCI_CLASS_NETWORK_ETHERNET << 8), | ||
2537 | .class_mask = (0xFFFF00) | ||
2538 | }, | ||
2529 | /* required last entry */ | 2539 | /* required last entry */ |
2530 | {0} | 2540 | {0} |
2531 | }; | 2541 | }; |