forked from luck/tmp_suning_uos_patched
ARM: OMAP2+: omap_hwmod: Allow io_ring wakeup configuration for all modules
Some modules doesn't have SYSC_HAS_ENAWAKEUP bit available (ex: usb host uhh module) in absence of this flag omap_hwmod_enable/disable_wakeup avoids configuring pad mux wakeup capability. Configure sysc if SYSC_HAS_ENAWAKEUP is available and for other cases try enabling/disabling wakeup from mux_pad pins. Cc: Paul Walmsley <paul@pwsan.com> Cc: Kevin Hilman <khilman@ti.com> Cc: Rajendra Nayak <rnayak@ti.com> Signed-off-by: Govindraj.R <govindraj.raja@ti.com> [paul@pwsan.com: updated function kerneldoc documentation] Signed-off-by: Paul Walmsley <paul@pwsan.com>
This commit is contained in:
parent
dd775ae254
commit
2a1cc1445a
|
@ -2463,26 +2463,28 @@ int omap_hwmod_del_initiator_dep(struct omap_hwmod *oh,
|
|||
* @oh: struct omap_hwmod *
|
||||
*
|
||||
* Sets the module OCP socket ENAWAKEUP bit to allow the module to
|
||||
* send wakeups to the PRCM. Eventually this should sets PRCM wakeup
|
||||
* registers to cause the PRCM to receive wakeup events from the
|
||||
* module. Does not set any wakeup routing registers beyond this
|
||||
* point - if the module is to wake up any other module or subsystem,
|
||||
* that must be set separately. Called by omap_device code. Returns
|
||||
* -EINVAL on error or 0 upon success.
|
||||
* send wakeups to the PRCM, and enable I/O ring wakeup events for
|
||||
* this IP block if it has dynamic mux entries. Eventually this
|
||||
* should set PRCM wakeup registers to cause the PRCM to receive
|
||||
* wakeup events from the module. Does not set any wakeup routing
|
||||
* registers beyond this point - if the module is to wake up any other
|
||||
* module or subsystem, that must be set separately. Called by
|
||||
* omap_device code. Returns -EINVAL on error or 0 upon success.
|
||||
*/
|
||||
int omap_hwmod_enable_wakeup(struct omap_hwmod *oh)
|
||||
{
|
||||
unsigned long flags;
|
||||
u32 v;
|
||||
|
||||
if (!oh->class->sysc ||
|
||||
!(oh->class->sysc->sysc_flags & SYSC_HAS_ENAWAKEUP))
|
||||
return -EINVAL;
|
||||
|
||||
spin_lock_irqsave(&oh->_lock, flags);
|
||||
v = oh->_sysc_cache;
|
||||
_enable_wakeup(oh, &v);
|
||||
_write_sysconfig(v, oh);
|
||||
|
||||
if (oh->class->sysc &&
|
||||
(oh->class->sysc->sysc_flags & SYSC_HAS_ENAWAKEUP)) {
|
||||
v = oh->_sysc_cache;
|
||||
_enable_wakeup(oh, &v);
|
||||
_write_sysconfig(v, oh);
|
||||
}
|
||||
|
||||
_set_idle_ioring_wakeup(oh, true);
|
||||
spin_unlock_irqrestore(&oh->_lock, flags);
|
||||
|
||||
|
@ -2494,26 +2496,28 @@ int omap_hwmod_enable_wakeup(struct omap_hwmod *oh)
|
|||
* @oh: struct omap_hwmod *
|
||||
*
|
||||
* Clears the module OCP socket ENAWAKEUP bit to prevent the module
|
||||
* from sending wakeups to the PRCM. Eventually this should clear
|
||||
* PRCM wakeup registers to cause the PRCM to ignore wakeup events
|
||||
* from the module. Does not set any wakeup routing registers beyond
|
||||
* this point - if the module is to wake up any other module or
|
||||
* subsystem, that must be set separately. Called by omap_device
|
||||
* code. Returns -EINVAL on error or 0 upon success.
|
||||
* from sending wakeups to the PRCM, and disable I/O ring wakeup
|
||||
* events for this IP block if it has dynamic mux entries. Eventually
|
||||
* this should clear PRCM wakeup registers to cause the PRCM to ignore
|
||||
* wakeup events from the module. Does not set any wakeup routing
|
||||
* registers beyond this point - if the module is to wake up any other
|
||||
* module or subsystem, that must be set separately. Called by
|
||||
* omap_device code. Returns -EINVAL on error or 0 upon success.
|
||||
*/
|
||||
int omap_hwmod_disable_wakeup(struct omap_hwmod *oh)
|
||||
{
|
||||
unsigned long flags;
|
||||
u32 v;
|
||||
|
||||
if (!oh->class->sysc ||
|
||||
!(oh->class->sysc->sysc_flags & SYSC_HAS_ENAWAKEUP))
|
||||
return -EINVAL;
|
||||
|
||||
spin_lock_irqsave(&oh->_lock, flags);
|
||||
v = oh->_sysc_cache;
|
||||
_disable_wakeup(oh, &v);
|
||||
_write_sysconfig(v, oh);
|
||||
|
||||
if (oh->class->sysc &&
|
||||
(oh->class->sysc->sysc_flags & SYSC_HAS_ENAWAKEUP)) {
|
||||
v = oh->_sysc_cache;
|
||||
_disable_wakeup(oh, &v);
|
||||
_write_sysconfig(v, oh);
|
||||
}
|
||||
|
||||
_set_idle_ioring_wakeup(oh, false);
|
||||
spin_unlock_irqrestore(&oh->_lock, flags);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user