diff --git a/Android.mk b/Android.mk
index 9d16236..fa2a3e4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,11 @@ ifeq ($(call is-vendor-board-platform,QCOM),true)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_RELATIVE_PATH := hw
+ifneq ( ,$(filter 11 R ,$(PLATFORM_VERSION)))
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils android.hardware.power-ndk_platform libbinder_ndk
+else
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils android.hardware.power-V1-ndk_platform libbinder_ndk
+endif
 LOCAL_HEADER_LIBRARIES += libutils_headers
 LOCAL_HEADER_LIBRARIES += libhardware_headers
 LOCAL_SRC_FILES := power-common.c metadata-parser.c utils.c list.c hint-data.c powerhintparser.c Power.cpp main.cpp
diff --git a/config/bengal/powerhint.xml b/config/bengal/powerhint.xml
index e41f1d0..d8e590c 100644
--- a/config/bengal/powerhint.xml
+++ b/config/bengal/powerhint.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <!--
-/*  Copyright (c) 2016-2020,The Linux Foundation. All rights reserved.
+/*  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
@@ -39,15 +39,16 @@
         <!--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 -->
+        <!--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 -->
+        <!--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,
@@ -59,6 +60,12 @@
             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 -->
@@ -66,13 +73,13 @@
         <!--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 -->
+        <!--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,
@@ -84,6 +91,12 @@
             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 -->
@@ -91,13 +104,13 @@
         <!--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 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 -->
+        <!--L CLUSTER_BIG - Set hispeed load 95 -->
         <!--CPUBW HWMON - Set sample_ms 20 -->
-	<!--L CPU - Cluster min freq ~1Ghz -->
+        <!--L CPU - Cluster min freq ~1Ghz -->
         <Config
             Id="0x00001333" Enable="true" Timeout="0" Target="bengal"
             Resources="0x40C68100, -10, 0x40C68110, -10, 0x40C68120, -10,
@@ -109,6 +122,12 @@
             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 -->
@@ -116,11 +135,11 @@
         <!--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 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 -->
+        <!--L CLUSTER_BIG - Set hispeed load 95 -->
         <!--CPUBW HWMON - Set sample_ms 20 -->
         <Config
             Id="0x00001334" Enable="true" Timeout="0" Target="bengal"
@@ -133,6 +152,12 @@
             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 -->
@@ -157,6 +182,12 @@
             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 -->
@@ -177,6 +208,11 @@
             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 -->
@@ -192,6 +228,10 @@
             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 -->
@@ -206,6 +246,10 @@
             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 -->
@@ -220,6 +264,10 @@
             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 -->
@@ -234,6 +282,10 @@
             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 -->
@@ -248,6 +300,10 @@
             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 -->
@@ -262,6 +318,10 @@
             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 -->
@@ -276,6 +336,10 @@
             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 -->
@@ -290,7 +354,10 @@
             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 -->
@@ -304,6 +371,10 @@
             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 -->
@@ -317,6 +388,10 @@
              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 -->
@@ -330,6 +405,10 @@
              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 -->
@@ -343,6 +422,10 @@
              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>