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/ehci-exynos.c | |
| parent | 0f274f5376f02ccf30327bf3e5c88d26d3ea8827 (diff) | |
| parent | 85df958ce267c602a4ec5f1e41f336c5a8d3b441 (diff) | |
| download | u-boot-8e3da9dd113699eed2fa05fcde3c55a2ff410913.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/usb/host/ehci-exynos.c')
| -rw-r--r-- | drivers/usb/host/ehci-exynos.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index 6fdbf5724f..f3c077d82e 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR; struct exynos_ehci { struct exynos_usb_phy *usb; struct ehci_hccr *hcd; - struct fdt_gpio_state vbus_gpio; + struct gpio_desc vbus_gpio; }; static struct exynos_ehci exynos; @@ -61,7 +61,8 @@ static int exynos_usb_parse_dt(const void *blob, struct exynos_ehci *exynos) exynos->hcd = (struct ehci_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, @@ -236,9 +237,8 @@ int ehci_hcd_init(int index, enum usb_init_type init, #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 setup_usb_phy(ctx->usb); |