leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: ti: cpsw: Move cpsw_phy_sel() to _probe()

Browse Source 
cpsw_phy_sel() is a configuration step that should not be in
ofdata_to_platdata(). Add phy_sel_compat to the cpsw_platform_data
structure so that it is accessible in _probe. Then move the call of
cpsw_phy_sel() to _probe.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
This commit is contained in:
Faiz Abbas 2019-03-18 13:54:32 +05:30 committed by Tom Rini
parent 3c6add986f
commit e50f878c98
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/net/ti/cpsw.c
View File

@ -1048,16 +1048,6 @@ static void cpsw_eth_stop(struct udevice *dev)
return _cpsw_halt(priv); return _cpsw_halt(priv);
} }
static int cpsw_eth_probe(struct udevice *dev)
{
struct cpsw_priv *priv = dev_get_priv(dev);
priv->dev = dev;
return _cpsw_register(priv);
}
static const struct eth_ops cpsw_eth_ops = { static const struct eth_ops cpsw_eth_ops = {
.start = cpsw_eth_start, .start = cpsw_eth_start,
.send = cpsw_eth_send, .send = cpsw_eth_send,
@ -1188,13 +1178,25 @@ static void cpsw_phy_sel(struct cpsw_priv *priv, const char *compat,
cpsw_gmii_sel_dra7xx(priv, phy_mode); cpsw_gmii_sel_dra7xx(priv, phy_mode);
} }
static int cpsw_eth_probe(struct udevice *dev)
{
struct cpsw_priv *priv = dev_get_priv(dev);
struct eth_pdata *pdata = dev_get_platdata(dev);
priv->dev = dev;
/* Select phy interface in control module */
cpsw_phy_sel(priv, priv->data.phy_sel_compat,
pdata->phy_interface);
return _cpsw_register(priv);
}
static int cpsw_eth_ofdata_to_platdata(struct udevice *dev) static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)
{ {
struct eth_pdata *pdata = dev_get_platdata(dev); struct eth_pdata *pdata = dev_get_platdata(dev);
struct cpsw_priv *priv = dev_get_priv(dev); struct cpsw_priv *priv = dev_get_priv(dev);
struct gpio_desc *mode_gpios; struct gpio_desc *mode_gpios;
const char *phy_mode; const char *phy_mode;
const char *phy_sel_compat = NULL;
const void *fdt = gd->fdt_blob; const void *fdt = gd->fdt_blob;
int node = dev_of_offset(dev); int node = dev_of_offset(dev);
int subnode; int subnode;
@ -1315,9 +1317,9 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)
NULL)) NULL))
priv->data.rmii_clock_external = true; priv->data.rmii_clock_external = true;
phy_sel_compat = fdt_getprop(fdt, subnode, "compatible", priv->data.phy_sel_compat = fdt_getprop(fdt, subnode,
NULL); "compatible", NULL);
if (!phy_sel_compat) { if (!priv->data.phy_sel_compat) {
pr_err("Not able to get gmii_sel compatible\n"); pr_err("Not able to get gmii_sel compatible\n");
return -ENOENT; return -ENOENT;
} }
@ -1344,9 +1346,6 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)
return -EINVAL; return -EINVAL;
} }
/* Select phy interface in control module */
cpsw_phy_sel(priv, phy_sel_compat, pdata->phy_interface);
return 0; return 0;
} }

1
include/cpsw.h
View File

@ -50,6 +50,7 @@ struct cpsw_platform_data {
u32 active_slave; u32 active_slave;
bool rmii_clock_external; bool rmii_clock_external;
u8 version; u8 version;
const char *phy_sel_compat;
}; };
int cpsw_register(struct cpsw_platform_data *data); int cpsw_register(struct cpsw_platform_data *data);