| Message ID | cfcae1c52efc51786878c60b75cc3c182bcd50a5.1375443858.git.afzal@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Friday 02 August 2013 07:06 PM, Afzal Mohammed wrote: > From: Vaibhav Bedia <vaibhav.bedia@ti.com> > > "65aa94b ARM: OMAP4: clockdomain/CM code: Update supported transition modes" > removed SW_SLEEP mode for clockdomains on OMAP4 class of devices. Not > having SW_SLEEP mode works fine for OMAP4/5 devices but it gets in the > way of reuse for other devices like AM43x which have the same hardware > but where most of clockdomains support only SW_SLEEP/SW_WKUP modes. > > This also can help make AM335x (which has custom functions) reuse > OMAP4 PRM/CM functions. > > While here also fixup a trivial typo in the comment. > > [afzal@ti.com: Alter message to refer to AM43x instead of AM335x, this > was pulled in from series that reuses OMAP4 PRM/CM for AM335x, which > as of now is not being followed upon] > Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com> > Signed-off-by: Afzal Mohammed <afzal@ti.com> > --- > arch/arm/mach-omap2/cminst44xx.c | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c > index f0290f5..35051fd 100644 > --- a/arch/arm/mach-omap2/cminst44xx.c > +++ b/arch/arm/mach-omap2/cminst44xx.c > @@ -237,7 +237,7 @@ void omap4_cminst_clkdm_disable_hwsup(u8 part, s16 inst, u16 cdoffs) > } > > /** > - * omap4_cminst_clkdm_force_sleep - try to take a clockdomain out of idle > + * omap4_cminst_clkdm_force_wakeup - try to take a clockdomain out of idle > * @part: PRCM partition ID that the clockdomain registers exist in > * @inst: CM instance register offset (*_INST macro) > * @cdoffs: Clockdomain register offset (*_CDOFFS macro) > @@ -250,6 +250,20 @@ void omap4_cminst_clkdm_force_wakeup(u8 part, s16 inst, u16 cdoffs) > _clktrctrl_write(OMAP34XX_CLKSTCTRL_FORCE_WAKEUP, part, inst, cdoffs); > } > > +/** > + * omap4_cminst_clkdm_force_sleep - try to put a clockdomain to idle > + * @part: PRCM partition ID that the clockdomain registers exist in > + * @inst: CM instance register offset (*_INST macro) > + * @cdoffs: Clockdomain register offset (*_CDOFFS macro) > + * > + * Put a clockdomain referred to by (@part, @inst, @cdoffs) to idle, > + * forcing it to sleep. No return value. > + */ > +void omap4_cminst_clkdm_force_sleep(u8 part, s16 inst, u16 cdoffs) > +{ > + _clktrctrl_write(OMAP34XX_CLKSTCTRL_FORCE_SLEEP, part, inst, cdoffs); I guess this won't work on omap4/5 where some clockdomains do not support SW_SLEEP and only support HW_AUTO. We might need to have different clkdm operations for the different omap4 variants. > +} > + > /* > * > */ > @@ -404,8 +418,8 @@ static int omap4_clkdm_clear_all_wkup_sleep_deps(struct clockdomain *clkdm) > > static int omap4_clkdm_sleep(struct clockdomain *clkdm) > { > - omap4_cminst_clkdm_enable_hwsup(clkdm->prcm_partition, > - clkdm->cm_inst, clkdm->clkdm_offs); > + omap4_cminst_clkdm_force_sleep(clkdm->prcm_partition, > + clkdm->cm_inst, clkdm->clkdm_offs); > return 0; > } > > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Rajendra, On Wednesday 21 August 2013 12:43 PM, Rajendra Nayak wrote: >> +void omap4_cminst_clkdm_force_sleep(u8 part, s16 inst, u16 cdoffs) >> +{ >> + _clktrctrl_write(OMAP34XX_CLKSTCTRL_FORCE_SLEEP, part, inst, cdoffs); > > I guess this won't work on omap4/5 where some clockdomains do not support > SW_SLEEP and only support HW_AUTO. We might need to have different clkdm > operations for the different omap4 variants. Yes, this has to be reworked using clockdomain flag to handle appropriately the above scenario. Regards Afzal >> static int omap4_clkdm_sleep(struct clockdomain *clkdm) >> { >> - omap4_cminst_clkdm_enable_hwsup(clkdm->prcm_partition, >> - clkdm->cm_inst, clkdm->clkdm_offs); >> + omap4_cminst_clkdm_force_sleep(clkdm->prcm_partition, >> + clkdm->cm_inst, clkdm->clkdm_offs); >> return 0; >> } >> >> > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Aug 21, 2013 at 3:13 AM, Rajendra Nayak <rnayak@ti.com> wrote: [...] >> +/** >> + * omap4_cminst_clkdm_force_sleep - try to put a clockdomain to idle >> + * @part: PRCM partition ID that the clockdomain registers exist in >> + * @inst: CM instance register offset (*_INST macro) >> + * @cdoffs: Clockdomain register offset (*_CDOFFS macro) >> + * >> + * Put a clockdomain referred to by (@part, @inst, @cdoffs) to idle, >> + * forcing it to sleep. No return value. >> + */ >> +void omap4_cminst_clkdm_force_sleep(u8 part, s16 inst, u16 cdoffs) >> +{ >> + _clktrctrl_write(OMAP34XX_CLKSTCTRL_FORCE_SLEEP, part, inst, cdoffs); > > I guess this won't work on omap4/5 where some clockdomains do not support > SW_SLEEP and only support HW_AUTO. We might need to have different clkdm > operations for the different omap4 variants. > > I am probably missing something here but doesn't omap4_clkdm_clk_disable() from where this gets invoked have the appropriate flags in place already? -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index f0290f5..35051fd 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -237,7 +237,7 @@ void omap4_cminst_clkdm_disable_hwsup(u8 part, s16 inst, u16 cdoffs) } /** - * omap4_cminst_clkdm_force_sleep - try to take a clockdomain out of idle + * omap4_cminst_clkdm_force_wakeup - try to take a clockdomain out of idle * @part: PRCM partition ID that the clockdomain registers exist in * @inst: CM instance register offset (*_INST macro) * @cdoffs: Clockdomain register offset (*_CDOFFS macro) @@ -250,6 +250,20 @@ void omap4_cminst_clkdm_force_wakeup(u8 part, s16 inst, u16 cdoffs) _clktrctrl_write(OMAP34XX_CLKSTCTRL_FORCE_WAKEUP, part, inst, cdoffs); } +/** + * omap4_cminst_clkdm_force_sleep - try to put a clockdomain to idle + * @part: PRCM partition ID that the clockdomain registers exist in + * @inst: CM instance register offset (*_INST macro) + * @cdoffs: Clockdomain register offset (*_CDOFFS macro) + * + * Put a clockdomain referred to by (@part, @inst, @cdoffs) to idle, + * forcing it to sleep. No return value. + */ +void omap4_cminst_clkdm_force_sleep(u8 part, s16 inst, u16 cdoffs) +{ + _clktrctrl_write(OMAP34XX_CLKSTCTRL_FORCE_SLEEP, part, inst, cdoffs); +} + /* * */ @@ -404,8 +418,8 @@ static int omap4_clkdm_clear_all_wkup_sleep_deps(struct clockdomain *clkdm) static int omap4_clkdm_sleep(struct clockdomain *clkdm) { - omap4_cminst_clkdm_enable_hwsup(clkdm->prcm_partition, - clkdm->cm_inst, clkdm->clkdm_offs); + omap4_cminst_clkdm_force_sleep(clkdm->prcm_partition, + clkdm->cm_inst, clkdm->clkdm_offs); return 0; }