Merge commit '7834df5fbb' into kernel.lnx.5.4.r3-rel

Change-Id: Ic7fc9a6350ff1a0d118508bf4e64fed41c5d9f67
This commit is contained in:
Shreyas Narayan 2022-04-04 16:52:56 +05:30
commit 7bfd5314a4
5 changed files with 25 additions and 20 deletions

View file

@ -106,8 +106,13 @@
0x82c030 0xf
0x828000 0xf
0x82b268 0x2>;
switch_reg_update = <0x82C02C 0x4
0x824A0C 0x4>;
/*FOM for preset caluclation*/
switch_reg_update = <0x82c02c 0x00000007
0x824a10 0x00000001
0x82c030 0x00000008
0x828000 0x00000001
0x82b074 0x00000020
0x82b2bc 0x00000001>;
};
};

View file

@ -67,14 +67,14 @@
thermal-sensors = <&tsens0 3>;
trips {
mdmss0_config0: mdmss0-config0 {
temperature = <111000>;
temperature = <101000>;
hysteresis = <3000>;
type = "passive";
};
mdmss0_config1: mdmss0-config1 {
temperature = <115000>;
hysteresis = <2000>;
temperature = <105000>;
hysteresis = <3000>;
type = "passive";
};
};
@ -87,14 +87,14 @@
thermal-sensors = <&tsens0 4>;
trips {
mdmss1_config0: mdmss1-config0 {
temperature = <111000>;
temperature = <101000>;
hysteresis = <3000>;
type = "passive";
};
mdmss1_config1: mdmss1-config1 {
temperature = <115000>;
hysteresis = <2000>;
temperature = <105000>;
hysteresis = <3000>;
type = "passive";
};
};
@ -134,14 +134,14 @@
thermal-sensors = <&tsens0 5>;
trips {
mdmss2_config0: mdmss2-config0 {
temperature = <111000>;
temperature = <101000>;
hysteresis = <3000>;
type = "passive";
};
mdmss2_config1: mdmss2-config1 {
temperature = <115000>;
hysteresis = <2000>;
temperature = <105000>;
hysteresis = <3000>;
type = "passive";
};
};
@ -154,14 +154,14 @@
thermal-sensors = <&tsens0 6>;
trips {
mdmss3_config0: mdmss3-config0 {
temperature = <111000>;
temperature = <101000>;
hysteresis = <3000>;
type = "passive";
};
mdmss3_config1: mdmss3-config1 {
temperature = <115000>;
hysteresis = <2000>;
temperature = <105000>;
hysteresis = <3000>;
type = "passive";
};
};

View file

@ -3,7 +3,7 @@
#include "sdxlemur-v2.dtsi"
#include "sdxlemur-mtp-cpe.dtsi"
#include "sdxlemur-mtp-cpe-pine1x.dtsi"
#include "sdxlemur-1024mb.dtsi"
#include "sdxlemur-1024mb-cpe.dtsi"
#include "sdxlemur-bluetooth.dtsi"
/ {

View file

@ -3,7 +3,7 @@
#include "sdxlemur-v2.dtsi"
#include "sdxlemur-mtp-cpe.dtsi"
#include "sdxlemur-mtp-cpe-pine2x.dtsi"
#include "sdxlemur-1024mb.dtsi"
#include "sdxlemur-1024mb-cpe.dtsi"
#include "sdxlemur-bluetooth.dtsi"
/ {

View file

@ -1229,19 +1229,19 @@
/* SVS2 */
qcom,svs2 =
<600000 0 600000 1900000 0 76800>;
<18000 0 600000 1900000 0 76800>;
/* SVS */
qcom,svs =
<1200000 0 1200000 2800000 0 150000>;
<400000 0 1200000 2800000 0 150000>;
/* NOMINAL */
qcom,nominal =
<2400000 0 2400000 5500000 0 400000>;
<670000 0 2400000 5500000 0 400000>;
/* TURBO */
qcom,turbo =
<3600000 0 3600000 5500000 0 400000>;
<1380000 0 3600000 5500000 0 400000>;
qcom,bus-vector-names = "MIN", "SVS2", "SVS", "NOMINAL",
"TURBO";