openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: thunderx: bgx: Use standard firmware node infrastructure. 

In the case of OF device tree, the firmware information is attached to
the BGX device structure in the standard manner, so use the firmware
iterators and accessors where possible.

Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Sunil Goutham <sgoutham@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Daney 2016-02-11 21:50:24 +05:30 committed by David S. Miller
parent fb4b7d98a0
commit eee326fd83
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/ethernet/cavium/thunder/thunder_bgx.c
View File

@ -968,26 +968,27 @@ static int bgx_init_acpi_phy(struct bgx *bgx)
static int bgx_init_of_phy(struct bgx *bgx) static int bgx_init_of_phy(struct bgx *bgx)
{ {
struct device_node *np; struct fwnode_handle *fwn;
struct device_node *np_child;
u8 lmac = 0; u8 lmac = 0;
char bgx_sel[5];
const char *mac; const char *mac;
/* Get BGX node from DT */ device_for_each_child_node(&bgx->pdev->dev, fwn) {
snprintf(bgx_sel, 5, "bgx%d", bgx->bgx_id); struct device_node *phy_np;
np = of_find_node_by_name(NULL, bgx_sel); struct device_node *node = to_of_node(fwn);
if (!np)
return -ENODEV;
for_each_child_of_node(np, np_child) { /* If it is not an OF node we cannot handle it yet, so
struct device_node *phy_np = of_parse_phandle(np_child, * exit the loop.
"phy-handle", 0); */
if (!node)
break;
phy_np = of_parse_phandle(node, "phy-handle", 0);
if (!phy_np) if (!phy_np)
continue; continue;
bgx->lmac[lmac].phydev = of_phy_find_device(phy_np); bgx->lmac[lmac].phydev = of_phy_find_device(phy_np);
mac = of_get_mac_address(np_child); mac = of_get_mac_address(node);
if (mac) if (mac)
ether_addr_copy(bgx->lmac[lmac].mac, mac); ether_addr_copy(bgx->lmac[lmac].mac, mac);
@ -995,7 +996,7 @@ static int bgx_init_of_phy(struct bgx *bgx)
bgx->lmac[lmac].lmacid = lmac; bgx->lmac[lmac].lmacid = lmac;
lmac++; lmac++;
if (lmac == MAX_LMAC_PER_BGX) { if (lmac == MAX_LMAC_PER_BGX) {
of_node_put(np_child); of_node_put(node);
break; break;
} }
} }