[1/2] ARM: DRA7: hwmod: fix gpmc hwmod
diff mbox

Message ID 1433239373-14653-2-git-send-email-rogerq@ti.com
State New
Headers show

Commit Message

Roger Quadros June 2, 2015, 10:02 a.m. UTC
GPMC smart idle is not really broken but it does not support
smart idle with wakeup.

Fixes: 556708fe8718 ("ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken")

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Paul Walmsley June 2, 2015, 9:34 p.m. UTC | #1
On Tue, 2 Jun 2015, Roger Quadros wrote:

> GPMC smart idle is not really broken but it does not support
> smart idle with wakeup.
> 
> Fixes: 556708fe8718 ("ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken")
> 
> Signed-off-by: Roger Quadros <rogerq@ti.com>

Thanks, queued for v4.2-rc fixes.

- Paul
--
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
Roger Quadros June 10, 2015, 12:44 p.m. UTC | #2
Paul,

On Tue, 2 Jun 2015 21:34:58 +0000
Paul Walmsley <paul@pwsan.com> wrote:

> On Tue, 2 Jun 2015, Roger Quadros wrote:
> 
> > GPMC smart idle is not really broken but it does not support
> > smart idle with wakeup.
> > 
> > Fixes: 556708fe8718 ("ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken")
> > 
> > Signed-off-by: Roger Quadros <rogerq@ti.com>
> 
> Thanks, queued for v4.2-rc fixes.

you might want to take v2 of the patch [1] or did you fix
the conflict yourself?

cheers,
-roger

[1] http://article.gmane.org/gmane.linux.ports.arm.omap/126730
--
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

Patch
diff mbox

diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 0e64c2f..8c2fad5 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -819,8 +819,7 @@  static struct omap_hwmod dra7xx_gpmc_hwmod = {
 	.name		= "gpmc",
 	.class		= &dra7xx_gpmc_hwmod_class,
 	.clkdm_name	= "l3main1_clkdm",
-	.flags		= (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET |
-			   HWMOD_SWSUP_SIDLE),
+	.flags		= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
 	.main_clk	= "l3_iclk_div",
 	.prcm = {
 		.omap4 = {
@@ -1421,8 +1420,7 @@  static struct omap_hwmod_class_sysconfig dra7xx_ocp2scp_sysc = {
 	.syss_offs	= 0x0014,
 	.sysc_flags	= (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE |
 			   SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
-	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
-			   SIDLE_SMART_WKUP),
+	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
 	.sysc_fields	= &omap_hwmod_sysc_type1,
 };