diff options
| author | Tom Rini <[email protected]> | 2020-05-11 08:27:55 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-05-11 08:27:55 -0400 |
| commit | 951db64186b2b9ad2e3ee30e2093deea005bdd8a (patch) | |
| tree | 044159f0c87de5022dc6d83f300e27eec2fbc1fd /arch | |
| 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 'arch')
| -rw-r--r-- | arch/arm/mach-meson/board-gx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index 3da99017a5a..b591c924ead 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -183,7 +183,8 @@ int board_usb_init(int index, enum usb_init_type init) /* get the PHYs */ for (i = 0; i < 2; i++) { - ret = generic_phy_get_by_node(dwc2_node, i, &usb_phys[i]); + ret = generic_phy_get_by_index_nodev(dwc2_node, i, + &usb_phys[i]); if (ret && ret != -ENOENT) { pr_err("Failed to get USB PHY%d for %s\n", i, ofnode_get_name(dwc2_node)); |