diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-07 08:31:47 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-07 08:31:47 +0100 |
| commit | 8be53ce2ab9326a00977bf5424760fce8a1565c1 (patch) | |
| tree | 97b0e748f73806c06080cdf9177f75dd118151cf | |
| parent | 398cdf212d43aac84909f42bd1cd2b376fc0140a (diff) | |
| parent | 5d3cb01271c6644b10146b0304afb24cce76b28c (diff) | |
| download | barebox-8be53ce2ab9326a00977bf5424760fce8a1565c1.tar.gz barebox-8be53ce2ab9326a00977bf5424760fce8a1565c1.tar.xz | |
Merge branch 'for-next/net'
| -rw-r--r-- | drivers/net/phy/micrel.c | 9 | ||||
| -rw-r--r-- | include/linux/micrel_phy.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index c0bcdd1082..3cba2c405f 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -122,6 +122,15 @@ static struct phy_driver ksphy_driver[] = { .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, }, { + .phy_id = PHY_ID_KSZ8031, + .phy_id_mask = 0x00ffffff, + .drv.name = "Micrel KSZ8031", + .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause | + SUPPORTED_Asym_Pause), + .config_init = ksz8021_config_init, + .config_aneg = genphy_config_aneg, + .read_status = genphy_read_status, +}, { .phy_id = PHY_ID_KSZ8041, .phy_id_mask = 0x00fffff0, .drv.name = "Micrel KSZ8041", diff --git a/include/linux/micrel_phy.h b/include/linux/micrel_phy.h index 9dbb41a4e2..8752dbbc61 100644 --- a/include/linux/micrel_phy.h +++ b/include/linux/micrel_phy.h @@ -19,6 +19,7 @@ #define PHY_ID_KSZ9021 0x00221610 #define PHY_ID_KS8737 0x00221720 #define PHY_ID_KSZ8021 0x00221555 +#define PHY_ID_KSZ8031 0x00221556 #define PHY_ID_KSZ8041 0x00221510 #define PHY_ID_KSZ8051 0x00221550 /* same id: ks8001 Rev. A/B, and ks8721 Rev 3. */ |