From 388044d917dec668ca1206b5dd2772d051c472c0 Mon Sep 17 00:00:00 2001
From: Anjelique Melendez <quic_amelende@quicinc.com>
Date: Tue, 31 Oct 2023 11:27:27 -0700
Subject: [PATCH] ARM: dts: msm: Update PM8550VS and PM8550VE VADC registers
 for pineapple

Currently, PM8550VS and PM8550VE ADC channels are using old macros for
register address. Update device nodes so that they use the new
PM8550VX_ADC5_GEN3_<channel>(sid) macros.

Change-Id: I151d965a3eb03ad318deb21dea47170e5806f37a
Signed-off-by: Anjelique Melendez <quic_amelende@quicinc.com>
---
 qcom/pineapple-pmic-overlay.dtsi | 20 ++++++++++----------
 qcom/pmk8550.dtsi                |  1 -
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/qcom/pineapple-pmic-overlay.dtsi b/qcom/pineapple-pmic-overlay.dtsi
index dbbea970..f37e7492 100644
--- a/qcom/pineapple-pmic-overlay.dtsi
+++ b/qcom/pineapple-pmic-overlay.dtsi
@@ -92,27 +92,27 @@
 };
 
 &pm8550vs_c_tz {
-	io-channels = <&pmk8550_vadc PM8550VS_C_ADC5_GEN3_DIE_TEMP>;
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(2)>;
 	io-channel-names = "thermal";
 };
 
 &pm8550vs_d_tz {
-	io-channels = <&pmk8550_vadc PM8550VS_D_ADC5_GEN3_DIE_TEMP>;
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(3)>;
 	io-channel-names = "thermal";
 };
 
 &pm8550vs_e_tz {
-	io-channels = <&pmk8550_vadc PM8550VS_E_ADC5_GEN3_DIE_TEMP>;
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(4)>;
 	io-channel-names = "thermal";
 };
 
 &pm8550vs_g_tz {
-	io-channels = <&pmk8550_vadc PM8550VS_G_ADC5_GEN3_DIE_TEMP>;
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(6)>;
 	io-channel-names = "thermal";
 };
 
 &pm8550ve_i_tz {
-	io-channels = <&pmk8550_vadc PM8550VE_ADC5_GEN3_DIE_TEMP>;
+	io-channels = <&pmk8550_vadc PM8550VX_ADC5_GEN3_DIE_TEMP(8)>;
 	io-channel-names = "thermal";
 };
 
@@ -240,31 +240,31 @@
 	};
 
 	pm8550vs_c_die_temp {
-		reg = <PM8550VS_C_ADC5_GEN3_DIE_TEMP>;
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(2)>;
 		label = "pm8550vs_c_die_temp";
 		qcom,pre-scaling = <1 1>;
 	};
 
 	pm8550vs_d_die_temp {
-		reg = <PM8550VS_D_ADC5_GEN3_DIE_TEMP>;
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(3)>;
 		label = "pm8550vs_d_die_temp";
 		qcom,pre-scaling = <1 1>;
 	};
 
 	pm8550vs_e_die_temp {
-		reg = <PM8550VS_E_ADC5_GEN3_DIE_TEMP>;
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(4)>;
 		label = "pm8550vs_e_die_temp";
 		qcom,pre-scaling = <1 1>;
 	};
 
 	pm8550vs_g_die_temp {
-		reg = <PM8550VS_G_ADC5_GEN3_DIE_TEMP>;
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(6)>;
 		label = "pm8550vs_g_die_temp";
 		qcom,pre-scaling = <1 1>;
 	};
 
 	pm8550ve_die_temp {
-		reg = <PM8550VE_ADC5_GEN3_DIE_TEMP>;
+		reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(8)>;
 		label = "pm8550ve_die_temp";
 		qcom,pre-scaling = <1 1>;
 	};
diff --git a/qcom/pmk8550.dtsi b/qcom/pmk8550.dtsi
index 23455f96..f2faa3f0 100644
--- a/qcom/pmk8550.dtsi
+++ b/qcom/pmk8550.dtsi
@@ -9,7 +9,6 @@
 #include <dt-bindings/iio/qcom,spmi-adc5-gen3-pmk8550.h>
 #include <dt-bindings/iio/qcom,spmi-adc5-gen3-pm8550.h>
 #include <dt-bindings/iio/qcom,spmi-adc5-gen3-pm8550b.h>
-#define PM8550VE_SID	8
 #include <dt-bindings/iio/qcom,spmi-adc5-gen3-pm8550vx.h>
 
 &spmi_bus {