diff options
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl4030-irq.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/twl4030-power.c | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c index 9aa6d1e..1b88f33 100644 --- a/drivers/mfd/twl4030-irq.c +++ b/drivers/mfd/twl4030-irq.c @@ -671,7 +671,7 @@ int twl4030_sih_setup(struct device *dev, int module, int irq_base) irq_set_handler_data(irq, agent); agent->irq_name = kasprintf(GFP_KERNEL, "twl4030_%s", sih->name); status = request_threaded_irq(irq, NULL, handle_twl4030_sih, - IRQF_EARLY_RESUME, + 0/*IRQF_EARLY_RESUME*/, agent->irq_name ?: sih->name, NULL); dev_info(dev, "%s (irq %d) chaining IRQs %d..%d\n", sih->name, diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c index a5fd3c7..e1a722b 100644 --- a/drivers/mfd/twl4030-power.c +++ b/drivers/mfd/twl4030-power.c @@ -54,6 +54,13 @@ static u8 twl4030_start_script_address = 0x2b; #define LVL_WAKEUP 0x08 +#define STARTON_PWON BIT(0) /* power-on button */ +#define STARTON_CHG BIT(1) /* charger inserted */ +#define STARTON_USB BIT(2) /* USB plug-in */ +#define STARTON_RTC BIT(3) /* RTC alarm */ +#define STARTON_VBAT BIT(4) /* Battery plugged in */ +#define STARTON_VBUS BIT(5) /* voltage detection */ + #define ENABLE_WARMRESET (1<<4) #define END_OF_SCRIPT 0x3f @@ -233,13 +240,13 @@ static int twl4030_config_wakeup12_sequence(u8 address) if (err) goto out; - if (machine_is_omap_3430sdp() || machine_is_omap_ldp()) { + if (1) { /* Disabling AC charger effect on sleep-active transitions */ err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &data, R_CFG_P1_TRANSITION); if (err) goto out; - data &= ~(1<<1); + data &= ~(STARTON_CHG|STARTON_VBUS|STARTON_VBAT|STARTON_USB); err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, data, R_CFG_P1_TRANSITION); if (err) |