Re: [PATCH] omap_hwmod: Allow io_ring wakeup configuration for all modules.
On Wed, 7 Mar 2012, Govindraj.R wrote:
From: Govindraj.R govindraj.r...@ti.com
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 p...@pwsan.com
Cc: Kevin Hilman khil...@ti.com
Cc: Rajendra Nayak rna...@ti.com
Signed-off-by: Govindraj.R govindraj.r...@ti.com
Thanks, queued for 3.4-rc. The kerneldoc documentation on the functions
has been updated to match reality; modified patch follows.
- Paul
From: Govindraj.R govindraj.r...@ti.com
Date: Wed, 4 Apr 2012 09:05:41 -0600
Subject: [PATCH] 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 p...@pwsan.com
Cc: Kevin Hilman khil...@ti.com
Cc: Rajendra Nayak rna...@ti.com
Signed-off-by: Govindraj.R govindraj.r...@ti.com
[p...@pwsan.com: updated function kerneldoc documentation]
Signed-off-by: Paul Walmsley p...@pwsan.com
---
arch/arm/mach-omap2/omap_hwmod.c | 56 --
1 file changed, 30 insertions(+), 26 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index eba6cd3..5a68010 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -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)) {
+
Re: [PATCH] omap_hwmod: Allow io_ring wakeup configuration for all modules.
On Wed, Mar 7, 2012 at 7:40 PM, Raja, Govindraj govindraj.r...@ti.com wrote:
On Wed, Mar 7, 2012 at 5:49 PM, Govindraj.R govindraj.r...@ti.com wrote:
[...]
From b3aa1dac5909cad1b959f5b97bbf408b2f974060 Mon Sep 17 00:00:00 2001
From: Govindraj.R govindraj.r...@ti.com
Date: Wed, 7 Mar 2012 17:14:02 +0530
Subject: [PATCH] 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 p...@pwsan.com
Cc: Kevin Hilman khil...@ti.com
Cc: Rajendra Nayak rna...@ti.com
Signed-off-by: Govindraj.R govindraj.r...@ti.com
---
Gentle Ping.
--
Thanks,
Govindraj.R
arch/arm/mach-omap2/omap_hwmod.c | 30 --
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c
b/arch/arm/mach-omap2/omap_hwmod.c
index eba6cd3..9605fad 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2475,14 +2475,15 @@ 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);
@@ -2506,14 +2507,15 @@ 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);
--
1.7.5.4
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] omap_hwmod: Allow io_ring wakeup configuration for all modules.
From: Govindraj.R govindraj.r...@ti.com
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 p...@pwsan.com
Cc: Kevin Hilman khil...@ti.com
Cc: Rajendra Nayak rna...@ti.com
Signed-off-by: Govindraj.R govindraj.r...@ti.com
---
arch/arm/mach-omap2/omap_hwmod.c | 30 --
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index eba6cd3..89582df 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2475,14 +2475,15 @@ 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);
@@ -2506,14 +2507,15 @@ 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);
--
1.7.5.4
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] omap_hwmod: Allow io_ring wakeup configuration for all modules.
On Wed, Mar 7, 2012 at 5:49 PM, Govindraj.R govindraj.r...@ti.com wrote:
From: Govindraj.R govindraj.r...@ti.com
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 p...@pwsan.com
Cc: Kevin Hilman khil...@ti.com
Cc: Rajendra Nayak rna...@ti.com
Signed-off-by: Govindraj.R govindraj.r...@ti.com
---
arch/arm/mach-omap2/omap_hwmod.c | 30 --
1 files changed, 16 insertions(+), 14 deletions(-)
[...]
@@ -2506,14 +2507,15 @@ 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)) {
This condition check should have been _and_ ()
sorry for the typo,
Here [1] is the updated patch.
--
Thanks,
Govindraj.R
[1]:
From b3aa1dac5909cad1b959f5b97bbf408b2f974060 Mon Sep 17 00:00:00 2001
From: Govindraj.R govindraj.r...@ti.com
Date: Wed, 7 Mar 2012 17:14:02 +0530
Subject: [PATCH] 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 p...@pwsan.com
Cc: Kevin Hilman khil...@ti.com
Cc: Rajendra Nayak rna...@ti.com
Signed-off-by: Govindraj.R govindraj.r...@ti.com
---
arch/arm/mach-omap2/omap_hwmod.c | 30 --
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index eba6cd3..9605fad 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2475,14 +2475,15 @@ 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);
@@ -2506,14 +2507,15 @@ 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);
--
1.7.5.4
0001-omap_hwmod-Allow-io_ring-wakeup-configuration-for-al.patch
Description: Binary data
