diff options
author | Tom Rini <trini@konsulko.com> | 2016-09-18 12:11:50 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-09-18 14:05:29 -0400 |
commit | b58d3512442357cb023bce69f55c08b9fd21beaa (patch) | |
tree | 201b24f7b5edbcbc7564517572ff1eb61f34d0cd /drivers/power/axp221.c | |
parent | a7a97fddb390b998449264a005ce32a95dfd068b (diff) | |
parent | ca7628a91136364235de8fb4bd699944b981c504 (diff) | |
download | u-boot-b58d3512442357cb023bce69f55c08b9fd21beaa.tar.gz |
Merge branch 'master' of git://www.denx.de/git/u-boot-sunxi
Diffstat (limited to 'drivers/power/axp221.c')
-rw-r--r-- | drivers/power/axp221.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c index 727ab09806..109d3f4686 100644 --- a/drivers/power/axp221.c +++ b/drivers/power/axp221.c @@ -223,6 +223,18 @@ int axp_init(void) if (!(axp_chip_id == 0x6 || axp_chip_id == 0x7 || axp_chip_id == 0x17)) return -ENODEV; + /* + * Turn off LDOIO regulators / tri-state GPIO pins, when rebooting + * from android these are sometimes on. + */ + ret = pmic_bus_write(AXP_GPIO0_CTRL, AXP_GPIO_CTRL_INPUT); + if (ret) + return ret; + + ret = pmic_bus_write(AXP_GPIO1_CTRL, AXP_GPIO_CTRL_INPUT); + if (ret) + return ret; + return 0; } |