diff --git a/arch/arm64/boot/dts/206B1/atoll.dtsi b/arch/arm64/boot/dts/206B1/atoll.dtsi
index c8b202cf9f60..ec84fce70792 100644
--- a/arch/arm64/boot/dts/206B1/atoll.dtsi
+++ b/arch/arm64/boot/dts/206B1/atoll.dtsi
@@ -683,7 +683,7 @@
 	};
 
 	chosen {
-		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 mitigations=off kpti=0 audit=0 nowhere cgroup_disable=memory elevator=bfq";
+		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 mitigations=off kpti=0 audit=0 nowhere cgroup_disable=memory dk=balanced";
 	};
 
 	soc: soc { };
@@ -3263,7 +3263,7 @@
 			<  768000  556800000 >,
 			< 1017600  806400000 >,
 			< 1248000  940800000 >,
-			< 1516800 1401000000 >,
+			< 1516800 1209600000 >,
 			< 1804800 1401000000 >;
 	};
 
@@ -3352,11 +3352,11 @@
 		qcom,target-dev = <&cpu0_llcc_ddr_lat>;
 		qcom,cachemiss-ev = <0x1000>;
 		qcom,core-dev-table =
-			<  768000 MHZ_TO_MBPS( 300, 4) >,
-			< 1017600 MHZ_TO_MBPS( 451, 4) >,
-			< 1248000 MHZ_TO_MBPS( 547, 4) >,
-			< 1516800 MHZ_TO_MBPS( 768, 4) >,
-			< 1804800 MHZ_TO_MBPS(1017, 4) >;
+			<  768000 MHZ_TO_MBPS( 547, 4) >,
+			< 1017600 MHZ_TO_MBPS( 768, 4) >,
+			< 1248000 MHZ_TO_MBPS(1017, 4) >,
+			< 1516800 MHZ_TO_MBPS(1353, 4) >,
+			< 1804800 MHZ_TO_MBPS(1555, 4) >;
 	};
 
 	cpu6_llcc_ddr_lat: qcom,cpu6-llcc-ddr-lat {
@@ -3375,9 +3375,9 @@
 		qcom,cachemiss-ev = <0x1000>;
 		qcom,core-dev-table =
 			< 1113600 MHZ_TO_MBPS(1017, 4) >,
-			< 1267200 MHZ_TO_MBPS(1555, 4) >,
-			< 1708800 MHZ_TO_MBPS(2133, 4) >,
-			< 2208000 MHZ_TO_MBPS(2133, 4) >,
+			< 1267200 MHZ_TO_MBPS(1353, 4) >,
+			< 1708800 MHZ_TO_MBPS(1555, 4) >,
+			< 2208000 MHZ_TO_MBPS(1804, 4) >,
 			< 2400000 MHZ_TO_MBPS(2133, 4) >;
 	};
 
@@ -3395,10 +3395,10 @@
 		qcom,cpulist = <&CPU0 &CPU1 &CPU2 &CPU3 &CPU4 &CPU5>;
 		qcom,target-dev = <&cpu0_cpu_ddr_latfloor>;
 		qcom,core-dev-table =
-			<  768000 MHZ_TO_MBPS( 300, 4) >,
-			< 1248000 MHZ_TO_MBPS( 451, 4) >,
-			< 1516800 MHZ_TO_MBPS( 547, 4) >,
-			< 1804800 MHZ_TO_MBPS( 768, 4) >;
+			<  768000 MHZ_TO_MBPS( 547, 4) >,
+			< 1248000 MHZ_TO_MBPS(1017, 4) >,
+			< 1516800 MHZ_TO_MBPS(1353, 4) >,
+			< 1804800 MHZ_TO_MBPS(1555, 4) >;
 	};
 
 	cpu6_cpu_ddr_latfloor: qcom,cpu6-cpu-ddr-latfloor {
@@ -3415,9 +3415,9 @@
 		qcom,cpulist = <&CPU6 &CPU7>;
 		qcom,target-dev = <&cpu6_cpu_ddr_latfloor>;
 		qcom,core-dev-table =
-			< 1267200 MHZ_TO_MBPS( 547, 4) >,
-			< 1555200 MHZ_TO_MBPS( 768, 4) >,
-			< 1708800 MHZ_TO_MBPS(1017, 4) >,
+			< 1267200 MHZ_TO_MBPS( 768, 4) >,
+			< 1555200 MHZ_TO_MBPS(1017, 4) >,
+			< 1708800 MHZ_TO_MBPS(1353, 4) >,
 			< 1900800 MHZ_TO_MBPS(1555, 4) >,
 			< 2208000 MHZ_TO_MBPS(1804, 4) >,
 			< 2400000 MHZ_TO_MBPS(2133, 4) >;
diff --git a/arch/arm64/boot/dts/206B1/pm6150.dtsi b/arch/arm64/boot/dts/206B1/pm6150.dtsi
index 06fd8d668daf..36c6b0b79ae4 100644
--- a/arch/arm64/boot/dts/206B1/pm6150.dtsi
+++ b/arch/arm64/boot/dts/206B1/pm6150.dtsi
@@ -387,7 +387,7 @@
 					<0x0 0x16 0x6 IRQ_TYPE_EDGE_RISING>,
 					<0x0 0x16 0x7 IRQ_TYPE_EDGE_RISING>;
 
-				interrupt-names = 
+				interrupt-names =
 						//#ifdef VENDOR_EDIT
 						/*modify by GangYan @BSP.Basic.CHG 2020/04/21*/
 						//"wdog-snarl",
@@ -505,7 +505,7 @@
 						"bcl-lvl2";
 			#thermal-sensor-cells = <1>;
 //#ifdef VENDOR_EDIT
-//Gang.Yan@BSP.CHG.Basic  2020/04/10  Modify for disable bcl 
+//Gang.Yan@BSP.CHG.Basic  2020/04/10  Modify for disable bcl
 			status = "disabled";
 //#endif
 		};
@@ -514,7 +514,7 @@
 			compatible = "qcom,msm-bcl-soc";
 			#thermal-sensor-cells = <0>;
 //#ifdef VENDOR_EDIT
-//Gang.Yan@BSP.CHG.Basic  2020/04/10  Modify for disable bcl 
+//Gang.Yan@BSP.CHG.Basic  2020/04/10  Modify for disable bcl
 			status = "disabled";
 //#endif
 		};
@@ -585,7 +585,7 @@
 		pm6150_vib: qcom,vibrator@5300 {
 			compatible = "qcom,qpnp-vibrator-ldo";
 			reg = <0x5300 0x100>;
-			qcom,vib-ldo-volt-uv = <3000000>;
+			qcom,vib-ldo-volt-uv = <1500000>;
 			qcom,disable-overdrive;
 		};
 	};
@@ -650,7 +650,7 @@
 		};
 	};
 //#ifdef VENDOR_EDIT
-//Gang.Yan@BSP.CHG.Basic  2020/04/10  Modify for disable bcl 
+//Gang.Yan@BSP.CHG.Basic  2020/04/10  Modify for disable bcl
 /*
 	pm6150-vbat-lvl0 {
 		polling-delay-passive = <0>;