* Högander Jouni <jouni.hogander@xxxxxxxxx> [080822 08:45]:
> "ext Tony Lindgren" <tony@xxxxxxxxxxx> writes:
>
> > * Jouni Hogander <jouni.hogander@xxxxxxxxx> [080815 10:47]:
> >> This workaround shouldn't be needed when all drivers are configuring
> >> their sysconfig registers properly and using their clocks properly.
> >
> > How about the cosmetically prettified version below? This could
> > still be kept around as CONFIG_PM_DEBUG functionality even after
> > the drivers are fixed.
>
> Sounds ok to me. I don't get how PM_DEBUG option is related to this,
> but anyway ok to me.
OK will push then. PM_DEBUG option comment was just to be able to
maybe warn about debug broken drivers if idle fails or something
like that.
Tony
> >
> > Tony
> >
> >>From e37e8acd7685df9cb39f2fbc7887ba36639d5820 Mon Sep 17 00:00:00 2001
> > From: Jouni Hogander <jouni.hogander@xxxxxxxxx>
> > Date: Wed, 20 Aug 2008 14:32:46 +0300
> > Subject: [PATCH] ARM: OMAP: 34xx specific check wether any fck is active before entering sleep
> >
> > We cannot enter sleep_while_idle if some functional clocks are
> > active. Add a check for enabled functional clocks for 34xx.
> >
> > Note that this workaround could be behind CONFIG_PM_DEBUG
> > option when all drivers are configuring their sysconfig
> > registers properly and using their clocks properly.
> >
> > Signed-off-by: Jouni Hogander <jouni.hogander@xxxxxxxxx>
> > Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
> >
> > diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
> > index a57cf41..a145f80 100644
> > --- a/arch/arm/mach-omap2/pm34xx.c
> > +++ b/arch/arm/mach-omap2/pm34xx.c
> > @@ -174,10 +174,47 @@ static void omap_sram_idle(void)
> > omap2_gpio_resume_after_retention();
> > }
> >
> > +/*
> > + * Check if functional clocks are enabled before entering
> > + * sleep. This function could be behind CONFIG_PM_DEBUG
> > + * when all drivers are configuring their sysconfig registers
> > + * properly and using their clocks properly.
> > + */
> > +static int omap3_fclks_active(void)
> > +{
> > + u32 fck_core1 = 0, fck_core3 = 0, fck_sgx = 0, fck_dss = 0,
> > + fck_cam = 0, fck_per = 0, fck_usbhost = 0;
> > +
> > + fck_core1 = cm_read_mod_reg(CORE_MOD,
> > + CM_FCLKEN1);
> > + if (is_sil_rev_greater_than(OMAP3430_REV_ES1_0)) {
> > + fck_core3 = cm_read_mod_reg(CORE_MOD,
> > + OMAP3430ES2_CM_FCLKEN3);
> > + fck_sgx = cm_read_mod_reg(OMAP3430ES2_SGX_MOD,
> > + CM_FCLKEN);
> > + fck_usbhost = cm_read_mod_reg(OMAP3430ES2_USBHOST_MOD,
> > + CM_FCLKEN);
> > + } else
> > + fck_sgx = cm_read_mod_reg(GFX_MOD,
> > + OMAP3430ES2_CM_FCLKEN3);
> > + fck_dss = cm_read_mod_reg(OMAP3430_DSS_MOD,
> > + CM_FCLKEN);
> > + fck_cam = cm_read_mod_reg(OMAP3430_CAM_MOD,
> > + CM_FCLKEN);
> > + fck_per = cm_read_mod_reg(OMAP3430_PER_MOD,
> > + CM_FCLKEN);
> > + if (fck_core1 | fck_core3 | fck_sgx | fck_dss |
> > + fck_cam | fck_per | fck_usbhost)
> > + return 1;
> > + return 0;
> > +}
> > +
> > static int omap3_can_sleep(void)
> > {
> > if (!enable_dyn_sleep)
> > return 0;
> > + if (omap3_fclks_active())
> > + return 0;
> > if (atomic_read(&sleep_block) > 0)
> > return 0;
> > return 1;
>
> --
> Jouni Högander
>
--
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
