Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-30 00:21:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

dm: sunxi: Request USB vbus gpio

Browse source 
This is necessary for the device-model enabled builds to work properly.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Hans de Goede 2014-10-31 17:04:52 +01:00
parent 967325feb2
commit 44fd5914fb
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/usb/host/ehci-sunxi.c
View file

@ -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_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
struct sunxi_ehci_hcd *sunxi_ehci = &sunxi_echi_hcd[index]; struct sunxi_ehci_hcd *sunxi_ehci = &sunxi_echi_hcd[index];
int err;
/* enable common PHY only once */ /* enable common PHY only once */
if (index == 0) if (index == 0)
setbits_le32(&ccm->usb_clk_cfg, CCM_USB_CTRL_PHYGATE); 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); sunxi_ehci_enable(sunxi_ehci);
*hccr = get_io_base(sunxi_ehci->id); *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_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
struct sunxi_ehci_hcd *sunxi_ehci = &sunxi_echi_hcd[index]; struct sunxi_ehci_hcd *sunxi_ehci = &sunxi_echi_hcd[index];
int err;
sunxi_ehci_disable(sunxi_ehci); sunxi_ehci_disable(sunxi_ehci);
err = gpio_free(sunxi_ehci->gpio_vbus);
if (err)
return err;
/* disable common PHY only once, for the last enabled hcd */ /* disable common PHY only once, for the last enabled hcd */
if (enabled_hcd_count == 1) if (enabled_hcd_count == 1)
clrbits_le32(&ccm->usb_clk_cfg, CCM_USB_CTRL_PHYGATE); clrbits_le32(&ccm->usb_clk_cfg, CCM_USB_CTRL_PHYGATE);