[U-Boot] [uboot] [PATCH v5 1/7] drivers: net: cpsw: Add reading of DT phy-handle node

[Mugunthan V N]

On Monday 11 April 2016 05:48 PM, Dan Murphy wrote:
> Add the ability to read the phy-handle node of the
> cpsw slave.  Upon reading this handle the phy-id
> can be stored based on the reg node in the DT.
> 
> The phy-handle also needs to be stored and passed
> to the phy to access any phy data that is available.
> 
> Signed-off-by: Dan Murphy <dmurphy at ti.com>
> ---
> 
> v5 - Fix checkpatch warning no spaces before tabs and typo is subject - https://patchwork.ozlabs.org/patch/608082/
> 
>  drivers/net/cpsw.c | 18 ++++++++++++++++--
>  include/cpsw.h     |  1 +
>  2 files changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c
> index 7104754..8ee33a6 100644
> --- a/drivers/net/cpsw.c
> +++ b/drivers/net/cpsw.c
> @@ -965,6 +965,9 @@ static int cpsw_phy_init(struct cpsw_priv *priv, struct cpsw_slave *slave)
>  	phydev->supported &= supported;
>  	phydev->advertising = phydev->supported;
>  
> +	if (slave->data->phy_of_handle)
> +		phydev->dev->of_offset = slave->data->phy_of_handle;

This has to be protected with ifdef CONFIG_DM_ETH as dev->of_offset is
available only in DM_ETH

Build error for non-dm-eth case
drivers/net/cpsw.c: In function ‘cpsw_phy_init’:
drivers/net/cpsw.c:970:14: error: ‘struct eth_device’ has no member
named ‘of_offset’
   phydev->dev->of_offset = slave->data->phy_of_handle;
              ^
scripts/Makefile.build:280: recipe for target 'drivers/net/cpsw.o' failed
make[1]: *** [drivers/net/cpsw.o] Error 1

> +
>  	priv->phydev = phydev;
>  	phy_config(phydev);
>  
> @@ -1217,8 +1220,19 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)
>  			if (phy_mode)
>  				priv->data.slave_data[slave_index].phy_if =
>  					phy_get_interface_by_name(phy_mode);
> -			fdtdec_get_int_array(fdt, subnode, "phy_id", phy_id, 2);
> -			priv->data.slave_data[slave_index].phy_addr = phy_id[1];
> +
> +			priv->data.slave_data[slave_index].phy_of_handle =
> +				fdtdec_lookup_phandle(fdt, subnode, "phy-handle");
> +
> +			if (priv->data.slave_data[slave_index].phy_of_handle) {
> +				priv->data.slave_data[slave_index].phy_addr =
> +					fdtdec_get_int(gd->fdt_blob,
> +						priv->data.slave_data[slave_index].phy_of_handle,
> +						"reg", -1);
> +			} else {
> +				fdtdec_get_int_array(fdt, subnode, "phy_id", phy_id, 2);
> +				priv->data.slave_data[slave_index].phy_addr = phy_id[1];
> +			}
>  			slave_index++;
>  		}
>  
> diff --git a/include/cpsw.h b/include/cpsw.h
> index cf1d30b..ff95cd8 100644
> --- a/include/cpsw.h
> +++ b/include/cpsw.h
> @@ -21,6 +21,7 @@ struct cpsw_slave_data {
>  	u32		sliver_reg_ofs;
>  	int		phy_addr;
>  	int		phy_if;
> +	int		phy_of_handle;
>  };
>  
>  enum {
>