Kalle Jokiniemi <kalle.jokiniemi@xxxxxxxxx> writes: > OMAP 3430 ES3.1 chips have a separate bit for IO daisy-chain > wake up enabling. It needs to be enabled when entering > retention or off state, otherwise waking up might not work > in all situations. > > Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@xxxxxxxxx> Thanks, pushed after... > --- > arch/arm/mach-omap2/pm34xx.c | 37 +++++++++++++++++++++++++++++-- > arch/arm/mach-omap2/prm-regbits-34xx.h | 2 + > 2 files changed, 36 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c > index 7bbbcce..4345df1 100644 > --- a/arch/arm/mach-omap2/pm34xx.c > +++ b/arch/arm/mach-omap2/pm34xx.c > @@ -101,6 +101,34 @@ static inline void omap3_per_restore_context(void) > omap3_gpio_restore_context(); > } > > +static void omap3_enable_io_chain(void) > +{ > + int timeout = 0; > + > + if (omap_rev() >= OMAP3430_REV_ES3_1) { > + prm_set_mod_reg_bits(OMAP3430_EN_IO_CHAIN, WKUP_MOD, PM_WKEN); > + /* Do a readback to assure write has been done */ > + prm_read_mod_reg(WKUP_MOD, PM_WKEN); > + > + while (!(prm_read_mod_reg(WKUP_MOD, PM_WKST) & > + OMAP3430_ST_IO_CHAIN)) { > + timeout++; > + if (timeout > 1000) { > + printk(KERN_ERR "Wake up daisy chain " > + "activation failed.\n"); > + return; > + } > + prm_set_mod_reg_bits(OMAP3430_ST_IO_CHAIN, WKUP_MOD, PM_WKST); fixing this screwy indent. Kevin -- 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