Merge 33e85f52aa2deac4a29fc7ea34ce04b3a437ebd2 on remote branch

Change-Id: Iac3d73d95128ecbf03b421c6df47687dd9b1c862
diff --git a/config/neo/powerhint.xml b/config/neo/powerhint.xml
index 362e71a..e76ac6b 100644
--- a/config/neo/powerhint.xml
+++ b/config/neo/powerhint.xml
@@ -74,19 +74,13 @@
         <!--CPU-LLC-DDR BWMON - Set sample_ms 33 -->
         <!--CPU-LLC-DDR BWMON - Set io_percent 100 -->
         <!--CPU-LLC-DDR BWMON - Set hyst_length hist memory 0 -->
-        <!--L CPU - Disable schedutil PL -->
-        <!--L CPU - Set hispeed load 99 -->
-        <!--L CPU - max freq 9020000 -->
-        <!--B CPU - Disable Core Control -->
-        <!--GROUP UPMIGRATE - 35 -->
-        <!--GROUP DOWNMIGRATE - 30 -->
-        <!--UPMIGRATE - 35 85-->
-        <!--DOWNMIGRATE - 30 80-->
+        <!--CPU - Disable schedutil PL -->
+        <!--CPU - Set hispeed load 99 -->
         <!--AB_SCALE - 50-->
         <Config
             Id="0x00001330" Enable="true" Timeout="0" Target="neo_la"
             Resources="0x4183C000, 0x21, 0x41834000, 0x64, 0x41838000, 0, 0x41848000, 0xE3C88, 0x43034000, 0x21,
-            0x43020000, 0x64, 0x43024000, 0, 0x41444100, 0, 0x41440100, 0x63, 0x40804100, 0x386, 0x41008000, 0, 0x40CF4000, 0x0023001E, 0x40CE0000, 0x0023001E, 0x40CE0200, 0x00550050, 0x43048000, 0x32"/>
+            0x43020000, 0x64, 0x43024000, 0, 0x41444000, 0, 0x41440000, 0x63, 0x43048000, 0x32"/>
 
         <!--camera 30fps-->
         <!--CPU-LLC BWMON - Set sample_ms 33 -->
@@ -97,19 +91,13 @@
         <!--CPU-LLC-DDR BWMON - Set io_percent 100 -->
         <!--CPU-LLC-DDR BWMON - Set hyst_length hist memory 0 -->
         <!--CPU-LLC-DDR BWMON - Set min_freq 547 -->
-        <!--L CPU max freq 9020000 -->
-        <!--L CPU - Disable schedutil PL -->
-        <!--B CPU - Disable schedutil PL -->
-        <!--B CPU - Set hispeed load 99 -->
-        <!--UPMIGRATE - 45 85 -->
-        <!--DOWNMIGRATE - 40 85 -->
-        <!--B CPU - Disable Core Control -->
+        <!--CPU - Disable schedutil PL -->
+        <!--CPU - Set hispeed load 99 -->
         <!--AB_SCALE - 50-->
         <Config
             Id="0x00001331" Enable="true" Timeout="0" Target="neo_la"
             Resources="0x4183C000, 0x21, 0x41834000, 0x64, 0x41838000, 0, 0x41848000, 0xE3C88, 0x43034000, 0x21,
-            0x43020000, 0x64, 0x43024000, 0, 0x4303C000, 0x858B8 ,0x40804100, 0x386, 0x41444100, 0, 0x41444000, 0, 0x41440000, 0x63,
-            0x40CE0000, 0x002D0028, 0x40CE0200, 0x00550055, 0x41008000, 0, 0x43048000, 0x32"/>
+            0x43020000, 0x64, 0x43024000, 0, 0x4303C000, 0x858B8 , 0x41444000, 0, 0x41440000, 0x63, 0x43048000, 0x32"/>
 
        <!--camera 60fps-->
         <!--CPU-LLC BWMON - Set sample_ms 16 -->
@@ -392,14 +380,12 @@
 
          <!-- camera snapshot tunings-->
          <!-- MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1 -->
-         <!-- Silver cluster min freq to ~1.094 GHz -->
-         <!-- Gold cluster min freq to 1.132 GHz -->
-         <!-- MPCTLV3_SCHED_DOWNMIGRATE, 0x14 -->
-         <!-- MPCTLV3_SCHED_UPMIGRATE, 0x1E -->
+         <!-- Cluster min freq to 1.113 GHz -->
          <Config
             Id="0x00001339" Enable="true" Timeout="0" Target="neo_la"
-            Resources="0x40400000, 0x1, 0x40800100, 0x446, 0x40800000, 0x46C, 0x40CE0000, 0x001E0014"/>
+            Resources="0x40400000, 0x1, 0x40800000, 0x459"/>
 
     </Powerhint>
 </HintConfigs>
 
+