diff --git a/qcom/kera-mtp-wcn7750-qmp1000.dtsi b/qcom/kera-mtp-wcn7750-qmp1000.dtsi index a780aeb3..882915e8 100644 --- a/qcom/kera-mtp-wcn7750-qmp1000.dtsi +++ b/qcom/kera-mtp-wcn7750-qmp1000.dtsi @@ -5,3 +5,7 @@ #include "kera-mtp.dtsi" #include "kera_ufs3.dtsi" + +&L11B { + /delete-property/ regulator-always-on; +}; diff --git a/qcom/kera-mtp-wcn7750-ufs3.dtsi b/qcom/kera-mtp-wcn7750-ufs3.dtsi index a780aeb3..882915e8 100644 --- a/qcom/kera-mtp-wcn7750-ufs3.dtsi +++ b/qcom/kera-mtp-wcn7750-ufs3.dtsi @@ -5,3 +5,7 @@ #include "kera-mtp.dtsi" #include "kera_ufs3.dtsi" + +&L11B { + /delete-property/ regulator-always-on; +}; diff --git a/qcom/kera-mtp-wcn7750-ufs4.dtsi b/qcom/kera-mtp-wcn7750-ufs4.dtsi index f30576eb..1c032cfb 100644 --- a/qcom/kera-mtp-wcn7750-ufs4.dtsi +++ b/qcom/kera-mtp-wcn7750-ufs4.dtsi @@ -5,3 +5,7 @@ #include "kera-mtp.dtsi" #include "kera_ufs4.dtsi" + +&L11B { + /delete-property/ regulator-always-on; +}; diff --git a/qcom/kera-pm7550ba.dtsi b/qcom/kera-pm7550ba.dtsi index 2c05b1c3..48ef756e 100644 --- a/qcom/kera-pm7550ba.dtsi +++ b/qcom/kera-pm7550ba.dtsi @@ -9,8 +9,8 @@ /delete-node/ i2c@104; /delete-node/ spmi@200; - i2c@104 { - reg = <0x104>; /* I2C instance 4 in ADSP for SE5 */ + i2c@105 { + reg = <0x105>; /* I2C instance 5 in ADSP for SE4 */ #address-cells = <1>; #size-cells = <0>; qcom,bus-type = "i2c"; @@ -35,33 +35,33 @@ /delete-node/ smb1398_1_die_temp; smb1500_1_iin { - reg = <0x1046901>; - label = "smb1393_1_iin"; + reg = <0x1056901>; + label = "smb1500_1_iin"; }; smb1500_1_ichg { - reg = <0x1046902>; - label = "smb1393_1_ichg"; + reg = <0x1056902>; + label = "smb1500_1_ichg"; }; smb1500_1_die_temp { - reg = <0x1046903>; - label = "smb1393_1_die_temp"; + reg = <0x1056903>; + label = "smb1500_1_die_temp"; }; smb1500_2_iin { - reg = <0x1046801>; - label = "smb1393_2_iin"; + reg = <0x1056801>; + label = "smb1500_2_iin"; }; smb1500_2_ichg { - reg = <0x1046802>; - label = "smb1393_2_ichg"; + reg = <0x1056802>; + label = "smb1500_2_ichg"; }; smb1500_2_die_temp { - reg = <0x1046803>; - label = "smb1393_2_die_temp"; + reg = <0x1056803>; + label = "smb1500_2_die_temp"; }; }; diff --git a/qcom/kera-pmic-overlay.dtsi b/qcom/kera-pmic-overlay.dtsi index a523d4f0..7563e31f 100644 --- a/qcom/kera-pmic-overlay.dtsi +++ b/qcom/kera-pmic-overlay.dtsi @@ -23,3 +23,7 @@ bits = <0 0>; }; }; + +&thermal_zones { + /delete-node/ sys-therm-11; +}; diff --git a/qcom/kera-qrd-wcn7750-ufs2.dtsi b/qcom/kera-qrd-wcn7750-ufs2.dtsi index 5743706b..02db5fed 100644 --- a/qcom/kera-qrd-wcn7750-ufs2.dtsi +++ b/qcom/kera-qrd-wcn7750-ufs2.dtsi @@ -5,3 +5,7 @@ #include "kera-qrd.dtsi" #include "kera_ufs2.dtsi" + +&L11B { + /delete-property/ regulator-always-on; +}; diff --git a/qcom/kera-qrd-wcn7750-ufs3.dtsi b/qcom/kera-qrd-wcn7750-ufs3.dtsi index 0a4228ff..ce97b3de 100644 --- a/qcom/kera-qrd-wcn7750-ufs3.dtsi +++ b/qcom/kera-qrd-wcn7750-ufs3.dtsi @@ -5,3 +5,7 @@ #include "kera-qrd.dtsi" #include "kera_ufs3.dtsi" + +&L11B { + /delete-property/ regulator-always-on; +}; diff --git a/qcom/kera-qrd-wcn7750-ufs4.dtsi b/qcom/kera-qrd-wcn7750-ufs4.dtsi index d28259d2..17883470 100644 --- a/qcom/kera-qrd-wcn7750-ufs4.dtsi +++ b/qcom/kera-qrd-wcn7750-ufs4.dtsi @@ -5,3 +5,7 @@ #include "kera-qrd.dtsi" #include "kera_ufs4.dtsi" + +&L11B { + /delete-property/ regulator-always-on; +}; diff --git a/qcom/kera-qrd.dtsi b/qcom/kera-qrd.dtsi index 30bb3c7c..c9e7fd9f 100644 --- a/qcom/kera-qrd.dtsi +++ b/qcom/kera-qrd.dtsi @@ -74,8 +74,8 @@ }; &pmic_glink_debug { - i2c@104 { - reg = <0x104>; /* I2C instance 4 in ADSP for SE5 */ + i2c@105 { + reg = <0x105>; /* I2C instance 5 in ADSP for SE4 */ #address-cells = <1>; #size-cells = <0>; qcom,bus-type = "i2c"; @@ -92,17 +92,17 @@ status = "ok"; smb1393_1_iin { - reg = <0x1043401>; + reg = <0x1053401>; label = "smb1393_1_iin"; }; smb1393_1_ichg { - reg = <0x1043402>; + reg = <0x1053402>; label = "smb1393_1_ichg"; }; smb1393_1_die_temp { - reg = <0x1043403>; + reg = <0x1053403>; label = "smb1393_1_die_temp"; }; }; diff --git a/qcom/kera-rcm-wcn7750-ufs2.dtsi b/qcom/kera-rcm-wcn7750-ufs2.dtsi index dc823592..963f60d5 100644 --- a/qcom/kera-rcm-wcn7750-ufs2.dtsi +++ b/qcom/kera-rcm-wcn7750-ufs2.dtsi @@ -5,3 +5,7 @@ #include "kera-rcm.dtsi" #include "kera_ufs2.dtsi" + +&L11B { + /delete-property/ regulator-always-on; +}; diff --git a/qcom/kera-rcm-wcn7750-ufs3.dtsi b/qcom/kera-rcm-wcn7750-ufs3.dtsi index 99203b93..a618b78a 100644 --- a/qcom/kera-rcm-wcn7750-ufs3.dtsi +++ b/qcom/kera-rcm-wcn7750-ufs3.dtsi @@ -5,3 +5,7 @@ #include "kera-rcm.dtsi" #include "kera_ufs3.dtsi" + +&L11B { + /delete-property/ regulator-always-on; +}; diff --git a/qcom/kera-rcm-wcn7750-ufs4.dtsi b/qcom/kera-rcm-wcn7750-ufs4.dtsi index 4834e869..7a442a73 100644 --- a/qcom/kera-rcm-wcn7750-ufs4.dtsi +++ b/qcom/kera-rcm-wcn7750-ufs4.dtsi @@ -5,3 +5,7 @@ #include "kera-rcm.dtsi" #include "kera_ufs4.dtsi" + +&L11B { + /delete-property/ regulator-always-on; +}; diff --git a/qcom/kera-regulators.dtsi b/qcom/kera-regulators.dtsi index 1b90a63c..2b82ef1f 100644 --- a/qcom/kera-regulators.dtsi +++ b/qcom/kera-regulators.dtsi @@ -17,8 +17,8 @@ S1B: pmxr2230_s1: vreg-pmxr2230-s1 { regulator-name = "pmxr2230_s1"; qcom,set = ; - regulator-min-microvolt = <1850000>; - regulator-max-microvolt = <2044000>; + regulator-min-microvolt = <1856000>; + regulator-max-microvolt = <2040000>; qcom,init-voltage = <1856000>; qcom,init-mode = ; }; @@ -36,7 +36,7 @@ regulator-name = "pmxr2230_s2"; qcom,set = ; regulator-min-microvolt = <1256000>; - regulator-max-microvolt = <2092000>; + regulator-max-microvolt = <1408000>; qcom,init-voltage = <1256000>; qcom,init-mode = ; }; @@ -49,8 +49,8 @@ S3B: pmxr2230_s3: vreg-pmxr2230-s3 { regulator-name = "pmxr2230_s3"; qcom,set = ; - regulator-min-microvolt = <920000>; - regulator-max-microvolt = <2736000>; + regulator-min-microvolt = <880000>; + regulator-max-microvolt = <1040000>; qcom,init-voltage = <952000>; }; }; @@ -63,7 +63,7 @@ regulator-name = "pmxr2230_s4"; qcom,set = ; regulator-min-microvolt = <2156000>; - regulator-max-microvolt = <2700000>; + regulator-max-microvolt = <2600000>; qcom,init-voltage = <2156000>; }; }; @@ -116,9 +116,9 @@ L2B: pmxr2230_l2: vreg-pmxr2230-l2 { regulator-name = "pmxr2230_l2"; qcom,set = ; - regulator-min-microvolt = <880000>; + regulator-min-microvolt = <720000>; regulator-max-microvolt = <950000>; - qcom,init-voltage = <880000>; + qcom,init-voltage = <720000>; qcom,init-mode = ; }; }; @@ -152,8 +152,8 @@ L4B: pmxr2230_l4: vreg-pmxr2230-l4 { regulator-name = "pmxr2230_l4"; qcom,set = ; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; + regulator-min-microvolt = <1080000>; + regulator-max-microvolt = <1320000>; qcom,init-voltage = <1200000>; qcom,init-mode = ; }; @@ -167,14 +167,16 @@ ; qcom,mode-threshold-currents = <0 30000>; + status = "disabled"; L5B: pmxr2230_l5: vreg-pmxr2230-l5 { regulator-name = "pmxr2230_l5"; qcom,set = ; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; + regulator-min-microvolt = <1170000>; + regulator-max-microvolt = <1370000>; qcom,init-voltage = <1200000>; qcom,init-mode = ; + status = "disabled"; }; }; @@ -210,7 +212,7 @@ regulator-name = "pmxr2230_l7"; qcom,set = ; regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + regulator-max-microvolt = <2000000>; qcom,init-voltage = <1800000>; qcom,init-mode = ; }; @@ -228,8 +230,8 @@ L8B: pmxr2230_l8: vreg-pmxr2230-l8 { regulator-name = "pmxr2230_l8"; qcom,set = ; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <1650000>; + regulator-max-microvolt = <2000000>; qcom,init-voltage = <1800000>; qcom,init-mode = ; }; @@ -286,7 +288,7 @@ regulator-name = "pmxr2230_l11"; qcom,set = ; regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + regulator-max-microvolt = <2000000>; qcom,init-voltage = <1800000>; qcom,init-mode = ; regulator-always-on; @@ -669,7 +671,7 @@ regulator-name = "pm_v6d_l2"; qcom,set = ; regulator-min-microvolt = <556000>; - regulator-max-microvolt = <816000>; + regulator-max-microvolt = <868000>; qcom,init-voltage = <556000>; qcom,init-mode = ; }; @@ -766,8 +768,8 @@ L2G: pm_v6g_l2: vreg-pm_v6g-l2 { regulator-name = "pm_v6g_l2"; qcom,set = ; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <1080000>; + regulator-max-microvolt = <2000000>; qcom,init-voltage = <1080000>; qcom,init-mode = ; }; @@ -786,7 +788,7 @@ regulator-name = "pm_v6g_l3"; qcom,set = ; regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; + regulator-max-microvolt = <1304000>; qcom,init-voltage = <1200000>; qcom,init-mode = ; }; @@ -795,6 +797,7 @@ rpmh-regulator-smpi1 { compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "smpi1"; + status = "disabled"; S1I: pmg1110i_s1: vreg-pmg1110i-s1 { regulator-name = "pmg1110i_s1"; @@ -802,12 +805,14 @@ regulator-min-microvolt = <870000>; regulator-max-microvolt = <970000>; qcom,init-voltage = <904000>; + status = "disabled"; }; }; rpmh-regulator-smpj1 { compatible = "qcom,rpmh-vrm-regulator"; qcom,resource-name = "smpj1"; + status = "disabled"; S1J: pmg1110j_s1: vreg-pmg1110j-s1 { regulator-name = "pmg1110j_s1"; @@ -815,6 +820,7 @@ regulator-min-microvolt = <556000>; regulator-max-microvolt = <816000>; qcom,init-voltage = <556000>; + status = "disabled"; }; }; @@ -831,7 +837,7 @@ regulator-name = "pmr735b_l1"; qcom,set = ; regulator-min-microvolt = <806000>; - regulator-max-microvolt = <901000>; + regulator-max-microvolt = <912000>; qcom,init-voltage = <806000>; qcom,init-mode = ; }; @@ -887,9 +893,9 @@ L4K: pmr735b_l4: vreg-pmr735b-l4 { regulator-name = "pmr735b_l4"; qcom,set = ; - regulator-min-microvolt = <120000>; + regulator-min-microvolt = <960000>; regulator-max-microvolt = <1200000>; - qcom,init-voltage = <1200000>; + qcom,init-voltage = <960000>; qcom,init-mode = ; }; }; diff --git a/qcom/kera.dtsi b/qcom/kera.dtsi index 185559b5..24e7166a 100644 --- a/qcom/kera.dtsi +++ b/qcom/kera.dtsi @@ -2264,6 +2264,7 @@ #address-cells = <2>; #size-cells = <0>; qcom,can-sleep; + status = "disabled"; }; pm8550vs@6 { @@ -2280,6 +2281,7 @@ #address-cells = <2>; #size-cells = <0>; qcom,can-sleep; + status = "disabled"; }; pmg1110@9 { @@ -2288,6 +2290,7 @@ #address-cells = <2>; #size-cells = <0>; qcom,can-sleep; + status = "disabled"; }; pmr735d@a {