* Peter 'p2' De Schrijver <peter.de-schrijver@xxxxxxxxx> [080916 15:30]:
Pushing.
Tony
>
> Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@xxxxxxxxx>
> ---
> drivers/i2c/chips/twl4030-power.c | 25 +++++++++++++++----------
> 1 files changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
> index 195c3c4..ea8f447 100644
> --- a/drivers/i2c/chips/twl4030-power.c
> +++ b/drivers/i2c/chips/twl4030-power.c
> @@ -212,7 +216,6 @@ static int __init twl4030_write_script(u8 address, struct triton_ins *script,
> static int __init config_sleep_wake_sequence(void)
> {
> int err = 0;
> - u8 data;
>
> /*
> * CLKREQ is pulled high on the 2430SDP, therefore, we need to take
> @@ -242,14 +245,16 @@ static int __init config_sleep_wake_sequence(void)
> err |= twl4030_write_script(0x2F, sleep_off_seq,
> ARRAY_SIZE(sleep_off_seq));
>
> -#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP_3430LABRADOR)
> - /* Disabling AC charger effect on sleep-active transitions */
> - err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> - R_CFG_P1_TRANSITION);
> - data &= 0x0;
> - err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
> - R_CFG_P1_TRANSITION);
> -#endif
> + if (machine_is_omap_3430sdp() || machine_is_omap_ldp()) {
> + u8 data;
> + /* Disabling AC charger effect on sleep-active transitions */
> + err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> + R_CFG_P1_TRANSITION);
> + data &= ~(1<<1);
> + err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
> + R_CFG_P1_TRANSITION);
> + }
> +
> /* P1/P2/P3 LVL_WAKEUP should be on LEVEL */
> err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, LVL_WAKEUP,
> R_P1_SW_EVENTS);
> --
> 1.5.6.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
