Merge tag 'LA.UM.9.12.r1-16200-SMxx50.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/power into lineage-21.0

"LA.UM.9.12.r1-16200-SMxx50.QSSI12.0"

* tag 'LA.UM.9.12.r1-16200-SMxx50.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/power:
  power: Modify powerhint for encode case
  power: Enable powerhint for khaje
  Power: Specify stable AIDL version number
  Power:Changes made for Bengal powerhint.xml
  Power: Correcting target name in powerhint.xml
  Power : Clean up of opcodes in powerhints
  power: add check for shared pointer
  Kona Powerhint: Change the VR hints
  qvr powerhints
  Power: update powerhint for Single rank DDR
  Power : Modified make file to include Trinket
  Power : AIDL support for Trinket
  power: update power hint data for lagoon
  Power: Tuned  scheduler for  480FPS use-case
  Power : Modified make file to include Bengal
  power: update power hint data for lagoon
  Power: Updating camera settings
  Power: Updating camera settings
  power : Modified make file to include Talos
  power: Add supported modes
  power: Add supported modes
  power: Added copyrights info in xml.
  power: conversion from hidl to aidl.
  power: Added copyrights info in xml
  Power: Up/down scheduler Tuning for  480FPS use-case
  power : opcode for sample_ms

 Conflicts:
	Android.mk
	Power.cpp
	power-vendor-product.mk
	power.xml

Change-Id: Ic5b9e4380c940cacf06183b3613a60e2b3404d6f
diff --git a/config/atoll/powerhint.xml b/config/atoll/powerhint.xml
index 712f38d..989b4c8 100644
--- a/config/atoll/powerhint.xml
+++ b/config/atoll/powerhint.xml
@@ -51,7 +51,7 @@
             Id="0x00001331" Enable="true" Timeout="0" Target="atoll"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4143C100, 0x3F9, 0x41440100, 0x5F, 0x4181C000, 0xC8, 0x41830000, 0, 0x4300C000, 0x14, 0x4182C000, 0, 0x41000100, 6, 0x41808000, 100"/>
+            0x4143C100, 0x3F9, 0x41440100, 0x5F, 0x4181C000, 0xC8, 0x41830000, 0, 0x43034000, 0x14, 0x4182C000, 0, 0x41000100, 6, 0x41808000, 100"/>
 
         <!-- camera 60 FPS -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -70,7 +70,7 @@
             Id="0x00001332" Enable="true" Timeout="0" Target="atoll"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4181C000, 0xC8, 0x41830000, 0, 0x4300C000, 0x14, 0x4182C000, 0, 0x41000100, 6, 0x41808000, 100"/>
+            0x4181C000, 0xC8, 0x41830000, 0, 0x43034000, 0x14, 0x4182C000, 0, 0x41000100, 6, 0x41808000, 100"/>
 
         <!-- camera HFR -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -89,7 +89,7 @@
             Id="0x00001333" Enable="true" Timeout="0" Target="atoll"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4181C000, 0xC8, 0x41830000, 0, 0x4300C000, 0x14, 0x4182C000, 0, 0x41000100, 6, 0x41808000, 100"/>
+            0x4181C000, 0xC8, 0x41830000, 0, 0x43034000, 0x14, 0x4182C000, 0, 0x41000100, 6, 0x41808000, 100"/>
 
         <!-- HFR 480fps -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -109,7 +109,7 @@
             Id="0x00001334" Enable="true" Timeout="0" Target="atoll"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4181C000, 0xC8, 0x41830000, 0, 0x4300C000, 0x14, 0x40800100, 0x4B9, 0x4182C000, 0, 0x41000100, 6, 0x41808000, 100"/>
+            0x4181C000, 0xC8, 0x41830000, 0, 0x43034000, 0x14, 0x40800100, 0x4B9, 0x4182C000, 0, 0x41000100, 6, 0x41808000, 100"/>
 
         <!-- same settings for all the qvr power levels intentionally -->
         <!-- qvr level cpu1 gpu1 -->
