From 437af8a18c47a62d6ed802a82f38c12158c475d7 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Wed, 6 Feb 2013 13:48:56 -0700
Subject: [PATCH] --- yaml --- r: 359837 b: refs/heads/master c:
 814a18a5d026464f56b3616704b985f9942b29a6 h: refs/heads/master i:   359835:
 6102627cf5f6072250d33d56bcfae47632ca6d29 v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dd738e6d4e65..5657993ab1f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e3d8fe771881de323396aaa1efd20243fa974cb
+refs/heads/master: 814a18a5d026464f56b3616704b985f9942b29a6
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 8bb2628df34e..ac7e03ec952f 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3493,7 +3493,12 @@ static struct omap_hwmod am35xx_emac_hwmod = {
 	.name		= "davinci_emac",
 	.mpu_irqs	= am35xx_emac_mpu_irqs,
 	.class		= &am35xx_emac_class,
-	.flags		= HWMOD_NO_IDLEST,
+	/*
+	 * According to Mark Greer, the MPU will not return from WFI
+	 * when the EMAC signals an interrupt.
+	 * http://www.spinics.net/lists/arm-kernel/msg174734.html
+	 */
+	.flags		= (HWMOD_NO_IDLEST | HWMOD_BLOCK_WFI),
 };
 
 /* l3_core -> davinci emac interface */