diff mbox

[uboot,v5,2/7] net: zynq_gem: Add the passing of the phy-handle node

Message ID 1460377108-19262-2-git-send-email-dmurphy@ti.com
State Superseded
Headers show

Commit Message

Dan Murphy April 11, 2016, 12:18 p.m. UTC
Add the ability to pass the phy-handle node offset
to the phy driver.  This allows the phy driver
to access the DT subnode's data and parse accordingly.

Signed-off-by: Dan Murphy <dmurphy@ti.com>

---

v5 - Removed unused variable and fixed checkpatch warning - https://patchwork.ozlabs.org/patch/608083/

 drivers/net/zynq_gem.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

-- 
2.8.0.rc3

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Comments

Dan Murphy April 13, 2016, 1:37 p.m. UTC | #1
Adding Joe

On 04/11/2016 07:18 AM, Dan Murphy wrote:
> Add the ability to pass the phy-handle node offset

> to the phy driver.  This allows the phy driver

> to access the DT subnode's data and parse accordingly.

>

> Signed-off-by: Dan Murphy <dmurphy@ti.com>

> ---

>

> v5 - Removed unused variable and fixed checkpatch warning - https://patchwork.ozlabs.org/patch/608083/

>

>  drivers/net/zynq_gem.c | 15 ++++++++++-----

>  1 file changed, 10 insertions(+), 5 deletions(-)

>

> diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c

> index aec8077..f9b22c4 100644

> --- a/drivers/net/zynq_gem.c

> +++ b/drivers/net/zynq_gem.c

> @@ -179,6 +179,7 @@ struct zynq_gem_priv {

>  	struct zynq_gem_regs *iobase;

>  	phy_interface_t interface;

>  	struct phy_device *phydev;

> +	int phy_of_handle;

>  	struct mii_dev *bus;

>  };

>  

> @@ -352,6 +353,10 @@ static int zynq_phy_init(struct udevice *dev)

>  	priv->phydev->supported = supported | ADVERTISED_Pause |

>  				  ADVERTISED_Asym_Pause;

>  	priv->phydev->advertising = priv->phydev->supported;

> +

> +	if (priv->phy_of_handle > 0)

> +		priv->phydev->dev->of_offset = priv->phy_of_handle;

> +

>  	phy_config(priv->phydev);

>  

>  	return 0;

> @@ -675,7 +680,6 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)

>  {

>  	struct eth_pdata *pdata = dev_get_platdata(dev);

>  	struct zynq_gem_priv *priv = dev_get_priv(dev);

> -	int offset = 0;

>  	const char *phy_mode;

>  

>  	pdata->iobase = (phys_addr_t)dev_get_addr(dev);

> @@ -684,10 +688,11 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)

>  	priv->emio = 0;

>  	priv->phyaddr = -1;

>  

> -	offset = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset,

> -				       "phy-handle");

> -	if (offset > 0)

> -		priv->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, "reg", -1);

> +	priv->phy_of_handle = fdtdec_lookup_phandle(gd->fdt_blob,

> +					dev->of_offset, "phy-handle");

> +	if (priv->phy_of_handle > 0)

> +		priv->phyaddr = fdtdec_get_int(gd->fdt_blob,

> +					priv->phy_of_handle, "reg", -1);

>  

>  	phy_mode = fdt_getprop(gd->fdt_blob, dev->of_offset, "phy-mode", NULL);

>  	if (phy_mode)



-- 
------------------
Dan Murphy

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
diff mbox

Patch

diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index aec8077..f9b22c4 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -179,6 +179,7 @@  struct zynq_gem_priv {
 	struct zynq_gem_regs *iobase;
 	phy_interface_t interface;
 	struct phy_device *phydev;
+	int phy_of_handle;
 	struct mii_dev *bus;
 };
 
@@ -352,6 +353,10 @@  static int zynq_phy_init(struct udevice *dev)
 	priv->phydev->supported = supported | ADVERTISED_Pause |
 				  ADVERTISED_Asym_Pause;
 	priv->phydev->advertising = priv->phydev->supported;
+
+	if (priv->phy_of_handle > 0)
+		priv->phydev->dev->of_offset = priv->phy_of_handle;
+
 	phy_config(priv->phydev);
 
 	return 0;
@@ -675,7 +680,6 @@  static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_platdata(dev);
 	struct zynq_gem_priv *priv = dev_get_priv(dev);
-	int offset = 0;
 	const char *phy_mode;
 
 	pdata->iobase = (phys_addr_t)dev_get_addr(dev);
@@ -684,10 +688,11 @@  static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
 	priv->emio = 0;
 	priv->phyaddr = -1;
 
-	offset = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset,
-				       "phy-handle");
-	if (offset > 0)
-		priv->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, "reg", -1);
+	priv->phy_of_handle = fdtdec_lookup_phandle(gd->fdt_blob,
+					dev->of_offset, "phy-handle");
+	if (priv->phy_of_handle > 0)
+		priv->phyaddr = fdtdec_get_int(gd->fdt_blob,
+					priv->phy_of_handle, "reg", -1);
 
 	phy_mode = fdt_getprop(gd->fdt_blob, dev->of_offset, "phy-mode", NULL);
 	if (phy_mode)