Merge "msm: eva: Disable hw controled power collapse" into eva-kernel.lnx.1.0

msm/eva/cvp_hfi_io.h

@@ -216,9 +216,8 @@
 #define CVP_AON_WRAPPER_MVP_NOC_LPI_CONTROL	(CVP_AON_BASE_OFFS)
 #define CVP_AON_WRAPPER_MVP_NOC_LPI_STATUS	(CVP_AON_BASE_OFFS + 0x4)
 
-#define CVP_CC_BASE_OFFS			0x000F0000
-#define CVP_CC_MVS0C_GDSCR			(CVP_CC_BASE_OFFS + 0xBF8)
-#define CVP_CC_MVS1C_GDSCR			(CVP_CC_BASE_OFFS + 0xC98)
-#define CVP_CC_MVS1C_CBCR			(CVP_CC_BASE_OFFS + 0xCD4)
-#define CVP_CC_MVS1_GDSCR			(CVP_CC_BASE_OFFS + 0xD98)
+#define CVP_CC_BASE_OFFS			0x000F8000
+#define CVP_CC_MVS1C_GDSCR			(CVP_CC_BASE_OFFS + 0x74)
+#define CVP_CC_MVS1C_CBCR			(CVP_CC_BASE_OFFS + 0x8C)
+#define CVP_CC_MVS1_GDSCR			(CVP_CC_BASE_OFFS + 0xC0)
 #endif

msm/eva/msm_cvp_debug.c

@@ -19,7 +19,7 @@ EXPORT_SYMBOL(msm_cvp_debug_out);
 
 int msm_cvp_fw_debug = 0x18;
 int msm_cvp_fw_debug_mode = 1;
-int msm_cvp_fw_low_power_mode = 1;
+int msm_cvp_fw_low_power_mode = !1;
 bool msm_cvp_fw_coverage = !true;
 bool msm_cvp_cacheop_enabled = true;
 bool msm_cvp_thermal_mitigation_disabled = !true;