diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 21:36:13 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 21:36:13 +0200 |
| commit | 3975737a7d48b3c767f60be994d55884321d45f9 (patch) | |
| tree | 8be2f56c4978420e6e4c4b3292e18c61b07a926e /drivers/net | |
| parent | 10fb7853084356ef3c6b40ddf21dfb05dbd15691 (diff) | |
| parent | 6d4afd96fc94a3f2d256ef4e8d7c9687a145a701 (diff) | |
| download | barebox-3975737a7d48b3c767f60be994d55884321d45f9.tar.gz barebox-3975737a7d48b3c767f60be994d55884321d45f9.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fec_imx.c | 5 | ||||
| -rw-r--r-- | drivers/net/usb/asix.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 875905a1bf..28d5a7b8bf 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -308,7 +308,10 @@ static int fec_init(struct eth_device *dev) } } - if (fec->interface == PHY_INTERFACE_MODE_RGMII) + if (fec->interface == PHY_INTERFACE_MODE_RGMII || + fec->interface == PHY_INTERFACE_MODE_RGMII_ID || + fec->interface == PHY_INTERFACE_MODE_RGMII_TXID || + fec->interface == PHY_INTERFACE_MODE_RGMII_RXID) rcntl |= 1 << 6; writel(rcntl, fec->regs + FEC_R_CNTRL); diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index 14a8c765f1..7cce5b929e 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c @@ -846,6 +846,10 @@ static const struct usb_device_id products [] = { // LevelOne USB Fast Ethernet Adapter USB_DEVICE(0x0b95, 0x772b), .driver_info = &ax88772b_info, +}, { + // DLink DUB-E100 H/W Ver C1 + USB_DEVICE(0x2001, 0x1a02), + .driver_info = &ax88772_info, }, { }, // END }; |