commit f6cfb8ef4ae56839084de3a56e7702749943d610
author Linux Build Service Account <lnxbuild@localhost> Wed Dec 14 04:44:16 2011 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Wed Dec 14 04:44:16 2011 -0800
tree 9cf8ef2f94bad561625ce8a09215f39365e2ea96
parent e48e9d12b88fe767c08dd7773e2fbc808212e994
parent 6fbc00a9d585a25bd0a8a1224fa908c4964eec58

Merge "msm: clock-8960: set FORCE_PERIPH_ON in GFX3D_CC_REG" into msm-3.0

arch/arm/mach-msm/clock-8960.c

diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index d7322b6..8685919 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -5646,7 +5646,7 @@
 	rmwreg(0x80FF0000, DSI2_BYTE_CC_REG,  0xE0FF0010);
 	rmwreg(0x80FF0000, DSI_PIXEL_CC_REG,  0xE0FF0010);
 	rmwreg(0x80FF0000, DSI2_PIXEL_CC_REG, 0xE0FF0010);
-	rmwreg(0x80FF0000, GFX3D_CC_REG,      0xE0FF0010);
+	rmwreg(0xC0FF0000, GFX3D_CC_REG,      0xE0FF0010);
 	rmwreg(0x80FF0000, IJPEG_CC_REG,      0xE0FF0010);
 	rmwreg(0x80FF0000, JPEGD_CC_REG,      0xE0FF0010);
 	rmwreg(0x80FF0000, MDP_CC_REG,        0xE1FF0010);