diff options
| author | Tom Rini <trini@ti.com> | 2015-01-30 09:24:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-30 09:24:42 -0500 |
| commit | 8e3da9dd113699eed2fa05fcde3c55a2ff410913 (patch) | |
| tree | 4eb27bc3dc9f86e05dcd9f77eca18d0f061ee0a9 /drivers/usb/host/xhci-exynos5.c | |
| parent | 0f274f5376f02ccf30327bf3e5c88d26d3ea8827 (diff) | |
| parent | 85df958ce267c602a4ec5f1e41f336c5a8d3b441 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/usb/host/xhci-exynos5.c')
| -rw-r--r-- | drivers/usb/host/xhci-exynos5.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c index b4946a3f1cf..a77c8bc9193 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -40,7 +40,7 @@ struct exynos_xhci { struct exynos_usb3_phy *usb3_phy; struct xhci_hccr *hcd; struct dwc3 *dwc3_reg; - struct fdt_gpio_state vbus_gpio; + struct gpio_desc vbus_gpio; }; static struct exynos_xhci exynos; @@ -69,7 +69,8 @@ static int exynos_usb3_parse_dt(const void *blob, struct exynos_xhci *exynos) exynos->hcd = (struct xhci_hccr *)addr; /* Vbus gpio */ - fdtdec_decode_gpio(blob, node, "samsung,vbus-gpio", &exynos->vbus_gpio); + gpio_request_by_name_nodev(blob, node, "samsung,vbus-gpio", 0, + &exynos->vbus_gpio, GPIOD_IS_OUT); depth = 0; node = fdtdec_next_compatible_subnode(blob, node, @@ -298,9 +299,8 @@ int xhci_hcd_init(int index, struct xhci_hccr **hccr, struct xhci_hcor **hcor) #ifdef CONFIG_OF_CONTROL /* setup the Vbus gpio here */ - if (fdt_gpio_isvalid(&ctx->vbus_gpio) && - !fdtdec_setup_gpio(&ctx->vbus_gpio)) - gpio_direction_output(ctx->vbus_gpio.gpio, 1); + if (dm_gpio_is_valid(&ctx->vbus_gpio)) + dm_gpio_set_value(&ctx->vbus_gpio, 1); #endif ret = exynos_xhci_core_init(ctx); |