diff --git a/config/bengal/powerhint.xml b/config/bengal/powerhint.xml
new file mode 100644
index 0000000..d8e590c
--- /dev/null
+++ b/config/bengal/powerhint.xml
@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<!--
+/*  Copyright (c) 2016-2021,The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *     * Neither the name of The Linux Foundation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-->
+<HintConfigs>
+    <Powerhint>
+
+        <!-- camera 30fps and camera preview -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--L CPU CORE 6 SCHED LOAD BOOST -->
+        <!--L CPU CORE 7 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 1017Mhz -->
+        <!--L CLUSTER_LITTLE - Set hispeed load 95 -->
+        <!--L CLUSTER_BIG - Set hispeed load 95 -->
+        <!--CPUBW HWMON - Set sample_ms 50 -->
+        <!--CPUBW HWMON - Set io_percent 100 -->
+        <!--CPUBW HWMON - Set up_scale 0 -->
+        <!--L CPU - Cluster min freq ~800mhz -->
+        <!-- SCHED_PREFER_SPREAD 2 -->
+        <Config
+            Id="0x00001331" Enable="true" Timeout="0" Target="bengal"
+            Resources="0x40C68100, -20, 0x40C68110, -20, 0x40C68120, -20,
+            0x40C68130, -20, 0x40C68000, -20, 0x40C68010, -20, 0x40C68020, -20, 0x40C68030, -20,
+            0x4143C100, 1017, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x32, 0x41808000, 0x64, 0x43014000, 0x0, 0x40800100, 0x386"/>
+
+        <Config
+            Id="0x00001331" Enable="true" Timeout="0" Target="scuba"
+            Resources="0x40C68000, -20, 0x40C68010, -20, 0x40C68020, -20,
+            0x40C68030, -20, 0x4143C000, 1017, 0x41440000, 0x5F, 0x41820000, 0x32, 0x41808000, 0x64, 0x43014000, 0x0"/>
+
+        <Config
+            Id="0x00001331" Enable="true" Timeout="0" Target="khaje"
+            Resources="0x40C68100, -20, 0x40C68110, -20, 0x40C68120, -20,
+            0x40C68130, -20, 0x40C68000, -20, 0x40C68010, -20, 0x40C68020, -20, 0x40C68030, -20,
+            0x4143C100, 1190, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x32, 0x41808000, 0x64, 0x43014000, 0x0, 0x40800100, 0x3AC, 0x40CA8000, 2"/>
+
+        <!-- camera 60 FPS -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--L CPU CORE 6 SCHED LOAD BOOST -->
+        <!--L CPU CORE 7 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 1017Mhz -->
+        <!--L CLUSTER_LITTLE - Set hispeed load 95 -->
+        <!--L CLUSTER_BIG - Set hispeed load 95 -->
+        <!--CPUBW HWMON - Set sample_ms 20 -->
+        <!--L CPU - Cluster min freq ~1Ghz -->
+        <Config
+            Id="0x00001332" Enable="true" Timeout="0" Target="bengal"
+            Resources="0x40C68100, -25, 0x40C68110, -25, 0x40C68120, -25,
+            0x40C68130, -25, 0x40C68000, -25, 0x40C68010, -25, 0x40C68020, -25, 0x40C68030, -25,
+            0x4143C100, 1017, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x14, 0x40800100, 0x420"/>
+
+        <Config
+            Id="0x00001332" Enable="true" Timeout="0" Target="scuba"
+            Resources="0x40C68000, -25, 0x40C68010, -25, 0x40C68020, -25,
+            0x40C68030, -25, 0x4143C000, 1017, 0x41440000, 0x5F, 0x41820000, 0x14"/>
+
+        <Config
+            Id="0x00001332" Enable="true" Timeout="0" Target="khaje"
+            Resources="0x40C68100, -25, 0x40C68110, -25, 0x40C68120, -25,
+            0x40C68130, -25, 0x40C68000, -25, 0x40C68010, -25, 0x40C68020, -25, 0x40C68030, -25,
+            0x4143C100, 1190, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x14, 0x40800100, 0x4A6, 0x40CA8000, 2"/>
+
+        <!-- camera HFR -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--L CPU CORE 6 SCHED LOAD BOOST -->
+        <!--L CPU CORE 7 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 1017Mhz -->
+        <!--L CLUSTER_LITTLE - Set hispeed load 95 -->
+        <!--L CLUSTER_BIG - Set hispeed load 95 -->
+        <!--CPUBW HWMON - Set sample_ms 20 -->
+        <!--L CPU - Cluster min freq ~1Ghz -->
+        <Config
+            Id="0x00001333" Enable="true" Timeout="0" Target="bengal"
+            Resources="0x40C68100, -10, 0x40C68110, -10, 0x40C68120, -10,
+            0x40C68130, -10, 0x40C68000, -10, 0x40C68010, 10, 0x40C68020, -10, 0x40C68030, -10,
+            0x4143C100, 1017, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x14, 0x40800100, 0x420"/>
+
+       <Config
+            Id="0x00001333" Enable="true" Timeout="0" Target="scuba"
+            Resources="0x40C68000, -10, 0x40C68010, -10, 0x40C68020, -10,
+            0x40C68030, -10, 0x4143C000, 1017, 0x41440000, 0x5F, 0x41820000, 0x14"/>
+
+        <Config
+            Id="0x00001333" Enable="true" Timeout="0" Target="khaje"
+            Resources="0x40C68100, -10, 0x40C68110, -10, 0x40C68120, -10,
+            0x40C68130, -10, 0x40C68000, -10, 0x40C68010, 10, 0x40C68020, -10, 0x40C68030, -10,
+            0x4143C100, 1190, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x14, 0x40800100, 0x4A6"/>
+
+        <!-- HFR 480fps -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--L CPU CORE 6 SCHED LOAD BOOST -->
+        <!--L CPU CORE 7 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 1017Mhz -->
+        <!--L CLUSTER_LITTLE - Set hispeed load 95 -->
+        <!--L CLUSTER_BIG - Set hispeed load 95 -->
+        <!--CPUBW HWMON - Set sample_ms 20 -->
+        <Config
+            Id="0x00001334" Enable="true" Timeout="0" Target="bengal"
+            Resources="0x40C68100, -10, 0x40C68110, -10, 0x40C68120, -10,
+            0x40C68130, -10, 0x40C68000, -10, 0x40C68010, -10, 0x40C68020, -10, 0x40C68030, -10,
+            0x4143C100, 1017, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x14"/>
+
+        <Config
+            Id="0x00001334" Enable="true" Timeout="0" Target="scuba"
+            Resources="0x40C68000, -10, 0x40C68010, -10, 0x40C68020, -10,
+            0x40C68030, -10, 0x4143C000, 1017, 0x41440000, 0x5F, 0x41820000, 0x14"/>
+
+        <Config
+            Id="0x00001334" Enable="true" Timeout="0" Target="khaje"
+            Resources="0x40C68100, -10, 0x40C68110, -10, 0x40C68120, -10,
+            0x40C68130, -10, 0x40C68000, -10, 0x40C68010, -10, 0x40C68020, -10, 0x40C68030, -10,
+            0x4143C100, 1190, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x14"/>
+
+        <!-- camera 30fps encode Single rank DDR -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--L CPU CORE 6 SCHED LOAD BOOST -->
+        <!--L CPU CORE 7 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 1017Mhz -->
+        <!--L CLUSTER_LITTLE - Set hispeed load 95 -->
+        <!--L CLUSTER_BIG - Set hispeed load 95 -->
+        <!--CPUBW HWMON - Set sample_ms 50 -->
+        <!--CPUBW HWMON - Set io_percent 100 -->
+        <!--CPUBW HWMON - Set up_scale 0 -->
+        <!--CPUBW MINFREQ - Max value -->
+        <!-- B CPU - Cluster min freq ~.1.536 Ghz -->
+        <!-- L CPU - Cluster min freq ~.1.420 Ghz -->
+        <Config
+            Id="0x00001335" Enable="true" Timeout="0" Target="bengal"
+            Resources="0x40C68100, -20, 0x40C68110, -20, 0x40C68120, -20,
+            0x40C68130, -20, 0x40C68000, -20, 0x40C68010, -20, 0x40C68020, -20, 0x40C68030, -20,
+            0x4143C100, 0x3F9, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x32, 0x41808000, 0x64, 0x43014000, 0x0,
+            0x41800000, 0xFF, 0x40800000, 0x600, 0x40800100, 0x58C, 0x40CA8000, 0x2"/>
+        <Config
+            Id="0x00001335" Enable="true" Timeout="0" Target="khaje"
+            Resources="0x40C68100, -20, 0x40C68110, -20, 0x40C68120, -20,
+            0x40C68130, -20, 0x40C68000, -20, 0x40C68010, -20, 0x40C68020, -20, 0x40C68030, -20,
+            0x4143C100, 0x3F9, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x32, 0x41808000, 0x64, 0x43014000, 0x0,
+            0x41800000, 0xFF, 0x40800000, 0x600, 0x40800100, 0x686, 0x40CA8000, 0x793"/>
+
+        <!-- camera 60 FPS Single rank DDR -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--L CPU CORE 6 SCHED LOAD BOOST -->
+        <!--L CPU CORE 7 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 1017Mhz -->
+        <!--L CLUSTER_LITTLE - Set hispeed load 95 -->
+        <!--L CLUSTER_BIG - Set hispeed load 95 -->
+        <!--CPUBW HWMON - Set sample_ms 20 -->
+        <!--CPUBW MINFREQ - Max value -->
+        <Config
+            Id="0x00001336" Enable="true" Timeout="0" Target="bengal"
+            Resources="0x40C68100, -25, 0x40C68110, -25, 0x40C68120, -25,
+            0x40C68130, -25, 0x40C68000, -25, 0x40C68010, -25, 0x40C68020, -25, 0x40C68030, -25,
+            0x4143C100, 0x3F9, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x14, 0x41800000, 0xFF, 0x40CA8000, 0x2"/>
+        <Config
+            Id="0x00001336" Enable="true" Timeout="0" Target="khaje"
+            Resources="0x40C68100, -25, 0x40C68110, -25, 0x40C68120, -25,
+            0x40C68130, -25, 0x40C68000, -25, 0x40C68010, -25, 0x40C68020, -25, 0x40C68030, -25,
+            0x4143C100, 0x3F9, 0x41440100, 0x5F, 0x41440000, 0x5F, 0x41820000, 0x14, 0x41800000, 0xFF, 0x40CA8000, 0x2"/>
+
+        <!-- same settings for all the qvr power levels intentionally -->
+        <!-- qvr level cpu1 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130A" Enable="true" Target="bengal" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+        <Config
+            Id="0x0000130A" Enable="true" Target="khaje" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu1 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130B" Enable="true" Target="bengal" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+        <Config
+            Id="0x0000130B" Enable="true" Target="khaje" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu1 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130C" Enable="true" Target="bengal" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+        <Config
+            Id="0x0000130C" Enable="true" Target="khaje" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu2 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130D" Enable="true" Target="bengal" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+        <Config
+            Id="0x0000130D" Enable="true" Target="khaje" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu2 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130E" Enable="true" Target="bengal" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+        <Config
+            Id="0x0000130E" Enable="true" Target="khaje" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu2 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130F" Enable="true" Target="bengal" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+        <Config
+            Id="0x0000130F" Enable="true" Target="khaje" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu3 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001310" Enable="true" Target="bengal" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+        <Config
+            Id="0x00001310" Enable="true" Target="khaje" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu3 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001311" Enable="true" Target="bengal" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+        <Config
+            Id="0x00001311" Enable="true" Target="khaje" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+        <!-- qvr level cpu3 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001312" Enable="true" Target="bengal" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+        <Config
+            Id="0x00001312" Enable="true" Target="khaje" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+         <!-- sustained performance -->
+         <!-- B CPU - Cluster min freq uncapped -->
+         <!-- L CPU - Cluster min freq uncapped -->
+         <!-- B CPU - Cluster max freq ~1.22 GHz -->
+         <!-- L CPU - Cluster max freq ~1.22 Ghz -->
+         <!-- GPU - min freq 275Mhz -->
+         <!-- GPU - max freq 400Mhz -->
+         <!-- GPUBW freq uncapped -->
+         <Config
+             Id="0x00001206" Enable="true" Timeout="0" Target="bengal"
+             Resources="0x40800000, 0x0, 0x40800100, 0x0, 0x40804000, 0x4CC, 0x40804100, 0x4CC,
+             0X4280C000, 0x113, 0X42810000, 0x190, 0x42814000, 0x0"/>
+         <Config
+             Id="0x00001206" Enable="true" Timeout="0" Target="khaje"
+             Resources="0x40800000, 0x0, 0x40800100, 0x0, 0x40804000, 0x4CC, 0x40804100, 0x4CC,
+             0X4280C000, 0x113, 0X42810000, 0x190, 0x42814000, 0x0"/>
+
+         <!-- vr mode -->
+         <!-- B CPU - Cluster min freq ~1.22 Ghz -->
+         <!-- L CPU - Cluster min freq ~0.940 Ghz -->
+         <!-- B CPU - Cluster max freq ~1.90 Ghz -->
+         <!-- L CPU - Cluster max freq ~1.70 Ghz -->
+         <!-- GPU - min freq 275Mhz -->
+         <!-- GPU - max freq 625Mhz -->
+         <!-- GPUBW uncapped -->
+         <Config
+             Id="0x00001207" Enable="true" Timeout="0" Target="bengal"
+             Resources="0x40800000, 0x4CC, 0x40800100, 0x3AC, 0x40804000, 0x76C, 0x40804100, 0x6C0,
+             0X4280C000, 0x113, 0X4280C000, 0x271, 0x42814000, 0x0"/>
+         <Config
+             Id="0x00001207" Enable="true" Timeout="0" Target="khaje"
+             Resources="0x40800000, 0x4CC, 0x40800100, 0x3AC, 0x40804000, 0x76C, 0x40804100, 0x6C0,
+             0X4280C000, 0x113, 0X4280C000, 0x271, 0x42814000, 0x0"/>
+
+         <!-- vr mode sustained performance -->
+         <!-- B CPU - Cluster min freq ~1.22 Ghz -->
+         <!-- L CPU - Cluster min freq ~1.22 Ghz -->
+         <!-- B CPU - Cluster max freq ~1.22 Ghz -->
+         <!-- L CPU - Cluster max freq ~1.22 Ghz -->
+         <!-- GPU - min freq 400Mhz -->
+         <!-- GPU - max freq 400Mhz -->
+         <!-- GPUBW uncapped  -->
+         <Config
+             Id="0x00001301" Enable="true" Timeout="0" Target="bengal"
+             Resources="0x40800000, 0x4CC, 0x40800100, 0x4CC, 0x40804000, 0x4CC, 0x40804100, 0x4CC,
+             0X4280C000, 0x190, 0X42810000, 0x190, 0x42814000, 0x0"/>
+         <Config
+             Id="0x00001301" Enable="true" Timeout="0" Target="khaje"
+             Resources="0x40800000, 0x4CC, 0x40800100, 0x4CC, 0x40804000, 0x4CC, 0x40804100, 0x4CC,
+             0X4280C000, 0x190, 0X42810000, 0x190, 0x42814000, 0x0"/>
+
+    </Powerhint>
+</HintConfigs>
+
+
diff --git a/config/kona/powerhint.xml b/config/kona/powerhint.xml
index 4bc9ee7..d578320 100644
--- a/config/kona/powerhint.xml
+++ b/config/kona/powerhint.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <!--
-/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -50,23 +50,160 @@
             Id="0x00001301" Enable="true" Target="kona"
             Resources=""/>
 
+        <!-- same settings for all the VR power levels intentionally -->
+
         <!-- qvr level cpu1 gpu1 -->
         <!-- B CPU - Cluster min freq ~.864 Ghz -->
-        <!-- B CPU - Cluster max freq ~.2.016 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.016 Ghz -->
         <!-- L CPU - Cluster min freq ~.576 Ghz -->
-        <!-- L CPU - Cluster max freq ~1.267 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.804 Ghz -->
         <!-- P CPU - PRIME CPU min freq ~.941 Ghz-->
         <!-- P CPU - PRIME CPU max freq ~2.054Ghz -->
-        <!-- GPU - min pwrlevel 5 (freq 215 Mhz) -->
-        <!-- GPU - max pwrlevel 0 (freq 600 Mhz) -->
+        <!-- GPU - min pwrlevel 5 (freq 305 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 587 Mhz) -->
         <!-- Min Big CPUs 3 -->
         <!-- Min Prime CPUs 1 -->
         <!-- Idefinite Duration -->
         <Config
             Id="0x0000130A" Enable="true" Target="kona" Timeout="0"
-            Resources="0x40800000, 0x360, 0x40804000, 0x7E0, 0x40800100, 0x240,
-            0x40804100, 0x4F3, 0x40800200, 0x3AD, 0x40804200, 0x806, 0x42804000, 0x3,
-            0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+            Resources="0x40800000, 0x360, 0x40804000, 0x7E0, 0x40800100, 0x240, 0x40804100, 0x70C, 0x40800200, 0x3AD, 0x40804200, 0x806,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu1 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.864 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.016 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.804 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.941 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.054Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 305 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 587 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130B" Enable="true" Target="kona" Timeout="0"
+            Resources="0x40800000, 0x360, 0x40804000, 0x7E0, 0x40800100, 0x240, 0x40804100, 0x70C, 0x40800200, 0x3AD, 0x40804200, 0x806,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu1 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.864 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.016 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.804 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.941 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.054Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 305 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 587 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130C" Enable="true" Target="kona" Timeout="0"
+            Resources="0x40800000, 0x360, 0x40804000, 0x7E0, 0x40800100, 0x240, 0x40804100, 0x70C, 0x40800200, 0x3AD, 0x40804200, 0x806,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu2 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.864 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.016 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.804 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.941 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.054Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 305 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 587 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130D" Enable="true" Target="kona" Timeout="0"
+            Resources="0x40800000, 0x360, 0x40804000, 0x7E0, 0x40800100, 0x240, 0x40804100, 0x70C, 0x40800200, 0x3AD, 0x40804200, 0x806,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu2 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.864 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.016 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.804 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.941 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.054Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 305 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 587 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130E" Enable="true" Target="kona" Timeout="0"
+            Resources="0x40800000, 0x360, 0x40804000, 0x7E0, 0x40800100, 0x240, 0x40804100, 0x70C, 0x40800200, 0x3AD, 0x40804200, 0x806,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu2 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.864 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.016 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.804 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.941 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.054Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 305 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 587 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130F" Enable="true" Target="kona" Timeout="0"
+            Resources="0x40800000, 0x360, 0x40804000, 0x7E0, 0x40800100, 0x240, 0x40804100, 0x70C, 0x40800200, 0x3AD, 0x40804200, 0x806,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu3 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.864 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.016 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.804 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.941 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.054Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 305 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 587 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001310" Enable="true" Target="kona" Timeout="0"
+            Resources="0x40800000, 0x360, 0x40804000, 0x7E0, 0x40800100, 0x240, 0x40804100, 0x70C, 0x40800200, 0x3AD, 0x40804200, 0x806,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu3 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.864 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.016 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.804 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.941 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.054Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 305 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 587 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001311" Enable="true" Target="kona" Timeout="0"
+            Resources="0x40800000, 0x360, 0x40804000, 0x7E0, 0x40800100, 0x240, 0x40804100, 0x70C, 0x40800200, 0x3AD, 0x40804200, 0x806,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
+
+        <!-- qvr level cpu3 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.864 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.016 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.804 Ghz -->
+        <!-- P CPU - PRIME CPU min freq ~.941 Ghz-->
+        <!-- P CPU - PRIME CPU max freq ~2.054Ghz -->
+        <!-- GPU - min pwrlevel 5 (freq 305 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 587 Mhz) -->
+        <!-- Min Big CPUs 3 -->
+        <!-- Min Prime CPUs 1 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001312" Enable="true" Target="kona" Timeout="0"
+            Resources="0x40800000, 0x360, 0x40804000, 0x7E0, 0x40800100, 0x240, 0x40804100, 0x70C, 0x40800200, 0x3AD, 0x40804200, 0x806,
+            0x42804000, 0x5, 0x42808000, 0x0, 0x41000000, 0x3, 0x41000200, 0x1"/>
 
         <!--camera general-->
         <!--CPU-LLC BWMON - Set sample_ms 16 -->
@@ -88,14 +225,14 @@
         <!--MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1-->
         <!--MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0, CPU_SILVER_LEVEL_15 (1036800 kHz)-->
         <!--MPCTLV3_MIN_FREQ_CLUSTER_BIG_CORE_0, CPU_GOLD_LEVEL_12 (1228800 kHz)-->
-        <!--MPCTLV3_SCHED_DOWNMIGRATE, 0x14-->
-        <!--MPCTLV3_SCHED_UPMIGRATE, 0x1E-->
+        <!--MPCTLV3_SCHED_DOWNMIGRATE, 0xA-->
+        <!--MPCTLV3_SCHED_UPMIGRATE, 0x14-->
         <!--CPU-LLC BWMON - Set sample_ms 10 -->
         <!--CPU-LLC BWMON - Set io_percent 80 -->
         <!--CPU-LLC BWMON - Set hyst_length hyst_trigger hist memory 0 -->
         <Config
             Id="0x00001334" Enable="true" Timeout="0" Target="kona"
-            Resources="0x40400000, 0x1, 0x40800100, 0x40C, 0x40800000, 0x4CC, 0x40C20000, 0x14, 0x40C1C000, 0x1E, 0x41820000, 0x0A, 0x41808000, 0x50, 0x4180C000, 0"/>
+            Resources="0x40400000, 0x1, 0x40800100, 0x40C, 0x40800000, 0x4CC, 0x40C20000, 0xA, 0x40C1C000, 0x14, 0x41820000, 0x0A, 0x41808000, 0x50, 0x4180C000, 0"/>
     </Powerhint>
 </HintConfigs>
 
diff --git a/config/lito/powerhint.xml b/config/lito/powerhint.xml
index 93ee459..450e8c7 100644
--- a/config/lito/powerhint.xml
+++ b/config/lito/powerhint.xml
@@ -43,11 +43,35 @@
         <!--L CPU - Set hispeed load 95 -->
         <!--CPU-LLCC BWMON - Set sample_ms 20 -->
         <!--LLCC-DDR BWMON - Set sample_ms 20 -->
+        <!--CPU CORE 0 Min freq to 864 Mhz -->
         <Config
             Id="0x00001331" Enable="true" Timeout="0" Target="lito"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x4143C100, 0x360, 0x41440100, 0x5F, 0x41820000, 0x14, 0x4300C000, 0x14"/>
+            0x4143C100, 0x360, 0x41440100, 0x5F, 0x4183C000, 0x14, 0x43034000, 0x14, 0x40800100, 864"/>
+
+        <!-- camera 30fps and camera preview -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 1017Mhz -->
+        <!--L CPU - Set hispeed load 95 -->
+        <!--CPU-LLCC BWMON - Set polling interval 200 -->
+        <!--CPU-LLCC BWMON - use AB 0 -->
+        <!--CPU-LLCC BWMON - Set sample_ms 10 -->
+        <!--LLCC-DDR BWMON - Set sample_ms 20 -->
+        <!--CPU-LLCC BWMON - Set up_scale 0 -->
+        <!--L CPU core ctl min cpus 6 -->
+        <!--CPU-LLCC BWMON - io percent 100 -->
+        <Config
+            Id="0x00001331" Enable="true" Timeout="0" Target="lagoon"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4143C100, 0x3F9, 0x41440100, 0x5F, 0x4181C000, 0xC8, 0x41830000, 0, 0x4183C000, 0xA,
+            0x43034000, 0x14, 0x4182C000, 0, 0x41000100, 6, 0x41808000, 100"/>
 
         <!-- camera 60 FPS -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -62,7 +86,28 @@
             Id="0x00001332" Enable="true" Timeout="0" Target="lito"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x41820000, 0x14, 0x4300C000, 0x14"/>
+            0x4183C000, 0x14, 0x43034000, 0x14"/>
+
+        <!-- camera 60 FPS -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--CPU-LLCC BWMON - Set polling interval 200 -->
+        <!--CPU-LLCC BWMON - use AB 0 -->
+        <!--CPU-LLCC BWMON - Set sample ms 10 -->
+        <!--LLCC-DDR BWMON - Set sample ms 20 -->
+        <!--CPU-LLCC BWMON - Set up_scale 0 -->
+        <!--L CPU core ctl min cpus 6 -->
+        <!--CPU-LLCC BWMON - io percent 100 -->
+        <Config
+            Id="0x00001332" Enable="true" Timeout="0" Target="lagoon"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4181C000, 0xC8, 0x41830000, 0, 0x4183C000, 0xA, 0x43034000, 0x14, 0x4182C000, 0,
+            0x41000100, 6, 0x41808000, 100"/>
 
         <!-- camera HFR -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -77,7 +122,28 @@
             Id="0x00001333" Enable="true" Timeout="0" Target="lito"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x41820000, 0x14, 0x4300C000, 0x14"/>
+            0x4183C000, 0x14, 0x43034000, 0x14"/>
+
+        <!-- camera HFR -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--CPU-LLCC BWMON - Set polling interval 200 -->
+        <!--CPU-LLCC BWMON - use AB 0 -->
+        <!--CPU-LLCC BWMON - Set sample ms 10 -->
+        <!--LLCC-DDR BWMON - Set sample ms 20 -->
+        <!--CPU-LLCC BWMON - Set up_scale 0 -->
+        <!--L CPU core ctl min cpus 6 -->
+        <!--CPU-LLCC BWMON - io percent 100 -->
+        <Config
+            Id="0x00001333" Enable="true" Timeout="0" Target="lagoon"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4181C000, 0xC8, 0x41830000, 0, 0x4183C000, 0xA, 0x43034000, 0x14, 0x4182C000, 0,
+            0x41000100, 6, 0x41808000, 100"/>
 
         <!-- HFR 480fps -->
         <!--L CPU CORE 0 SCHED LOAD BOOST -->
@@ -88,12 +154,35 @@
         <!--L CPU CORE 5 SCHED LOAD BOOST -->
         <!--CPU-LLCC BWMON - Set sample_ms 20 -->
         <!--LLCC-DDR BWMON - Set sample ms 20 -->
-        <!--CPU CORE 0 Min freq to 1.075Ghz -->
+        <!--CPU CORE 0 Min freq to 1.363Ghz -->
+        <!--Sched_prefer_spread to 1 -->
         <Config
             Id="0x00001334" Enable="true" Timeout="0" Target="lito"
             Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
             0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
-            0x41820000, 0x14, 0x4300C000, 0x14, 0x40800100, 0x433"/>
+            0x4183C000, 0x14, 0x43034000, 0x14, 0x40800100, 0x553, 0x40CA8000, 1"/>
+
+        <!-- HFR 480fps -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--CPU-LLCC BWMON - Set polling interval 200 -->
+        <!--CPU-LLCC BWMON - use AB 0 -->
+        <!--CPU-LLCC BWMON - Set sample ms 10 -->
+        <!--LLCC-DDR BWMON - Set sample ms 20 -->
+        <!--CPU CORE 0 Min freq to 1.2Ghz -->
+        <!--CPU-LLCC BWMON - Set up_scale 0 -->
+        <!--L CPU core ctl min cpus 6 -->
+        <!--CPU-LLCC BWMON - io percent 100 -->
+        <Config
+            Id="0x00001334" Enable="true" Timeout="0" Target="lagoon"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4181C000, 0xC8, 0x41830000, 0, 0x4183C000, 0xA, 0x43034000, 0x14, 0x40800100, 0x4B9,
+            0x4182C000, 0, 0x41000100, 6, 0x41808000, 100"/>
 
         <!-- same settings for all the qvr power levels intentionally -->
         <!-- qvr level cpu1 gpu1 -->
@@ -113,6 +202,21 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- same settings for all the qvr power levels intentionally -->
+        <!-- qvr level cpu1 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130A" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu1 gpu2 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -130,6 +234,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu1 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130B" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu1 gpu3 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -147,6 +265,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu1 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130C" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu2 gpu1 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -164,6 +296,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu2 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130D" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu2 gpu2 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -181,6 +327,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu2 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130E" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu2 gpu3 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -198,6 +358,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu2 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130F" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu3 gpu1 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -215,6 +389,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu3 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001310" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu3 gpu2 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -232,6 +420,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu3 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001311" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
         <!-- qvr level cpu3 gpu3 -->
         <!-- Prime CPU - Cluster min freq ~.806 Ghz -->
         <!-- Prime CPU - Cluster max freq ~.2.400 Ghz -->
@@ -249,6 +451,20 @@
             0x40804000, 0x82C, 0x40800100, 0x266, 0x40804100, 0x433,
             0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
 
+        <!-- qvr level cpu3 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.787 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.073 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001312" Enable="true" Target="lagoon" Timeout="0"
+            Resources="0x40800000, 0x313, 0x40804000, 0x819, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
          <!-- sustained performance -->
          <!-- Prime CPU - Cluster min freq uncapped -->
          <!-- B CPU - Cluster min freq uncapped -->
@@ -265,6 +481,19 @@
              0x40804000, 0x480, 0x40804100, 0x433, 0X4280C000, 0x113, 0X42810000, 0x190,
              0x42814000, 0x0"/>
 
+         <!-- sustained performance -->
+         <!-- B CPU - Cluster min freq uncapped -->
+         <!-- L CPU - Cluster min freq uncapped -->
+         <!-- B CPU - Cluster max freq ~1.248 GHz -->
+         <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+         <!-- GPU - min freq 253Mhz -->
+         <!-- GPU - max freq 355Mhz -->
+         <!-- GPUBW freq uncapped -->
+         <Config
+             Id="0x00001206" Enable="true" Timeout="0" Target="lagoon"
+             Resources="0x40800000, 0x0, 0x40800100, 0x0, 0x40804000, 0x4E0, 0x40804100, 0x4E0,
+             0X4280C000, 0xFD, 0X42810000, 0x163, 0x42814000, 0x0"/>
+
          <!-- vr mode -->
          <!-- Prime CPU - Cluster min freq ~1.094 Ghz -->
          <!-- B CPU - Cluster min freq ~1.152 Ghz -->
@@ -281,6 +510,19 @@
              0x40804000, 0x76C, 0x40804100, 0x673, 0X4280C000, 0x113, 0X4280C000, 0x271,
              0x42814000, 0x0"/>
 
+         <!-- vr mode -->
+         <!-- B CPU - Cluster min freq ~1.22 Ghz -->
+         <!-- L CPU - Cluster min freq ~1.017 Ghz -->
+         <!-- B CPU - Cluster max freq ~1.90 Ghz -->
+         <!-- L CPU - Cluster max freq ~1.708 Ghz -->
+         <!-- GPU - min freq 253Mhz -->
+         <!-- GPU - max freq 565Mhz -->
+         <!-- GPUBW uncapped -->
+         <Config
+             Id="0x00001207" Enable="true" Timeout="0" Target="lagoon"
+             Resources="0x40800000, 0x4CC, 0x40800100, 0x3F9, 0x40804000, 0x76C, 0x40804100, 0x6AB,
+             0X4280C000, 0xFD, 0X4280C000, 0x235, 0x42814000, 0x0"/>
+
          <!-- vr mode sustained performance -->
          <!-- Prime CPU - Cluster min freq ~1.094 Ghz -->
          <!-- B CPU - Cluster min freq ~1.152 Ghz -->
@@ -296,6 +538,19 @@
              Resources="0x40800200, 0x446, 0x40800000, 0x480, 0x40800100, 0x433, 0x40804200, 0x446,
              0x40804000, 0x480, 0x40804100, 0x433, 0X4280C000, 0x190, 0X42810000, 0x190,
              0x42814000, 0x0"/>
+
+         <!-- vr mode sustained performance -->
+         <!-- B CPU - Cluster min freq ~1.22 Ghz -->
+         <!-- L CPU - Cluster min freq ~1.22 Ghz -->
+         <!-- B CPU - Cluster max freq ~1.22 Ghz -->
+         <!-- L CPU - Cluster max freq ~1.22 Ghz -->
+         <!-- GPU - min freq 355Mhz -->
+         <!-- GPU - max freq 355Mhz -->
+         <!-- GPUBW uncapped  -->
+         <Config
+             Id="0x00001301" Enable="true" Timeout="0" Target="lagoon"
+             Resources="0x40800000, 0x4CC, 0x40800100, 0x4CC, 0x40804000, 0x4CC, 0x40804100, 0x4CC,
+             0X4280C000, 0x163, 0X42810000, 0x163, 0x42814000, 0x0"/>
     </Powerhint>
 </HintConfigs>
 
diff --git a/config/sm6150/powerhint.xml b/config/sm6150/powerhint.xml
new file mode 100644
index 0000000..e930de0
--- /dev/null
+++ b/config/sm6150/powerhint.xml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<!--
+/* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *     * Neither the name of The Linux Foundation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-->
+<HintConfigs>
+    <Powerhint>
+
+        <!-- camera 30fps and camera preview -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 998Mhz -->
+        <!--L CPU - Set hispeed load 95 -->
+        <!--BWMON - Set sample_ms 20 for both cpu and llcc -->
+        <!--Change min freq to 748Mhz -->
+        <Config
+            Id="0x00001331" Enable="true" Timeout="0" Target="msmsteppe"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4143C100, 0x3F9, 0x41440100, 0x5F, 0x4183C000, 0x14, 0x43034000, 0x14, 0x40800100,0x2EC"/>
+
+        <!-- camera 60 FPS -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--BWMON - Set sample_ms 20 -->
+        <Config
+            Id="0x00001332" Enable="true" Timeout="0" Target="msmsteppe"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4183C000, 0x14, 0x40800100,0x2EC"/>
+
+        <!-- camera HFR -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--BWMON - Set sample_ms 20 -->
+        <Config
+            Id="0x00001333" Enable="true" Timeout="0" Target="msmsteppe"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4183C000, 0x14, 0x40800100,0x2EC"/>
+
+        <!-- Dual camera -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--BWMON - Set sample_ms 20 -->
+        <Config
+            Id="0x00001334" Enable="true" Timeout="0" Target="msmsteppe"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4183C000, 0x14, 0x40800100,0x2EC"/>
+
+        <!-- camera 30fps and camera preview -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--L CPU Hispeed freq of 998Mhz -->
+        <!--L CPU - Set hispeed load 95 -->
+        <!--CPU-LLCC BWMON - Set sample_ms 20 -->
+        <!--LLCC-DDR BWMON - Set sample_ms 20 -->
+        <Config
+            Id="0x00001331" Enable="true" Timeout="0" Target="sdmmagpie"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4143C100, 0x3F9, 0x41440100, 0x5F, 0x4183C000, 0x14, 0x43034000, 0x14"/>
+
+        <!-- camera 60 FPS -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--CPU-LLCC BWMON - Set sample_ms 20 -->
+        <!--LLCC-DDR BWMON - Set sample ms 20 -->
+        <Config
+            Id="0x00001332" Enable="true" Timeout="0" Target="sdmmagpie"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4183C000, 0x14, 0x43034000, 0x14"/>
+
+        <!-- camera HFR -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--CPU-LLCC BWMON - Set sample_ms 20 -->
+        <!--LLCC-DDR BWMON - Set sample ms 20 -->
+        <Config
+            Id="0x00001333" Enable="true" Timeout="0" Target="sdmmagpie"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4183C000, 0x14, 0x43034000, 0x14"/>
+
+        <!-- Dual camera -->
+        <!--L CPU CORE 0 SCHED LOAD BOOST -->
+        <!--L CPU CORE 1 SCHED LOAD BOOST -->
+        <!--L CPU CORE 2 SCHED LOAD BOOST -->
+        <!--L CPU CORE 3 SCHED LOAD BOOST -->
+        <!--L CPU CORE 4 SCHED LOAD BOOST -->
+        <!--L CPU CORE 5 SCHED LOAD BOOST -->
+        <!--CPU-LLCC BWMON - Set sample_ms 20 -->
+        <!--LLCC-DDR BWMON - Set sample ms 20 -->
+        <Config
+            Id="0x00001334" Enable="true" Timeout="0" Target="sdmmagpie"
+            Resources="0x40C68100, 0xFFFFFFFA, 0x40C68110, 0xFFFFFFFA, 0x40C68120, 0xFFFFFFFA,
+            0x40C68130, 0xFFFFFFFA, 0x40C68140, 0xFFFFFFFA, 0x40C68150, 0xFFFFFFFA,
+            0x4183C000, 0x14, 0x43034000, 0x14"/>
+
+        <!-- same settings for all the qvr power levels intentionally -->
+        <!-- qvr level cpu1 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130A" Enable="true" Target="sdmmagpie" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu1 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130B" Enable="true" Target="sdmmagpie" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu1 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130C" Enable="true" Target="sdmmagpie" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu2 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130D" Enable="true" Target="sdmmagpie" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu2 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130E" Enable="true" Target="sdmmagpie" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu2 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x0000130F" Enable="true" Target="sdmmagpie" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu3 gpu1 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001310" Enable="true" Target="sdmmagpie" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu3 gpu2 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~.2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001311" Enable="true" Target="sdmmagpie" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+        <!-- qvr level cpu3 gpu3 -->
+        <!-- B CPU - Cluster min freq ~.806 Ghz -->
+        <!-- B CPU - Cluster max freq ~2.169 Ghz -->
+        <!-- L CPU - Cluster min freq ~.576 Ghz -->
+        <!-- L CPU - Cluster max freq ~1.248 Ghz -->
+        <!-- GPU - min pwrlevel 7 (freq 180 Mhz) -->
+        <!-- GPU - max pwrlevel 0 (freq 825 Mhz) -->
+        <!-- Min Big CPUs 2 -->
+        <!-- Idefinite Duration -->
+        <Config
+            Id="0x00001312" Enable="true" Target="sdmmagpie" Timeout="0"
+            Resources="0x40800000, 0x326, 0x40804000, 0x879, 0x40800100, 0x240, 0x40804100, 0x4E0,
+            0x42804000, 0x7, 0x42808000, 0x0, 0x41000000, 0x2"/>
+
+    </Powerhint>
+</HintConfigs>
diff --git a/power-vendor-product.mk b/power-vendor-product.mk
index 578ada2..59da33a 100644
--- a/power-vendor-product.mk
+++ b/power-vendor-product.mk
@@ -11,6 +11,10 @@
 PRODUCT_COPY_FILES += vendor/qcom/opensource/power/config/lito/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
 else ifeq ($(TARGET_BOARD_PLATFORM),atoll)
 PRODUCT_COPY_FILES += vendor/qcom/opensource/power/config/atoll/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
+else ifeq ($(TARGET_BOARD_PLATFORM),sm6150)
+PRODUCT_COPY_FILES += vendor/qcom/opensource/power/config/sm6150/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
+else ifeq ($(TARGET_BOARD_PLATFORM),bengal)
+PRODUCT_COPY_FILES += vendor/qcom/opensource/power/config/bengal/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
 else ifeq ($(TARGET_BOARD_PLATFORM),lahaina)
 PRODUCT_COPY_FILES += vendor/qcom/opensource/power/config/lahaina/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
 else ifeq ($(TARGET_BOARD_PLATFORM),holi)