From a38abaaa2e4aa7786fe84c038fafcc82726ab453 Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Mon, 4 Oct 2021 10:43:47 +0300 Subject: [PATCH] arm64: dts: lahaina: remove thermal zones Change-Id: Ie75e53918fa764e5d72c394c9edf4a63827d0e69 --- .../dts/vendor/qcom/lahaina-pmic-overlay.dtsi | 316 ------------------ .../vendor/qcom/lahaina-thermal-overlay.dtsi | 3 + 2 files changed, 3 insertions(+), 316 deletions(-) diff --git a/arch/arm64/boot/dts/vendor/qcom/lahaina-pmic-overlay.dtsi b/arch/arm64/boot/dts/vendor/qcom/lahaina-pmic-overlay.dtsi index abfcdaaed6a5..b362ae5f1519 100644 --- a/arch/arm64/boot/dts/vendor/qcom/lahaina-pmic-overlay.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/lahaina-pmic-overlay.dtsi @@ -273,130 +273,6 @@ }; }; -&pm8350_gpios { - pm8350_rear_tof_therm { - pm8350_rear_tof_therm_default: pm8350_rear_tof_therm_default { - pins = "gpio1"; - bias-high-impedance; - }; - }; -}; - -&pmk8350_vadc { - pinctrl-names = "default"; - pinctrl-0 = <&pm8350_rear_tof_therm_default>; - - pm8350_msm_therm { - reg = ; - label = "pm8350_msm_therm"; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - qcom,pre-scaling = <1 1>; - }; - - pm8350_cam_flash_therm { - reg = ; - label = "pm8350_cam_flash_therm"; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - qcom,pre-scaling = <1 1>; - }; - - pm8350_hot_pocket_therm { - reg = ; - label = "pm8350_hot_pocket_therm"; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - qcom,pre-scaling = <1 1>; - }; - - pm8350_wide_rfc_therm { - reg = ; - label = "pm8350_wide_rfc_therm"; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - qcom,pre-scaling = <1 1>; - }; - - pm8350_rear_tof_therm { - reg = ; - label = "pm8350_rear_tof_therm"; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - qcom,pre-scaling = <1 1>; - }; - - pm8350b_usb_conn_therm { - reg = ; - label = "pm8350b_usb_conn_therm"; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - qcom,pre-scaling = <1 1>; - }; - - pm8350b_wl_chg_therm { - reg = ; - label = "pm8350b_wl_chg_therm"; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - qcom,pre-scaling = <1 1>; - }; - - pm8350b_chg_temp { - reg = ; - label = "pm8350b_chg_temp"; - qcom,pre-scaling = <1 1>; - }; - - pm8350b_iin_fb { - reg = ; - label = "pm8350b_iin_fb"; - qcom,pre-scaling = <32 100>; - }; - - pm8350b_ichg_fb { - reg = ; - label = "pm8350b_ichg_fb"; - qcom,pre-scaling = <1000 305185>; - }; - - smb139x_1_smb_temp { - reg = ; - label = "smb139x_1_smb_temp"; - qcom,pre-scaling = <1 1>; - }; - - smb139x_1_ichg_smb { - reg = ; - label = "smb139x_1_ichg_smb"; - qcom,pre-scaling = <16 100>; - }; - - smb139x_1_iin_smb { - reg = ; - label = "smb139x_1_iin_smb"; - qcom,pre-scaling = <32 100>; - }; - - smb139x_2_smb_temp { - reg = ; - label = "smb139x_2_smb_temp"; - qcom,pre-scaling = <1 1>; - }; - - smb139x_2_ichg_smb { - reg = ; - label = "smb139x_2_ichg_smb"; - qcom,pre-scaling = <16 100>; - }; - - smb139x_2_iin_smb { - reg = ; - label = "smb139x_2_iin_smb"; - qcom,pre-scaling = <32 100>; - }; -}; - &pm8350_tz { io-channels = <&pmk8350_vadc PM8350_ADC7_DIE_TEMP>; io-channel-names = "thermal"; @@ -431,199 +307,7 @@ io-channels = <&pmk8350_vadc PMR735B_ADC7_DIE_TEMP>; io-channel-names = "thermal"; }; - -&pmk8350_adc_tm { - io-channels = <&pmk8350_vadc PM8350_ADC7_AMUX_THM1_100K_PU>, - <&pmk8350_vadc PM8350_ADC7_AMUX_THM2_100K_PU>, - <&pmk8350_vadc PM8350_ADC7_AMUX_THM3_100K_PU>, - <&pmk8350_vadc PM8350_ADC7_AMUX_THM4_100K_PU>, - <&pmk8350_vadc PM8350_ADC7_AMUX_THM5_100K_PU>, - <&pmk8350_vadc PM8350B_ADC7_AMUX_THM4_100K_PU>, - <&pmk8350_vadc PM8350B_ADC7_GPIO2_100K_PU>, - <&pmk8350_vadc PMK8350_ADC7_AMUX_THM1_100K_PU>; - - pm8350_msm_therm { - reg = ; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - }; - - pm8350_cam_flash_therm { - reg = ; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - }; - - pm8350_hot_pocket_therm { - reg = ; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - }; - - pm8350_wide_rfc_therm { - reg = ; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - }; - - pm8350_rear_tof_therm { - reg = ; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - }; - - pm8350b_usb_conn_therm { - reg = ; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - }; - - pm8350b_wl_chg_therm { - reg = ; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - }; - - pmk8350_xo_therm { - reg = ; - qcom,ratiometric; - qcom,hw-settle-time = <200>; - }; -}; - &thermal_zones { - skin-msm-therm-usr { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pmk8350_adc_tm PM8350_ADC7_AMUX_THM1_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - - active-config1 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - camera-therm-usr { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pmk8350_adc_tm PM8350_ADC7_AMUX_THM2_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - hot-pock-therm-usr { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pmk8350_adc_tm PM8350_ADC7_AMUX_THM3_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - rear-cam-therm-usr { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pmk8350_adc_tm PM8350_ADC7_AMUX_THM4_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - tof-therm-usr { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pmk8350_adc_tm PM8350_ADC7_AMUX_THM5_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - conn-therm-usr { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pmk8350_adc_tm PM8350B_ADC7_AMUX_THM4_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - wlc-therm-usr { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pmk8350_adc_tm PM8350B_ADC7_GPIO2_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - - xo-therm-usr { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - - active-config1 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; - xo-therm-step { polling-delay-passive = <0>; polling-delay = <0>; diff --git a/arch/arm64/boot/dts/vendor/qcom/lahaina-thermal-overlay.dtsi b/arch/arm64/boot/dts/vendor/qcom/lahaina-thermal-overlay.dtsi index 441b337bedcb..844a3904451c 100644 --- a/arch/arm64/boot/dts/vendor/qcom/lahaina-thermal-overlay.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/lahaina-thermal-overlay.dtsi @@ -10,6 +10,7 @@ &thermal_zones { socd { + disable-thermal-zone; cooling-maps { socd_cpu4 { trip = <&socd_trip>; @@ -34,6 +35,7 @@ }; +/* pm8350b-bcl-lvl0 { cooling-maps { vbat_modem_l3 { @@ -86,6 +88,7 @@ }; }; }; +*/ pm8350b-bcl-lvl2 { cooling-maps {