diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-14 12:35:49 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-14 12:35:49 +0100 |
| commit | f772aa92c2c04d73c8dfc7f313af0877808ae16a (patch) | |
| tree | f7317e76d1326f0d0cde019cf49fe243888f9f05 /drivers/net | |
| parent | 7e33e8c076e7681b09b70641ab6783098ff99e69 (diff) | |
| parent | ee69c588417972185a1a2d72aa553410493791c2 (diff) | |
| download | barebox-f772aa92c2c04d73c8dfc7f313af0877808ae16a.tar.gz barebox-f772aa92c2c04d73c8dfc7f313af0877808ae16a.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/e1000/main.c | 1 | ||||
| -rw-r--r-- | drivers/net/phy/micrel.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c index 77bcd179a8..6f9dddaf23 100644 --- a/drivers/net/e1000/main.c +++ b/drivers/net/e1000/main.c @@ -3600,6 +3600,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *id) e1000_get_ethaddr(edev, edev->ethaddr); /* Set up the function pointers and register the device */ + edev->parent = &pdev->dev; edev->init = e1000_init; edev->recv = e1000_poll; edev->send = e1000_transmit; diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 9a30cb7e90..0ca359b0ba 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -72,8 +72,12 @@ static int kszphy_config_init(struct phy_device *phydev) static int ksz8021_config_init(struct phy_device *phydev) { - const u16 val = KSZPHY_OMSO_B_CAST_OFF | KSZPHY_OMSO_RMII_OVERRIDE; + u16 val; + + val = phy_read(phydev, MII_KSZPHY_OMSO); + val |= KSZPHY_OMSO_B_CAST_OFF; phy_write(phydev, MII_KSZPHY_OMSO, val); + return 0; } |