From cbca24739048453768c05ab62d206c148e022af3 Mon Sep 17 00:00:00 2001 From: Gopala Krishna Nuthaki Date: Mon, 21 Feb 2022 13:26:35 +0530 Subject: [PATCH] ARM: dts: qcom: Remove thermal-engine specific trip from pmic alarm tzones PMIC alarm sensor thermal zones expects only 3 trips, adding additional trips will result in thermal zone registration failure in pmic adc driver. Remove added thermal-engine specific trip from alarm sensor thermal zones. Added logic in thermal-engine to handle trip violations without updating trip thresholds. Change-Id: I0c4f17af9e47fb41fe9b02834e1f96d4efcfb06b --- qcom/pm7250b.dtsi | 6 ------ qcom/pm7325.dtsi | 6 ------ qcom/pm8350.dtsi | 6 ------ qcom/pm8350b.dtsi | 6 ------ qcom/pm8350c.dtsi | 6 ------ qcom/pm8450.dtsi | 6 ------ qcom/pmr735a.dtsi | 6 ------ qcom/pmr735b.dtsi | 6 ------ qcom/waipio-pm8010-spmi.dtsi | 12 ------------ 9 files changed, 60 deletions(-) diff --git a/qcom/pm7250b.dtsi b/qcom/pm7250b.dtsi index a121007f..7e548679 100644 --- a/qcom/pm7250b.dtsi +++ b/qcom/pm7250b.dtsi @@ -431,12 +431,6 @@ thermal-sensors = <&pm7250b_tz>; trips { - thermal-engine-config { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - pm7250b_trip0: trip0 { temperature = <90000>; hysteresis = <0>; diff --git a/qcom/pm7325.dtsi b/qcom/pm7325.dtsi index d52c19a5..4aa5bedb 100644 --- a/qcom/pm7325.dtsi +++ b/qcom/pm7325.dtsi @@ -39,12 +39,6 @@ thermal-sensors = <&pm7325_tz>; trips { - thermal-engine-config { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - pm7325_trip0: trip0 { temperature = <95000>; hysteresis = <0>; diff --git a/qcom/pm8350.dtsi b/qcom/pm8350.dtsi index 3b6251e0..1b79409a 100644 --- a/qcom/pm8350.dtsi +++ b/qcom/pm8350.dtsi @@ -39,12 +39,6 @@ thermal-sensors = <&pm8350_tz>; trips { - thermal-engine-config { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - pm8350_trip0: trip0 { temperature = <95000>; hysteresis = <0>; diff --git a/qcom/pm8350b.dtsi b/qcom/pm8350b.dtsi index f7e8b287..d0709f54 100644 --- a/qcom/pm8350b.dtsi +++ b/qcom/pm8350b.dtsi @@ -231,12 +231,6 @@ thermal-sensors = <&pm8350b_tz>; trips { - thermal-engine-config { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - pm8350b_trip0: trip0 { temperature = <90000>; hysteresis = <0>; diff --git a/qcom/pm8350c.dtsi b/qcom/pm8350c.dtsi index a915c6e8..b08b7bb6 100644 --- a/qcom/pm8350c.dtsi +++ b/qcom/pm8350c.dtsi @@ -235,12 +235,6 @@ thermal-sensors = <&pm8350c_tz>; trips { - thermal-engine-config { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - pm8350c_trip0: trip0 { temperature = <95000>; hysteresis = <0>; diff --git a/qcom/pm8450.dtsi b/qcom/pm8450.dtsi index f4023256..8b83bc1a 100644 --- a/qcom/pm8450.dtsi +++ b/qcom/pm8450.dtsi @@ -39,12 +39,6 @@ thermal-sensors = <&pm8450_tz>; trips { - thermal-engine-config { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - pm8450_trip0: trip0 { temperature = <95000>; hysteresis = <0>; diff --git a/qcom/pmr735a.dtsi b/qcom/pmr735a.dtsi index 98f039f3..2a72ec63 100644 --- a/qcom/pmr735a.dtsi +++ b/qcom/pmr735a.dtsi @@ -39,12 +39,6 @@ thermal-sensors = <&pmr735a_tz>; trips { - thermal-engine-config { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - pmr735a_trip0: trip0 { temperature = <95000>; hysteresis = <0>; diff --git a/qcom/pmr735b.dtsi b/qcom/pmr735b.dtsi index 0556b3f9..b1050bf0 100644 --- a/qcom/pmr735b.dtsi +++ b/qcom/pmr735b.dtsi @@ -39,12 +39,6 @@ thermal-sensors = <&pmr735b_tz>; trips { - thermal-engine-config { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - pmr735b_trip0: trip0 { temperature = <95000>; hysteresis = <0>; diff --git a/qcom/waipio-pm8010-spmi.dtsi b/qcom/waipio-pm8010-spmi.dtsi index 9118ea77..c8f4b541 100644 --- a/qcom/waipio-pm8010-spmi.dtsi +++ b/qcom/waipio-pm8010-spmi.dtsi @@ -225,12 +225,6 @@ thermal-sensors = <&pm8010i_tz>; trips { - thermal-engine-config { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - trip0 { temperature = <95000>; hysteresis = <0>; @@ -258,12 +252,6 @@ thermal-sensors = <&pm8010j_tz>; trips { - thermal-engine-config { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - trip0 { temperature = <95000>; hysteresis = <0>;