[U-Boot] [PATCH 2/2] sunxi: Request USB vbus gpio

[Simon Glass]

Hi Hans,

On 31 October 2014 10:23, Hans de Goede <hdegoede at redhat.com> wrote:
> This is necessary for the device-model enabled builds to work properly.
>
> Signed-off-by: Hans de Goede <hdegoede at redhat.com>

Acked-by: Simon Glass <sjg at chromium.org>

> ---
>  drivers/usb/host/ehci-sunxi.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c
> index d65e798..4befd57 100644
> --- a/drivers/usb/host/ehci-sunxi.c
> +++ b/drivers/usb/host/ehci-sunxi.c
> @@ -163,11 +163,16 @@ int ehci_hcd_init(int index, enum usb_init_type init, struct ehci_hccr **hccr,
>  {
>         struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
>         struct sunxi_ehci_hcd *sunxi_ehci = &sunxi_echi_hcd[index];
> +       int err;
>
>         /* enable common PHY only once */
>         if (index == 0)
>                 setbits_le32(&ccm->usb_clk_cfg, CCM_USB_CTRL_PHYGATE);
>
> +       err = gpio_request(sunxi_ehci->gpio_vbus, "ehci_vbus");
> +       if (err)
> +               return err;
> +
>         sunxi_ehci_enable(sunxi_ehci);
>
>         *hccr = get_io_base(sunxi_ehci->id);
> @@ -188,9 +193,14 @@ int ehci_hcd_stop(int index)
>  {
>         struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
>         struct sunxi_ehci_hcd *sunxi_ehci = &sunxi_echi_hcd[index];
> +       int err;
>
>         sunxi_ehci_disable(sunxi_ehci);
>
> +       err = gpio_free(sunxi_ehci->gpio_vbus);
> +       if (err)
> +               return err;

I suppose we could ignore this error, or at least let the function
finish before returning it. But I doubt this will ever happen.

> +
>         /* disable common PHY only once, for the last enabled hcd */
>         if (enabled_hcd_count == 1)
>                 clrbits_le32(&ccm->usb_clk_cfg, CCM_USB_CTRL_PHYGATE);
> --
> 2.1.0
>

Regards,
Simon