"Govindraj.R" <govindraj.raja@xxxxxx> writes: > For device pads which have OMAP_DEVICE_PAD_WAKEUP set (which means they > are wakeup capable) enable the IO-daisy wakeup capability. > During re-muxing avoid direct write with val as this can disturb if any > mux done at bootloader level so read the pad then write back. > > Also add an API to fetch the wake-up status bit is set for given omap-hwmod > device using available mux info which is added during omap_hwmod_mux_init. > Wakeup status bit is needed for uart_resume_idle call from sram_idle path > based on wake-up event has occurred for given uart we can enable clocks back. > > Signed-off-by: Rajendra Nayak <rnayak@xxxxxx> > Signed-off-by: Govindraj.R <govindraj.raja@xxxxxx> Another issue with this patch... This actually is a change in behavior from the previous code. The current code (albiet hacky) only enables IO-ring wakeups when device_may_wakeup() == true. This code should probably also do the same. Kevin > --- > arch/arm/mach-omap2/mux.c | 28 ++++++++++++++++++++++++++ > arch/arm/mach-omap2/mux.h | 13 ++++++++++++ > arch/arm/mach-omap2/omap_hwmod.c | 13 ++++++++++++ > arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 + > 4 files changed, 55 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c > index 98148b6..50edcea 100644 > --- a/arch/arm/mach-omap2/mux.c > +++ b/arch/arm/mach-omap2/mux.c > @@ -317,6 +317,29 @@ err1: > return NULL; > } > > +/* Gets the wakeup status of given pad from omap-hwmod */ > +int omap_hwmod_mux_wakeup(struct omap_hwmod_mux_info *hmux) > +{ > + int i; > + unsigned int val; > + u8 ret = 0; > + > + for (i = 0; i < hmux->nr_pads; i++) { > + struct omap_device_pad *pad = &hmux->pads[i]; > + > + if (pad->flags & OMAP_DEVICE_PAD_WAKEUP) { > + val = omap_mux_read(pad->partition, > + pad->mux->reg_offset); > + if (val & OMAP_WAKEUP_EVENT) { > + ret = 1; > + break; > + } > + } > + } > + > + return ret; > +} > + > /* Assumes the calling function takes care of locking */ > void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state) > { > @@ -342,6 +365,9 @@ void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state) > break; > flags &= ~OMAP_DEVICE_PAD_ENABLED; > val = pad->idle; > + if (flags & OMAP_DEVICE_PAD_WAKEUP) > + val |= OMAP_WAKEUP_EN; > + > pr_debug("%s: Idling %s %x\n", __func__, > pad->name, val); > break; > @@ -358,6 +384,8 @@ void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state) > }; > > if (val >= 0) { > + val |= omap_mux_read(pad->partition, > + pad->mux->reg_offset); > omap_mux_write(pad->partition, val, > pad->mux->reg_offset); > pad->flags = flags; > diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h > index a4ab17a..84a8fc2 100644 > --- a/arch/arm/mach-omap2/mux.h > +++ b/arch/arm/mach-omap2/mux.h > @@ -220,8 +220,21 @@ omap_hwmod_mux_init(struct omap_device_pad *bpads, int nr_pads); > */ > void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state); > > + > +/** > + * omap_hwmod_mux_wakeup - omap hwmod check given pad had wakeup event > + * @hmux: Pads for a hwmod > + * > + * Called only from omap_hwmod.c, do not use. > + */ > +int omap_hwmod_mux_wakeup(struct omap_hwmod_mux_info *hmux); > #else > > +static inline int omap_hwmod_mux_wakeup(struct omap_hwmod_mux_info *hmux) > +{ > + return 0; > +} > + > static inline int omap_mux_init_gpio(int gpio, int val) > { > return 0; > diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c > index 9e89a58..893dae1 100644 > --- a/arch/arm/mach-omap2/omap_hwmod.c > +++ b/arch/arm/mach-omap2/omap_hwmod.c > @@ -2239,3 +2239,16 @@ u32 omap_hwmod_get_context_loss_count(struct omap_hwmod *oh) > > return ret; > } > + > +/** > + * omap_hwmod_pad_wakeup_status - get pad wakeup status if mux is available. > + * @oh: struct omap_hwmod * > + * > + * Returns the wake_up status bit of available pad mux pin. > + */ > +int omap_hmwod_pad_wakeup_status(struct omap_hwmod *oh) > +{ > + if (oh->mux) > + return omap_hwmod_mux_wakeup(oh->mux); > + return -EINVAL; > +} > diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h > index fedd829..4100be0 100644 > --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h > +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h > @@ -588,6 +588,7 @@ int omap_hwmod_for_each_by_class(const char *classname, > int omap_hwmod_set_postsetup_state(struct omap_hwmod *oh, u8 state); > u32 omap_hwmod_get_context_loss_count(struct omap_hwmod *oh); > > +int omap_hmwod_pad_wakeup_status(struct omap_hwmod *oh); > /* > * Chip variant-specific hwmod init routines - XXX should be converted > * to use initcalls once the initial boot ordering is straightened out -- 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