diff --git a/qcom/bengal-thermal.dtsi b/qcom/bengal-thermal.dtsi index 023d19e1..913eb910 100644 --- a/qcom/bengal-thermal.dtsi +++ b/qcom/bengal-thermal.dtsi @@ -856,132 +856,12 @@ polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&pm6125_adc_tm 1>; - status = "disabled"; trips { active-config0 { temperature = <125000>; hysteresis = <1000>; type = "passive"; }; - - skin_batt_trip0: batt-trip0 { - temperature = <39000>; - hysteresis = <2000>; - type = "passive"; - }; - - skin_modem_trip0: modem-trip0 { - temperature = <40000>; - hysteresis = <4000>; - type = "passive"; - }; - - skin_gold_trip: gold-trip { - temperature = <40000>; - hysteresis = <0>; - type = "passive"; - }; - - skin_batt_trip1: batt-trip1 { - temperature = <41000>; - hysteresis = <2000>; - type = "passive"; - }; - - skin_silver_trip: silver-trip { - temperature = <41000>; - hysteresis = <0>; - type = "passive"; - }; - - skin_modem_trip1: modem-trip1 { - temperature = <42000>; - hysteresis = <4000>; - type = "passive"; - }; - - skin_modem_trip2: modem-trip2 { - temperature = <43000>; - hysteresis = <4000>; - type = "passive"; - }; - - skin_batt_trip2: batt-trip2 { - temperature = <43000>; - hysteresis = <2000>; - type = "passive"; - }; - - skin_gpu_trip: gpu-trip { - temperature = <43000>; - hysteresis = <0>; - type = "passive"; - }; - - skin_batt_trip3: batt-trip3 { - temperature = <45000>; - hysteresis = <2000>; - type = "passive"; - }; - - skin_modem_trip3: modem-trip3 { - temperature = <50000>; - hysteresis = <5000>; - type = "passive"; - }; - - skin_hvx_trip: hvx-trip { - temperature = <52000>; - hysteresis = <4000>; - type = "passive"; - }; - }; - - cooling-maps { - gold_cdev { - trip = <&skin_gold_trip>; - cooling-device = <&CPU4 0 3>; - }; - - silver_cdev { - trip = <&skin_silver_trip>; - cooling-device = <&CPU0 0 2>; - }; - - gpu_cdev { - trip = <&skin_gpu_trip>; - cooling-device = <&msm_gpu 0 3>; - }; - - hvx_cdev { - trip = <&skin_hvx_trip>; - cooling-device = <&cdsp_sw 4 4>; - }; - - mdm_cdev0 { - trip = <&skin_modem_trip0>; - cooling-device = <&modem_proc 1 1>; - }; - - mdm_cdev1 { - trip = <&skin_modem_trip1>; - cooling-device = <&modem_pa 1 1>; - }; - - mdm_cdev2 { - trip = <&skin_modem_trip2>; - cooling-device = <&modem_pa 2 2>; - }; - - mdm_cdev3 { - trip = <&skin_modem_trip3>; - cooling-device = <&modem_pa 3 3>; - }; - - mdm_cdev4 { - trip = <&skin_modem_trip3>; - cooling-device = <&modem_proc 3 3>; - }; }; }; diff --git a/qcom/khaje-qrd.dtsi b/qcom/khaje-qrd.dtsi index 485d0e1d..c628fabd 100644 --- a/qcom/khaje-qrd.dtsi +++ b/qcom/khaje-qrd.dtsi @@ -209,9 +209,6 @@ &thermal_zones { quiet-therm { polling-delay-passive = <2000>; - polling-delay = <0>; - thermal-sensors = <&pm6125_adc_tm 1>; - trips { quiet_batt_trip0: batt-trip0 { temperature = <41000>; @@ -316,10 +313,6 @@ }; pa-therm0 { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-sensors = <&pm6125_adc_tm 0>; - trips { pa_therm0_trip0: pa-therm0-trip0 { temperature = <52000>;