When cold-booting the ldoio0/1 regulators are always off / the gpios are always at tristate. But when re-booting from android these are sometimes on. Disable them at axp_init time (iow as early as possible) to remove this difference between a cold boot and a reboot.

Signed-off-by: Hans de Goede hdegoede@redhat.com --- drivers/power/axp209.c | 10 +++++++++- drivers/power/axp221.c | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c index fc162a1..998e114 100644 --- a/drivers/power/axp209.c +++ b/drivers/power/axp209.c @@ -167,7 +167,15 @@ int axp_init(void) return rc; }

- return 0; + /* + * Turn off LDOIO regulators / tri-state GPIO pins, when rebooting + * from android these are sometimes on. + */ + rc |= pmic_bus_write(AXP_GPIO0_CTRL, AXP_GPIO_CTRL_INPUT); + rc |= pmic_bus_write(AXP_GPIO1_CTRL, AXP_GPIO_CTRL_INPUT); + rc |= pmic_bus_write(AXP_GPIO2_CTRL, AXP_GPIO_CTRL_INPUT); + + return rc; }

int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c index 727ab09..0d14211 100644 --- a/drivers/power/axp221.c +++ b/drivers/power/axp221.c @@ -223,7 +223,14 @@ int axp_init(void) if (!(axp_chip_id == 0x6 || axp_chip_id == 0x7 || axp_chip_id == 0x17)) return -ENODEV;

- return 0; + /* + * 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); + ret |= pmic_bus_write(AXP_GPIO1_CTRL, AXP_GPIO_CTRL_INPUT); + + return ret; }

int axp_get_sid(unsigned int *sid)