diff options
author | Tomoya <tomoya-linux@dsn.okisemi.com> | 2011-05-08 21:19:37 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-09 15:45:28 -0400 |
commit | b0e6baf5619a6fa3eaf43b55fdb4daa362c3c916 (patch) | |
tree | a8caa0dff8340c26a1a84bb096300e374aa6af95 | |
parent | 5d05a04d283061b586e8dc819cfa6f4b8cfd5948 (diff) |
pch_gbe: support ML7223 IOH
Support new device OKI SEMICONDUCTOR ML7223 IOH(Input/Output Hub).
The ML7223 IOH is for MP(Media Phone) use.
The ML7223 is companion chip for Intel Atom E6xx series.
The ML7223 is completely compatible for Intel EG20T PCH.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/Kconfig | 8 | ||||
-rw-r--r-- | drivers/net/pch_gbe/pch_gbe_main.c | 11 |
2 files changed, 18 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index dc280bc8eba2..6c884ef1b069 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2536,7 +2536,7 @@ config S6GMAC | |||
2536 | source "drivers/net/stmmac/Kconfig" | 2536 | source "drivers/net/stmmac/Kconfig" |
2537 | 2537 | ||
2538 | config PCH_GBE | 2538 | config PCH_GBE |
2539 | tristate "PCH Gigabit Ethernet" | 2539 | tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE" |
2540 | depends on PCI | 2540 | depends on PCI |
2541 | select MII | 2541 | select MII |
2542 | ---help--- | 2542 | ---help--- |
@@ -2548,6 +2548,12 @@ config PCH_GBE | |||
2548 | to Gigabit Ethernet. | 2548 | to Gigabit Ethernet. |
2549 | This driver enables Gigabit Ethernet function. | 2549 | This driver enables Gigabit Ethernet function. |
2550 | 2550 | ||
2551 | This driver also can be used for OKI SEMICONDUCTOR IOH(Input/ | ||
2552 | Output Hub), ML7223. | ||
2553 | ML7223 IOH is for MP(Media Phone) use. | ||
2554 | ML7223 is companion chip for Intel Atom E6xx series. | ||
2555 | ML7223 is completely compatible for Intel EG20T PCH. | ||
2556 | |||
2551 | endif # NETDEV_1000 | 2557 | endif # NETDEV_1000 |
2552 | 2558 | ||
2553 | # | 2559 | # |
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c index 9f6c4025c6ea..56d049a472da 100644 --- a/drivers/net/pch_gbe/pch_gbe_main.c +++ b/drivers/net/pch_gbe/pch_gbe_main.c | |||
@@ -34,6 +34,10 @@ const char pch_driver_version[] = DRV_VERSION; | |||
34 | #define PCH_GBE_COPYBREAK_DEFAULT 256 | 34 | #define PCH_GBE_COPYBREAK_DEFAULT 256 |
35 | #define PCH_GBE_PCI_BAR 1 | 35 | #define PCH_GBE_PCI_BAR 1 |
36 | 36 | ||
37 | /* Macros for ML7223 */ | ||
38 | #define PCI_VENDOR_ID_ROHM 0x10db | ||
39 | #define PCI_DEVICE_ID_ROHM_ML7223_GBE 0x8013 | ||
40 | |||
37 | #define PCH_GBE_TX_WEIGHT 64 | 41 | #define PCH_GBE_TX_WEIGHT 64 |
38 | #define PCH_GBE_RX_WEIGHT 64 | 42 | #define PCH_GBE_RX_WEIGHT 64 |
39 | #define PCH_GBE_RX_BUFFER_WRITE 16 | 43 | #define PCH_GBE_RX_BUFFER_WRITE 16 |
@@ -2418,6 +2422,13 @@ static DEFINE_PCI_DEVICE_TABLE(pch_gbe_pcidev_id) = { | |||
2418 | .class = (PCI_CLASS_NETWORK_ETHERNET << 8), | 2422 | .class = (PCI_CLASS_NETWORK_ETHERNET << 8), |
2419 | .class_mask = (0xFFFF00) | 2423 | .class_mask = (0xFFFF00) |
2420 | }, | 2424 | }, |
2425 | {.vendor = PCI_VENDOR_ID_ROHM, | ||
2426 | .device = PCI_DEVICE_ID_ROHM_ML7223_GBE, | ||
2427 | .subvendor = PCI_ANY_ID, | ||
2428 | .subdevice = PCI_ANY_ID, | ||
2429 | .class = (PCI_CLASS_NETWORK_ETHERNET << 8), | ||
2430 | .class_mask = (0xFFFF00) | ||
2431 | }, | ||
2421 | /* required last entry */ | 2432 | /* required last entry */ |
2422 | {0} | 2433 | {0} |
2423 | }; | 2434 | }; |