iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: hns: remove cpld-ctrl-reg and add cell in the cpld-syscon property

Browse Source 
Because cpld-ctrl-reg property is offset base on cpld-syscon property,
we make it as a cell in the cpld-syscon property.

Signed-off-by: Yisen Zhuang <yisen.zhuang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yisen.Zhuang\(Zhuangyuzeng\) 2016-04-28 15:09:01 +08:00 committed by David S. Miller
parent 494e8489db
commit 1ffdfac99f
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
View File

@ -647,6 +647,7 @@ static int hns_mac_get_info(struct hns_mac_cb *mac_cb)
{ {
struct device_node *np = mac_cb->dev->of_node; struct device_node *np = mac_cb->dev->of_node;
struct regmap *syscon; struct regmap *syscon;
struct of_phandle_args cpld_args;
u32 ret; u32 ret;
mac_cb->link = false; mac_cb->link = false;
@ -713,22 +714,23 @@ static int hns_mac_get_info(struct hns_mac_cb *mac_cb)
mac_cb->mac_id); mac_cb->mac_id);
} }
syscon = syscon_node_to_regmap( ret = of_parse_phandle_with_fixed_args(to_of_node(mac_cb->fw_port),
of_parse_phandle(to_of_node(mac_cb->fw_port), "cpld-syscon", 1, 0, &cpld_args);
"cpld-syscon", 0)); if (ret) {
if (IS_ERR_OR_NULL(syscon)) { dev_dbg(mac_cb->dev, "mac%d no cpld-syscon found.\n",
dev_dbg(mac_cb->dev, "no cpld-syscon found!\n"); mac_cb->mac_id);
mac_cb->cpld_ctrl = NULL; mac_cb->cpld_ctrl = NULL;
} else { } else {
mac_cb->cpld_ctrl = syscon; syscon = syscon_node_to_regmap(cpld_args.np);
ret = fwnode_property_read_u32(mac_cb->fw_port, if (IS_ERR_OR_NULL(syscon)) {
"cpld-ctrl-reg", dev_dbg(mac_cb->dev, "no cpld-syscon found!\n");
&mac_cb->cpld_ctrl_reg); mac_cb->cpld_ctrl = NULL;
if (ret) { } else {
dev_err(mac_cb->dev, "get cpld-ctrl-reg fail!\n"); mac_cb->cpld_ctrl = syscon;
return ret; mac_cb->cpld_ctrl_reg = cpld_args.args[0];
} }
} }
return 0; return 0;
} }