3 files changed, 15 insertions, 19 deletions

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 972fa40c90..6482626454 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -5,7 +5,7 @@ menuconfig NET_USB
 if NET_USB
 
 config NET_USB_ASIX
-	select MIIPHY
+	select MIIDEV
 	bool "Asix compatible"
 
 endif
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index ca71b34e12..d148925b04 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -1,7 +1,7 @@
 #include <common.h>
 #include <init.h>
 #include <net.h>
-#include <miiphy.h>
+#include <miidev.h>
 #include <usb/usb.h>
 #include <usb/usbnet.h>
 #include <errno.h>
@@ -231,8 +231,7 @@ static inline int asix_set_hw_mii(struct usbnet *dev)
 	return ret;
 }
 
-static int asix_mdio_read(struct miiphy_device *mdev, uint8_t phy_id,
-		uint8_t loc, uint16_t *val)
+static int asix_mdio_read(struct mii_device *mdev, int phy_id, int loc)
 {
 	struct eth_device *eth = mdev->edev;
 	struct usbnet *dev = eth->priv;
@@ -246,13 +245,10 @@ static int asix_mdio_read(struct miiphy_device *mdev, uint8_t phy_id,
 	dev_dbg(&dev->edev.dev, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x",
 			phy_id, loc, le16_to_cpu(res));
 
-	*val = le16_to_cpu(res);
-
-	return 0;
+	return le16_to_cpu(res);
 }
 
-static int asix_mdio_write(struct miiphy_device *mdev, uint8_t phy_id,
-		uint8_t loc, uint16_t val)
+static int asix_mdio_write(struct mii_device *mdev, int phy_id, int loc, int val)
 {
 	struct eth_device *eth = mdev->edev;
 	struct usbnet *dev = eth->priv;
@@ -473,13 +469,13 @@ static int asix_tx_fixup(struct usbnet *dev,
 
 static int asix_init_mii(struct usbnet *dev)
 {
-	dev->miiphy.read = asix_mdio_read;
-	dev->miiphy.write = asix_mdio_write;
-	dev->miiphy.address = asix_get_phy_addr(dev);
-	dev->miiphy.flags = 0;
-	dev->miiphy.edev = &dev->edev;
+	dev->miidev.read = asix_mdio_read;
+	dev->miidev.write = asix_mdio_write;
+	dev->miidev.address = asix_get_phy_addr(dev);
+	dev->miidev.flags = 0;
+	dev->miidev.edev = &dev->edev;
 
-	return miiphy_register(&dev->miiphy);
+	return mii_register(&dev->miidev);
 }
 
 static int ax88172_link_reset(struct usbnet *dev)
@@ -634,7 +630,7 @@ out:
 
 static void asix_unbind(struct usbnet *dev)
 {
-	miiphy_unregister(&dev->miiphy);
+	mii_unregister(&dev->miidev);
 }
 
 static struct driver_info ax8817x_info = {
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index cc170f6611..983d464bd0 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -160,7 +160,7 @@ static int usbnet_init(struct eth_device *edev)
                 return ret;
         }
 
-	miiphy_restart_aneg(&dev->miiphy);
+	miidev_restart_aneg(&dev->miidev);
 
 	return 0;
 }
@@ -171,10 +171,10 @@ static int usbnet_open(struct eth_device *edev)
 
 	dev_dbg(&edev->dev, "%s\n",__func__);
 
-	if (miiphy_wait_aneg(&dev->miiphy))
+	if (miidev_wait_aneg(&dev->miidev))
 		return -1;
 
-	miiphy_print_status(&dev->miiphy);
+	miidev_print_status(&dev->miidev);
 
 	return 0;
 }