From: Tony Lindgren Date: Wed, 14 May 2014 01:34:04 +0000 (-0700) Subject: mfd: twl4030-power: Fix hang on reboot if sleep configuration was loaded earlier X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fc7d76e4c0dc8746f56dcd0a7d9b62ce5e759c04;p=linux-beck.git mfd: twl4030-power: Fix hang on reboot if sleep configuration was loaded earlier Looks like we can still hit the issue of wrong load order of twl4030 configuration. If we have a sleep configuration loaded, and do a warm reset, the device can hang while initializing the wakeup12 sequence. We do have a warning message about wrong order of twl4030 configuration, but in this case it does not help as the sleep configuration was loaded during the previous boot and the state of twl4030 is maintained throughout the warm reset. Fix the issue by clearing any existing sleep configuration before we load the warm reset configuration. Signed-off-by: Tony Lindgren Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c index 96162b62f3c0..1b30d8adc270 100644 --- a/drivers/mfd/twl4030-power.c +++ b/drivers/mfd/twl4030-power.c @@ -421,6 +421,12 @@ static int load_twl4030_script(struct twl4030_script *tscript, goto out; } if (tscript->flags & TWL4030_WAKEUP12_SCRIPT) { + /* Reset any existing sleep script to avoid hangs on reboot */ + err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, END_OF_SCRIPT, + R_SEQ_ADD_A2S); + if (err) + goto out; + err = twl4030_config_wakeup12_sequence(address); if (err) goto out;