V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

sunxi: musb: Stop treating not having a vbus-det gpio as an error 

On some boards the otg is wired up in host-only mode in this case we
have no vbus-det gpio.

Stop logging an error from sunxi_usb_phy_vbus_detect() in this case, and
stop treating sunxi_usb_phy_vbus_detect() returning a negative errno, as
if a charger is plugged into the otg port.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
This commit is contained in:
Hans de Goede 2015-06-18 18:21:33 +02:00
parent 56a2085410
commit 9ecce9707b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/cpu/armv7/sunxi/usb_phy.c
View File

@ -237,10 +237,8 @@ int sunxi_usb_phy_vbus_detect(int index)
struct sunxi_usb_phy *phy = &sunxi_usb_phy[index]; struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
int err, retries = 3; int err, retries = 3;
if (phy->gpio_vbus_det < 0) { if (phy->gpio_vbus_det < 0)
eprintf("Error: invalid vbus detection pin\n");
return phy->gpio_vbus_det; return phy->gpio_vbus_det;
}
err = gpio_get_value(phy->gpio_vbus_det); err = gpio_get_value(phy->gpio_vbus_det);
/* /*

2
drivers/usb/musb-new/sunxi.c
View File

@ -208,7 +208,7 @@ static int sunxi_musb_enable(struct musb *musb)
if (is_host_enabled(musb)) { if (is_host_enabled(musb)) {
ret = sunxi_usb_phy_vbus_detect(0); ret = sunxi_usb_phy_vbus_detect(0);
if (ret) { if (ret == 1) {
printf("A charger is plugged into the OTG: "); printf("A charger is plugged into the OTG: ");
return -ENODEV; return -ENODEV;
} }