Merge changes I20d3773c,I030e26cf into msm-3.4

* changes:
  msm: cpr: Update the dynamic quot calculation logic
  msm: cpr: Adjust the expanded target quot equation
diff --git a/arch/arm/mach-msm/devices-msm7x27a.c b/arch/arm/mach-msm/devices-msm7x27a.c
index c27e1de..4a6271c 100644
--- a/arch/arm/mach-msm/devices-msm7x27a.c
+++ b/arch/arm/mach-msm/devices-msm7x27a.c
@@ -1727,7 +1727,7 @@
 	uint32_t quot;
 
 	/* This formula is as per chip characterization data */
-	quot = max_quot - ((max_freq / 10 - new_freq / 10) * 9) + 20;
+	quot = max_quot - ((max_freq / 10 - new_freq / 10) * 5);
 
 	return quot;
 }
@@ -1816,7 +1816,7 @@
 	 * This formula is used since available fuse bits in the chip are not
 	 * enough to represent the value of maximum quot
 	 */
-	msm_cpr_pdata.max_quot = cpr_info->turbo_quot * 10 + 610;
+	msm_cpr_pdata.max_quot = cpr_info->turbo_quot * 10 + 600;
 
 	/**
 	 * Bits 4:0 of pvs_fuse provide mapping to the safe boot up voltage.