Jouni, I am having some issues applying these patches. Any idea whats wrong? (Stripping trailing CRs from patch.) patching file arch/arm/mach-omap2/pm34xx.c patch: **** malformed patch at line 66: return 1; regards, Rajendra > -----Original Message----- > From: linux-omap-owner@xxxxxxxxxxxxxxx > [mailto:linux-omap-owner@xxxxxxxxxxxxxxx] On Behalf Of Jouni Hogander > Sent: Friday, August 15, 2008 1:17 PM > To: linux-omap@xxxxxxxxxxxxxxx > Subject: [PATCH 1/4] 34XX: PM: Workaround to check wether any > fck is active before entering sleep > > This workaround shouldn't be needed when all drivers are > configuring their sysconfig registers properly and using > their clocks properly. > > Signed-off-by: Jouni Hogander <jouni.hogander@xxxxxxxxx> > --- > arch/arm/mach-omap2/pm34xx.c | 37 > +++++++++++++++++++++++++++++++++++++ > 1 files changed, 37 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/pm34xx.c > b/arch/arm/mach-omap2/pm34xx.c index a57cf41..f30fa9e 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(); > } > > +/* XXX This workaround shouldn't be needed 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; > + /* XXX This workaround shouldn't be needed when all drivers are > + * configuring their sysconfig registers properly and > using their > + * clocks properly. */ > + if (omap3_fclks_active()) > + return 0; > if (atomic_read(&sleep_block) > 0) > return 0; > return 1; > -- > 1.5.5 > > -- > 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
