diff options
author | David S. Miller <davem@davemloft.net> | 2016-01-15 19:40:04 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-01-15 19:40:04 (GMT) |
commit | 628a96e7d3b684baf5584462de32345e997d7dbe (patch) | |
tree | 90d57803a4e5bbb6968fb42f4192530f827439d8 /drivers/net/ethernet/hisilicon/hns_mdio.c | |
parent | 9207f9d45b0ad071baa128e846d7e7ed85016df3 (diff) | |
parent | 28052e75834a84b006893735debedb8ee6b6cbc0 (diff) | |
download | linux-628a96e7d3b684baf5584462de32345e997d7dbe.tar.xz |
Merge branch 'hisi-fixes'
Kejian Yan says:
====================
dts: hisi: fixes no syscon fault when init mdio
This patchset fixes the bug that eth can't initial successful on hip05-D02
because the dts files doesn't match the source code.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hns_mdio.c')
-rw-r--r-- | drivers/net/ethernet/hisilicon/hns_mdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns_mdio.c b/drivers/net/ethernet/hisilicon/hns_mdio.c index 58c96c4..765ddb3 100644 --- a/drivers/net/ethernet/hisilicon/hns_mdio.c +++ b/drivers/net/ethernet/hisilicon/hns_mdio.c @@ -458,7 +458,7 @@ static int hns_mdio_probe(struct platform_device *pdev) } mdio_dev->subctrl_vbase = - syscon_node_to_regmap(of_parse_phandle(np, "subctrl_vbase", 0)); + syscon_node_to_regmap(of_parse_phandle(np, "subctrl-vbase", 0)); if (IS_ERR(mdio_dev->subctrl_vbase)) { dev_warn(&pdev->dev, "no syscon hisilicon,peri-c-subctrl\n"); mdio_dev->subctrl_vbase = NULL; |