From 87574217783026dc026264bc27d2b1b9ee72621f Mon Sep 17 00:00:00 2001 From: Archana Sriram Date: Mon, 3 Oct 2022 21:28:24 +0530 Subject: [PATCH] ARM: dts: msm: Modify adc_tm nodes for Khaje to suit spmi adc tm5 driver Modify adc_tm nodes in Khaje and variants to suit qcom-spmi-adc-tm5 driver in msm-5.15. Change-Id: Iabe3133fe95ee0166d9b7b3fb92e7bda9217393c --- qcom/bengal-thermal.dtsi | 6 +++--- qcom/khaje-atp.dtsi | 12 +++++------- qcom/khaje-idp.dtsi | 12 +++++------- qcom/khaje-pm7250b.dtsi | 17 +++++++++-------- qcom/khaje-qrd.dtsi | 4 ++-- qcom/khaje.dtsi | 18 +++++++++--------- qcom/pm6125.dtsi | 10 ++-------- qcom/pm7250b.dtsi | 4 ++-- 8 files changed, 37 insertions(+), 46 deletions(-) diff --git a/qcom/bengal-thermal.dtsi b/qcom/bengal-thermal.dtsi index a3eda4d8..a077b521 100644 --- a/qcom/bengal-thermal.dtsi +++ b/qcom/bengal-thermal.dtsi @@ -823,7 +823,7 @@ xo-therm { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pm6125_adc_tm ADC5_XO_THERM_100K_PU>; + thermal-sensors = <&pm6125_adc_tm 2>; trips { active-config0 { temperature = <125000>; @@ -842,7 +842,7 @@ pa-therm0 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM1_100K_PU>; + thermal-sensors = <&pm6125_adc_tm 0>; trips { active-config0 { temperature = <125000>; @@ -855,7 +855,7 @@ quiet-therm { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM2_100K_PU>; + thermal-sensors = <&pm6125_adc_tm 1>; status = "disabled"; trips { active-config0 { diff --git a/qcom/khaje-atp.dtsi b/qcom/khaje-atp.dtsi index af91e0dd..8f0eb87b 100644 --- a/qcom/khaje-atp.dtsi +++ b/qcom/khaje-atp.dtsi @@ -115,15 +115,13 @@ }; &pm6125_adc_tm { - io-channels = <&pm6125_vadc ADC5_AMUX_THM1_100K_PU>, - <&pm6125_vadc ADC5_AMUX_THM2_100K_PU>, - <&pm6125_vadc ADC5_XO_THERM_100K_PU>, - <&pm6125_vadc ADC5_GPIO4_100K_PU>; + status = "ok"; rf_pa1_therm { - reg = ; + reg = <3>; + io-channels = <&pm6125_vadc ADC5_GPIO4_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; }; @@ -132,7 +130,7 @@ polling-delay-passive = <0>; polling-delay = <0>; thermal-governor = "user_space"; - thermal-sensors = <&pm6125_adc_tm ADC5_GPIO4_100K_PU>; + thermal-sensors = <&pm6125_adc_tm 3>; wake-capable-sensor; trips { active-config0 { diff --git a/qcom/khaje-idp.dtsi b/qcom/khaje-idp.dtsi index d4d75671..213382a9 100644 --- a/qcom/khaje-idp.dtsi +++ b/qcom/khaje-idp.dtsi @@ -20,15 +20,13 @@ }; &pm6125_adc_tm { - io-channels = <&pm6125_vadc ADC5_AMUX_THM1_100K_PU>, - <&pm6125_vadc ADC5_AMUX_THM2_100K_PU>, - <&pm6125_vadc ADC5_XO_THERM_100K_PU>, - <&pm6125_vadc ADC5_GPIO4_100K_PU>; + status = "ok"; rf_pa1_therm { - reg = ; + reg = <3>; + io-channels = <&pm6125_vadc ADC5_GPIO4_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; }; @@ -37,7 +35,7 @@ polling-delay-passive = <0>; polling-delay = <0>; thermal-governor = "user_space"; - thermal-sensors = <&pm6125_adc_tm ADC5_GPIO4_100K_PU>; + thermal-sensors = <&pm6125_adc_tm 3>; wake-capable-sensor; trips { active-config0 { diff --git a/qcom/khaje-pm7250b.dtsi b/qcom/khaje-pm7250b.dtsi index 4330593d..4802d26e 100644 --- a/qcom/khaje-pm7250b.dtsi +++ b/qcom/khaje-pm7250b.dtsi @@ -25,20 +25,21 @@ }; &pm7250b_adc_tm { - io-channels = <&pm7250b_vadc ADC5_AMUX_THM1_100K_PU>, - <&pm7250b_vadc ADC5_AMUX_THM3_100K_PU>; + status = "ok"; /* Channel nodes */ charger_skin_therm@4d { - reg = ; + reg = <0>; + io-channels = <&pm7250b_vadc ADC5_AMUX_THM1_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; conn_therm@4f { - reg = ; + reg = <1>; + io-channels = <&pm7250b_vadc ADC5_AMUX_THM3_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; }; @@ -47,7 +48,7 @@ polling-delay-passive = <0>; polling-delay = <0>; thermal-governor = "user_space"; - thermal-sensors = <&pm7250b_adc_tm ADC5_AMUX_THM1_100K_PU>; + thermal-sensors = <&pm7250b_adc_tm 0>; wake-capable-sensor; trips { active-config0 { @@ -62,7 +63,7 @@ polling-delay-passive = <0>; polling-delay = <0>; thermal-governor = "user_space"; - thermal-sensors = <&pm7250b_adc_tm ADC5_AMUX_THM3_100K_PU>; + thermal-sensors = <&pm7250b_adc_tm 1>; wake-capable-sensor; trips { active-config0 { diff --git a/qcom/khaje-qrd.dtsi b/qcom/khaje-qrd.dtsi index 4461431a..485d0e1d 100644 --- a/qcom/khaje-qrd.dtsi +++ b/qcom/khaje-qrd.dtsi @@ -210,7 +210,7 @@ quiet-therm { polling-delay-passive = <2000>; polling-delay = <0>; - thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM2_100K_PU>; + thermal-sensors = <&pm6125_adc_tm 1>; trips { quiet_batt_trip0: batt-trip0 { @@ -318,7 +318,7 @@ pa-therm0 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM1_100K_PU>; + thermal-sensors = <&pm6125_adc_tm 0>; trips { pa_therm0_trip0: pa-therm0-trip0 { diff --git a/qcom/khaje.dtsi b/qcom/khaje.dtsi index b79d978e..75d3365e 100644 --- a/qcom/khaje.dtsi +++ b/qcom/khaje.dtsi @@ -4177,27 +4177,27 @@ tpdm_turing_llm: tpdm@8861000 { &pm6125_adc_tm { #address-cells = <1>; #size-cells = <0>; - io-channels = <&pm6125_vadc ADC5_AMUX_THM1_100K_PU>, - <&pm6125_vadc ADC5_AMUX_THM2_100K_PU>, - <&pm6125_vadc ADC5_XO_THERM_100K_PU>; /* Channel nodes */ pa_therm0 { - reg = ; + reg = <0>; + io-channels = <&pm6125_vadc ADC5_AMUX_THM1_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; quiet_therm { - reg = ; + reg = <1>; + io-channels = <&pm6125_vadc ADC5_AMUX_THM2_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; xo_therm { - reg = ; + reg = <2>; + io-channels = <&pm6125_vadc ADC5_XO_THERM_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; }; diff --git a/qcom/pm6125.dtsi b/qcom/pm6125.dtsi index c1306da4..ed49b316 100644 --- a/qcom/pm6125.dtsi +++ b/qcom/pm6125.dtsi @@ -69,12 +69,6 @@ qcom,pre-scaling = <1 3>; }; - vcoin { - reg = ; - label = "vcoin"; - qcom,pre-scaling = <1 3>; - }; - xo_therm { reg = ; label = "xo_therm"; @@ -85,10 +79,10 @@ }; pm6125_adc_tm: adc_tm@3500 { - compatible = "qcom,adc-tm5"; + compatible = "qcom,spmi-adc-tm5"; reg = <0x3500>; interrupts = <0x0 0x35 0x0 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "thr-int-en"; + interrupt-names = "pm-adc-tm5"; #address-cells = <1>; #size-cells = <0>; #thermal-sensor-cells = <1>; diff --git a/qcom/pm7250b.dtsi b/qcom/pm7250b.dtsi index 4ed03d3b..e8a39c45 100644 --- a/qcom/pm7250b.dtsi +++ b/qcom/pm7250b.dtsi @@ -382,10 +382,10 @@ }; pm7250b_adc_tm: adc_tm@3500 { - compatible = "qcom,adc-tm5"; + compatible = "qcom,spmi-adc-tm5"; reg = <0x3500>; interrupts = <0x2 0x35 0x0 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "thr-int-en"; + interrupt-names = "pm-adc-tm5"; #address-cells = <1>; #size-cells = <0>; #thermal-sensor-cells = <1>;