From c80ff2729361e49a8186d6dc2957acb836137dee Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Tue, 27 Jan 2009 19:44:28 -0700
Subject: [PATCH] --- yaml --- r: 137330 b: refs/heads/master c:
 be48ea74d49408c5c4f999c730d35eaf0034f273 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8ba2a2567634..ef82290cf700 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46e0ccf8ae32e53dc34a274977e2c6256b2deddc
+refs/heads/master: be48ea74d49408c5c4f999c730d35eaf0034f273
diff --git a/trunk/arch/arm/mach-omap2/powerdomains34xx.h b/trunk/arch/arm/mach-omap2/powerdomains34xx.h
index 7b63fa074b71..15c346c627dd 100644
--- a/trunk/arch/arm/mach-omap2/powerdomains34xx.h
+++ b/trunk/arch/arm/mach-omap2/powerdomains34xx.h
@@ -236,6 +236,11 @@ static struct powerdomain dss_pwrdm = {
 	},
 };
 
+/*
+ * Although the 34XX TRM Rev K Table 4-371 notes that retention is a
+ * possible SGX powerstate, the SGX device itself does not support
+ * retention.
+ */
 static struct powerdomain sgx_pwrdm = {
 	.name		  = "sgx_pwrdm",
 	.prcm_offs	  = OMAP3430ES2_SGX_MOD,
@@ -243,7 +248,7 @@ static struct powerdomain sgx_pwrdm = {
 	.wkdep_srcs	  = gfx_sgx_wkdeps,
 	.sleepdep_srcs	  = cam_gfx_sleepdeps,
 	/* XXX This is accurate for 3430 SGX, but what about GFX? */
-	.pwrsts		  = PWRSTS_OFF_RET_ON,
+	.pwrsts		  = PWRSTS_OFF_ON,
 	.pwrsts_logic_ret = PWRDM_POWER_RET,
 	.banks		  = 1,
 	.pwrsts_mem_ret	  = {