diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-11 08:27:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-11 08:27:55 -0400 |
| commit | 951db64186b2b9ad2e3ee30e2093deea005bdd8a (patch) | |
| tree | 044159f0c87de5022dc6d83f300e27eec2fbc1fd /drivers/phy | |
| parent | c5c657644bc35fd6b3d6e5517698721e90646b8d (diff) | |
| parent | 8af1caa23728ef689d095eec1ec4e6f1d46f50e4 (diff) | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-spi
- zap lpc32xx_ssp driver (Jagan)
- rename of phy nodev call (Jagan)
- iopoll with sleep_us (Jagan)
- MX25R6435F flash (Ye Li)
Diffstat (limited to 'drivers/phy')
| -rw-r--r-- | drivers/phy/phy-uclass.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c index 6ab78448af..1fded5ebf4 100644 --- a/drivers/phy/phy-uclass.c +++ b/drivers/phy/phy-uclass.c @@ -32,7 +32,7 @@ static int generic_phy_xlate_offs_flags(struct phy *phy, return 0; } -int generic_phy_get_by_node(ofnode node, int index, struct phy *phy) +int generic_phy_get_by_index_nodev(ofnode node, int index, struct phy *phy) { struct ofnode_phandle_args args; struct phy_ops *ops; @@ -94,7 +94,7 @@ err: int generic_phy_get_by_index(struct udevice *dev, int index, struct phy *phy) { - return generic_phy_get_by_node(dev_ofnode(dev), index, phy); + return generic_phy_get_by_index_nodev(dev_ofnode(dev), index, phy); } int generic_phy_get_by_name(struct udevice *dev, const char *phy_name, |