Re: [PATCH 7/9] net/ucc_geth: Rework ucc_geth driver to use OF PHY/MDIO helper functions

From: Grant Likely <redacted>

This patch simplifies the driver by making use of more common code.

Signed-off-by: Grant Likely <redacted>
---

=A0drivers/net/ucc_geth.c =A0 =A0 | =A0 27 ++++++---------------------
=A0drivers/net/ucc_geth_mii.c | =A0 17 +++--------------
=A02 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index e879868..45bb627 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c

@@ -28,6 +28,7 @@

=A0#include <linux/mii.h>
=A0#include <linux/phy.h>
=A0#include <linux/workqueue.h>
+#include <linux/of_mdio.h>
=A0#include <linux/of_platform.h>

=A0#include <asm/uaccess.h>

@@ -1537,35 +1538,19 @@ static int init_phy(struct net_device *dev)

=A0{
=A0 =A0 =A0 =A0struct ucc_geth_private *priv =3D netdev_priv(dev);
=A0 =A0 =A0 =A0struct device_node *np =3D priv->node;
- =A0 =A0 =A0 struct device_node *phy, *mdio;
- =A0 =A0 =A0 const phandle *ph;
- =A0 =A0 =A0 char bus_name[MII_BUS_ID_SIZE];
- =A0 =A0 =A0 const unsigned int *id;
+ =A0 =A0 =A0 struct device_node *phy;
=A0 =A0 =A0 =A0struct phy_device *phydev;
- =A0 =A0 =A0 char phy_id[BUS_ID_SIZE];

=A0 =A0 =A0 =A0priv->oldlink =3D 0;
=A0 =A0 =A0 =A0priv->oldspeed =3D 0;
=A0 =A0 =A0 =A0priv->oldduplex =3D -1;

- =A0 =A0 =A0 ph =3D of_get_property(np, "phy-handle", NULL);
- =A0 =A0 =A0 phy =3D of_find_node_by_phandle(*ph);
- =A0 =A0 =A0 mdio =3D of_get_parent(phy);
-
- =A0 =A0 =A0 id =3D of_get_property(phy, "reg", NULL);
-
+ =A0 =A0 =A0 phy =3D of_parse_phandle(np, "phy-handle", 0);
+ =A0 =A0 =A0 phydev =3D of_phy_connect(dev, phy, &adjust_link, 0, priv->=

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 return PTR_ERR(phydev);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 return -ENODEV;
=A0 =A0 =A0 =A0}

=A0 =A0 =A0 =A0phydev->supported &=3D (ADVERTISED_10baseT_Half |

diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c
index 0ada4ed..9f2492f 100644
--- a/drivers/net/ucc_geth_mii.c
+++ b/drivers/net/ucc_geth_mii.c

@@ -36,6 +36,7 @@

=A0#include <linux/mii.h>
=A0#include <linux/phy.h>
=A0#include <linux/fsl_devices.h>
+#include <linux/of_mdio.h>
=A0#include <linux/of_platform.h>

=A0#include <asm/io.h>

@@ -135,11 +136,10 @@ static int uec_mdio_probe(struct of_device *ofdev, =

=A0{
=A0 =A0 =A0 =A0struct device *device =3D &ofdev->dev;
=A0 =A0 =A0 =A0struct device_node *np =3D ofdev->node, *tempnp =3D NULL;
- =A0 =A0 =A0 struct device_node *child =3D NULL;
=A0 =A0 =A0 =A0struct ucc_mii_mng __iomem *regs;
=A0 =A0 =A0 =A0struct mii_bus *new_bus;
=A0 =A0 =A0 =A0struct resource res;
- =A0 =A0 =A0 int k, err =3D 0;
+ =A0 =A0 =A0 int err =3D 0;

=A0 =A0 =A0 =A0new_bus =3D mdiobus_alloc();
=A0 =A0 =A0 =A0if (NULL =3D=3D new_bus)

@@ -165,17 +165,6 @@ static int uec_mdio_probe(struct of_device *ofdev, c=

- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 new_bus->irq[*id] =3D irq;
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
- =A0 =A0 =A0 }
-
=A0 =A0 =A0 =A0/* Set the base address */
=A0 =A0 =A0 =A0regs =3D ioremap(res.start, sizeof(struct ucc_mii_mng));

@@ -220,7 +209,7 @@ static int uec_mdio_probe(struct of_device *ofdev, co=