| Message ID | 1460377108-19262-2-git-send-email-dmurphy@ti.com |
|---|---|
| State | Accepted |
| Commit | 20671a98960e7a98696bfbca1c902be6ccba013b |
| Delegated to: | Joe Hershberger |
| Headers | show |
On 11.4.2016 14:18, 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) > Tested-by: Michal Simek <michal.simek@xilinx.com> Thanks, Michal
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)
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)
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(-)