Merge 5eebaf22eb4c6d2fea5e92955ca8d5916a6bc00a on remote branch

Change-Id: I8df9d662588c072f22cf24bb334782ac6bf6d717
diff --git a/config/taro/powerhint.xml b/config/taro/powerhint.xml
index e50b905..42a151a 100644
--- a/config/taro/powerhint.xml
+++ b/config/taro/powerhint.xml
@@ -430,8 +430,8 @@
             0x40804100, 0XFFF, 0x40800100, 0XFFF, 0x40800200, 0XFFF, 0x40804200, 0XFFF"/>
         <Config
             Id="0x00001337" Enable="true" Timeout="0" Target="cape"
-            Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0X6E6, 0x40800000, 0X6E6,
-            0x40804100, 0X613, 0x40800100, 0X613, 0x40800200, 0X853, 0x40804200, 0X853"/>
+            Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0XFFF, 0x40800000, 0XFFF,
+            0x40804100, 0XFFF, 0x40800100, 0XFFF, 0x40800200, 0XFFF, 0x40804200, 0XFFF"/>
 
         <!-- camera close tunings-->
         <!-- MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1 -->
@@ -448,8 +448,8 @@
             0x40804100, 0XFFF, 0x40800100, 0XFFF, 0x40800200, 0XFFF, 0x40804200, 0XFFF"/>
          <Config
             Id="0x00001338" Enable="true" Timeout="0" Target="cape"
-            Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0X6E6, 0x40800000, 0X6E6,
-            0x40804100, 0X613, 0x40800100, 0X613, 0x40800200, 0X853, 0x40804200, 0X853"/>
+            Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0XFFF, 0x40800000, 0XFFF,
+            0x40804100, 0XFFF, 0x40800100, 0XFFF, 0x40800200, 0XFFF, 0x40804200, 0XFFF"/>
 
          <!-- camera snapshot tunings-->
          <!-- MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1 -->
@@ -464,7 +464,7 @@
 
          <Config
             Id="0x00001339" Enable="true" Timeout="0" Target="cape"
-            Resources="0x40400000, 0x1, 0x40800100, 0x420, 0x40800000, 0x4B9, 0x40C20000, 0X14,
+            Resources="0x40400000, 0x1, 0x40800100, 0x46C, 0x40800000, 0x52C, 0x40C20000, 0X14,
             0x40C1C000, 0X1E"/>
 
         <!-- decode 240 fps tunings-->
@@ -797,30 +797,34 @@
         <!-- camera open tunings-->
         <!-- MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1 -->
         <!-- MPCTLV3_SCHED_BOOST, 0x1 -->
-        <!-- MPCTLV3_MAX_FREQ_CLUSTER_BIG_CORE_0, ~1.804 Ghz -->
-        <!-- MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0, ~1.804 Ghz -->
+        <!-- MPCTLV3_MAX_FREQ_CLUSTER_BIG_CORE_0, ~2.054 Ghz -->
+        <!-- MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0, ~2.054 Ghz -->
         <!-- MPCTLV3_MAX_FREQ_CLUSTER_LITTLE_CORE_0, ~1.651 Ghz -->
         <!-- MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0, ~1.651 Ghz -->
-        <!-- MPCTLV3_MIN_FREQ_CLUSTER_PLUS_CORE_0, ~2.169 Ghz -->
-        <!-- MPCTLV3_MAX_FREQ_CLUSTER_PLUS_CORE_0, ~2.169 Ghz-->
+        <!-- MPCTLV3_MIN_FREQ_CLUSTER_PLUS_CORE_0, ~2.4 Ghz -->
+        <!-- MPCTLV3_MAX_FREQ_CLUSTER_PLUS_CORE_0, ~2.4 Ghz-->
+        <!-- MPCTLV3_CPUCTL_FG_UCLAMP_LATENCY_SENSITIVE 1-->
         <Config
             Id="0x00001337" Enable="true" Timeout="0" Target="diwali"
-            Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0X70C, 0x40800000, 0X70C,
-            0x40804100, 0X673, 0x40800100, 0X673, 0x40800200, 0X879, 0x40804200, 0X879"/>
+            Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0X806, 0x40800000, 0X806,
+            0x40804100, 0X673, 0x40800100, 0X673, 0x40800200, 0X960, 0x40804200, 0X960,
+            0x40CEC000, 0x1"/>
 
         <!-- camera close tunings-->
         <!-- MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1 -->
         <!-- MPCTLV3_SCHED_BOOST, 0x1 -->
-        <!-- MPCTLV3_MAX_FREQ_CLUSTER_BIG_CORE_0,  ~1.804 Ghz -->
-         <!-- MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0, ~1.804 Ghz -->
+        <!-- MPCTLV3_MAX_FREQ_CLUSTER_BIG_CORE_0,  ~2.054 Ghz -->
+         <!-- MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0, ~2.054 Ghz -->
          <!-- MPCTLV3_MAX_FREQ_CLUSTER_LITTLE_CORE_0, ~1.651 Ghz -->
          <!-- MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0, ~1.651 Ghz -->
-         <!-- MPCTLV3_MIN_FREQ_CLUSTER_PLUS_CORE_0, ~2.169 Ghz -->
-         <!-- MPCTLV3_MAX_FREQ_CLUSTER_PLUS_CORE_0, ~2.169 Ghz -->
+         <!-- MPCTLV3_MIN_FREQ_CLUSTER_PLUS_CORE_0, ~2.4 Ghz -->
+         <!-- MPCTLV3_MAX_FREQ_CLUSTER_PLUS_CORE_0, ~2.4 Ghz -->
+         <!-- MPCTLV3_CPUCTL_FG_UCLAMP_LATENCY_SENSITIVE 1-->
          <Config
             Id="0x00001338" Enable="true" Timeout="0" Target="diwali"
-            Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0X70C, 0x40800000, 0X70C,
-            0x40804100, 0X673, 0x40800100, 0X673, 0x40800200, 0X879, 0x40804200, 0X879"/>
+            Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0X806, 0x40800000, 0X806,
+            0x40804100, 0X673, 0x40800100, 0X673, 0x40800200, 0X960, 0x40804200, 0X960,
+            0x40CEC000, 0x1"/>
 
          <!-- camera snapshot tunings-->
          <!-- MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1 -->