From fb44aa4c0116e01c52ff081a967e47caad34716d Mon Sep 17 00:00:00 2001 From: Archana Sriram Date: Thu, 1 Aug 2024 14:44:27 +0530 Subject: [PATCH] ARM: dts: msm: Update PMIC adc_tm nodes for ravelin Modify pmk8350, pm7250b and pmi632 adc_tm nodes to suit qcom-spmi-adc-tm5 thermal driver for ravelin. Change-Id: I00fc712cda79b52b74a0e11da34bb2eae25414d4 Signed-off-by: Archana Sriram --- qcom/pmi632.dtsi | 2 +- qcom/ravelin-pm7250b.dtsi | 17 ++++++------ qcom/ravelin-pmi632.dtsi | 26 +++++++++--------- qcom/ravelin-pmic-overlay.dtsi | 50 +++++++++++++++++----------------- 4 files changed, 48 insertions(+), 47 deletions(-) diff --git a/qcom/pmi632.dtsi b/qcom/pmi632.dtsi index a6c9a75c..81017af1 100644 --- a/qcom/pmi632.dtsi +++ b/qcom/pmi632.dtsi @@ -116,9 +116,9 @@ }; pmi632_adc_tm: adc_tm@3500 { + compatible = "qcom,spmi-adc-tm5"; reg = <0x3500>; interrupts = <0x2 0x35 0x0 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "threshold"; #address-cells = <1>; #size-cells = <0>; #thermal-sensor-cells = <1>; diff --git a/qcom/ravelin-pm7250b.dtsi b/qcom/ravelin-pm7250b.dtsi index 750724d2..8c6d249c 100644 --- a/qcom/ravelin-pm7250b.dtsi +++ b/qcom/ravelin-pm7250b.dtsi @@ -125,19 +125,20 @@ &pm7250b_adc_tm { interrupts = <0x8 0x35 0x0 IRQ_TYPE_EDGE_RISING>; - io-channels = <&pm7250b_vadc ADC5_AMUX_THM3_100K_PU>, - <&pm7250b_vadc ADC5_AMUX_THM1_100K_PU>; + /* Channel nodes */ pm7250b_usb_conn_therm { - reg = ; + reg = <0>; + io-channels = <&pm7250b_vadc ADC5_AMUX_THM3_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; pm7250b_charger_skin_therm { - reg = ; + reg = <1>; + io-channels = <&pm7250b_vadc ADC5_AMUX_THM1_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; }; @@ -252,7 +253,7 @@ sys-therm-9 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pm7250b_adc_tm ADC5_AMUX_THM3_100K_PU>; + thermal-sensors = <&pm7250b_adc_tm 0>; trips { active-config0 { temperature = <125000>; @@ -271,7 +272,7 @@ sys-therm-7 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pm7250b_adc_tm ADC5_AMUX_THM1_100K_PU>; + thermal-sensors = <&pm7250b_adc_tm 1>; trips { active-config0 { temperature = <125000>; diff --git a/qcom/ravelin-pmi632.dtsi b/qcom/ravelin-pmi632.dtsi index 518976db..9386912a 100644 --- a/qcom/ravelin-pmi632.dtsi +++ b/qcom/ravelin-pmi632.dtsi @@ -143,26 +143,26 @@ }; &pmi632_adc_tm { - io-channels = <&pmi632_vadc ADC5_GPIO1_100K_PU>, - <&pmi632_vadc ADC5_GPIO2_100K_PU>, - <&pmi632_vadc ADC5_GPIO3_100K_PU>; - + /*Channel nodes */ pmi632_usb_conn_therm { - reg = ; + reg = <0>; + io-channels = <&pmi632_vadc ADC5_GPIO1_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; pmi632_charger_skin_temp { - reg = ; + reg = <1>; + io-channels = <&pmi632_vadc ADC5_GPIO2_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; pmi632_smb_skin_therm { - reg = ; + reg = <2>; + io-channels = <&pmi632_vadc ADC5_GPIO3_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; }; @@ -262,7 +262,7 @@ sys-therm-9 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pmi632_adc_tm ADC5_GPIO1_100K_PU>; + thermal-sensors = <&pmi632_adc_tm 0>; trips { active-config0 { temperature = <125000>; @@ -281,7 +281,7 @@ sys-therm-7 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pmi632_adc_tm ADC5_GPIO2_100K_PU>; + thermal-sensors = <&pmi632_adc_tm 1>; trips { active-config0 { temperature = <125000>; @@ -300,7 +300,7 @@ sys-therm-8 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pmi632_adc_tm ADC5_GPIO3_100K_PU>; + thermal-sensors = <&pmi632_adc_tm 2>; trips { active-config0 { temperature = <125000>; diff --git a/qcom/ravelin-pmic-overlay.dtsi b/qcom/ravelin-pmic-overlay.dtsi index 915a1d83..d94c9230 100644 --- a/qcom/ravelin-pmic-overlay.dtsi +++ b/qcom/ravelin-pmic-overlay.dtsi @@ -155,47 +155,47 @@ }; &pmk8350_adc_tm { - io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM1_100K_PU>, - <&pmk8350_vadc PM6450_ADC7_AMUX1_GPIO2_100K_PU>, - <&pmk8350_vadc PMK8350_ADC7_AMUX_THM2_100K_PU>, - <&pmk8350_vadc PM6450_ADC7_AMUX4_GPIO5_100K_PU>, - <&pmk8350_vadc PM6450_ADC7_AMUX3_GPIO4_100K_PU>, - <&pmk8350_vadc PMK8350_ADC7_AMUX_THM3_100K_PU>; - + /* Channel nodes */ pmk8350_xo_therm { - reg = ; + reg = <0>; + io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM1_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; pm6450_quiet_therm { - reg = ; + reg = <1>; + io-channels = <&pmk8350_vadc PM6450_ADC7_AMUX1_GPIO2_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; pmk8350_wide_rfc_therm { - reg = ; + reg = <2>; + io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM2_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; pm6450_rear_cam_flash_therm { - reg = ; + reg = <3>; + io-channels = <&pmk8350_vadc PM6450_ADC7_AMUX4_GPIO5_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; pm6450_pa2_therm { - reg = ; + reg = <4>; + io-channels = <&pmk8350_vadc PM6450_ADC7_AMUX3_GPIO4_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; pmk8350_pa1_therm { - reg = ; + reg = <5>; + io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM3_100K_PU>; qcom,ratiometric; - qcom,hw-settle-time = <200>; + qcom,hw-settle-time-us = <200>; }; }; @@ -284,7 +284,7 @@ sys-therm-6 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>; + thermal-sensors = <&pmk8350_adc_tm 0>; trips { active-config0 { temperature = <125000>; @@ -303,7 +303,7 @@ sys-therm-4 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM2_100K_PU>; + thermal-sensors = <&pmk8350_adc_tm 2>; trips { active-config0 { temperature = <125000>; @@ -322,7 +322,7 @@ sys-therm-1 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pmk8350_adc_tm PM6450_ADC7_AMUX1_GPIO2_100K_PU>; + thermal-sensors = <&pmk8350_adc_tm 1>; trips { active-config0 { temperature = <125000>; @@ -341,7 +341,7 @@ sys-therm-3 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pmk8350_adc_tm PM6450_ADC7_AMUX4_GPIO5_100K_PU>; + thermal-sensors = <&pmk8350_adc_tm 3>; trips { active-config0 { temperature = <125000>; @@ -360,7 +360,7 @@ sys-therm-11 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pmk8350_adc_tm PM6450_ADC7_AMUX3_GPIO4_100K_PU>; + thermal-sensors = <&pmk8350_adc_tm 4>; trips { active-config0 { temperature = <125000>; @@ -379,7 +379,7 @@ sys-therm-5 { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM3_100K_PU>; + thermal-sensors = <&pmk8350_adc_tm 5>; trips { active-config0 { temperature = <125000>;