diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-03-27 21:40:20 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-04-15 16:17:17 +0200 |
| commit | 750d49f5a4d553d01c7c1c63f1a9c2d2980e81b5 (patch) | |
| tree | 5fa165a05a081f1b1558ef88f5e7c6785263a029 | |
| parent | a0e2b1b8659b041ce368ee0644a410d3ce7c1f8c (diff) | |
| download | talos-obmc-uboot-750d49f5a4d553d01c7c1c63f1a9c2d2980e81b5.tar.gz talos-obmc-uboot-750d49f5a4d553d01c7c1c63f1a9c2d2980e81b5.zip | |
sunxi: axp221: Use vbus-available rather then vbus-usable for vbus-detect
vbus-usable may not get set if power is provided through both the power barrel
connector and external 5v is also present on the otg connector, at least on
boards where vbus is also controlled through the axp221-pmic.
One way to reproduce this is to bootup an Ippo-q8h board with a usb-host
cable plugged into the otg (so that it will get powered), then unplug the
usb-host cable and plug in a charger, and then do "reset" on the u-boot
console, vbus-usable will then report 0, leading to uboot trying to provide
power to the otg port even though external 5v is present, this commit fixes
this.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
| -rw-r--r-- | drivers/power/axp221.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c index f758a75e9a..dc3a7f19bd 100644 --- a/drivers/power/axp221.c +++ b/drivers/power/axp221.c @@ -424,7 +424,7 @@ int axp_gpio_get_value(unsigned int pin) if (ret) return ret; - return !!(val & AXP221_POWER_STATUS_VBUS_USABLE); + return !!(val & AXP221_POWER_STATUS_VBUS_AVAIL); default: return -EINVAL; } |
