arm64: dts: qcom: Use labels with generic node names for ADC channels

As discussed in [1] it is more convenient to use a generic `channel`
node name for ADC channels while storing a friendly - board-specific
instead of PMIC-specific - name in the label, if/when desired to
overwrite the channel description already contained (but previously
unused) in the driver [2].  Follow up on the dt-bindings' `channel` node
name requirement, and instead provide this (sometimes per-board) channel
description through a label property.

Also remove all the unused label references (not to be confused with
label properties) from pm660, pmp8074 and pms405.

[1]: https://lore.kernel.org/linux-arm-msm/20221106193018.270106-1-marijn.suijten@somainline.org/T/#u
[2]: https://lore.kernel.org/linux-arm-msm/20230116220909.196926-4-marijn.suijten@somainline.org/

Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230730-generic-adc-channels-v5-2-e6c69bda8034@somainline.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/pm6125.dtsi b/arch/arm64/boot/dts/qcom/pm6125.dtsi
index 59092a551a161c395eb88349503487c2a8ec0fd8..99369a0cdb6163ce827258f2ef2deeb2c888daff 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm6125.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm6125.dtsi
@@ -85,36 +85,42 @@
                        interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
                        #io-channel-cells = <1>;
 
-                       ref-gnd@0 {
+                       channel@0 {
                                reg = <ADC5_REF_GND>;
                                qcom,pre-scaling = <1 1>;
+                               label = "ref_gnd";
                        };
 
-                       vref-1p25@1 {
+                       channel@1 {
                                reg = <ADC5_1P25VREF>;
                                qcom,pre-scaling = <1 1>;
+                               label = "vref_1p25";
                        };
 
-                       die-temp@6 {
+                       channel@6 {
                                reg = <ADC5_DIE_TEMP>;
                                qcom,pre-scaling = <1 1>;
+                               label = "die_temp";
                        };
 
-                       vph-pwr@83 {
+                       channel@83 {
                                reg = <ADC5_VPH_PWR>;
                                qcom,pre-scaling = <1 3>;
+                               label = "vph_pwr";
                        };
 
-                       vcoin@85 {
+                       channel@85 {
                                reg = <ADC5_VCOIN>;
                                qcom,pre-scaling = <1 3>;
+                               label = "vcoin";
                        };
 
-                       xo-therm@4c {
+                       channel@4c {
                                reg = <ADC5_XO_THERM_100K_PU>;
                                qcom,pre-scaling = <1 1>;
                                qcom,hw-settle-time = <200>;
                                qcom,ratiometric;
+                               label = "xo_therm";
                        };
                };
 

diff --git a/arch/arm64/boot/dts/qcom/pm6150.dtsi b/arch/arm64/boot/dts/qcom/pm6150.dtsi
index 2e6afa2961411bfc9092a724038fcd86d809a06c..7d4d1f2767ed6afe1c2124616cd3db493bcc97cc 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm6150.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm6150.dtsi
@@ -72,7 +72,7 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
 
-                       adc-chan@6 {
+                       channel@6 {
                                reg = <ADC5_DIE_TEMP>;
                                label = "die_temp";
                        };

diff --git a/arch/arm64/boot/dts/qcom/pm6150l.dtsi b/arch/arm64/boot/dts/qcom/pm6150l.dtsi
index 0fdf440596c018195ec03651080a0740e3d3a69a..d13a1ab7c20b34dcd9cc9613d3f488d95bad78f1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm6150l.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm6150l.dtsi
@@ -60,25 +60,25 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
 
-                       adc-chan@0 {
+                       channel@0 {
                                reg = <ADC5_REF_GND>;
                                qcom,pre-scaling = <1 1>;
                                label = "ref_gnd";
                        };
 
-                       adc-chan@1 {
+                       channel@1 {
                                reg = <ADC5_1P25VREF>;
                                qcom,pre-scaling = <1 1>;
                                label = "vref_1p25";
                        };
 
-                       adc-chan@6 {
+                       channel@6 {
                                reg = <ADC5_DIE_TEMP>;
                                qcom,pre-scaling = <1 1>;
                                label = "die_temp";
                        };
 
-                       adc-chan@83 {
+                       channel@83 {
                                reg = <ADC5_VPH_PWR>;
                                qcom,pre-scaling = <1 3>;
                                label = "vph_pwr";

diff --git a/arch/arm64/boot/dts/qcom/pm660.dtsi b/arch/arm64/boot/dts/qcom/pm660.dtsi
index 4bc717917f4488b82f18255a6aa7f4a14c4ae63d..98dc04962fe3401d6ba9cbc384854c8ea88bbd63 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm660.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm660.dtsi
@@ -91,82 +91,93 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
 
-                       ref_gnd: ref_gnd@0 {
+                       channel@0 {
                                reg = <ADC5_REF_GND>;
                                qcom,decimation = <1024>;
                                qcom,pre-scaling = <1 1>;
+                               label = "ref_gnd";
                        };
 
-                       vref_1p25: vref_1p25@1 {
+                       channel@1 {
                                reg = <ADC5_1P25VREF>;
                                qcom,decimation = <1024>;
                                qcom,pre-scaling = <1 1>;
+                               label = "vref_1p25";
                        };
 
-                       die_temp: die_temp@6 {
+                       channel@6 {
                                reg = <ADC5_DIE_TEMP>;
                                qcom,decimation = <1024>;
                                qcom,pre-scaling = <1 1>;
+                               label = "die_temp";
                        };
 
-                       xo_therm: xo_therm@4c {
+                       channel@4c {
                                reg = <ADC5_XO_THERM_100K_PU>;
                                qcom,pre-scaling = <1 1>;
                                qcom,decimation = <1024>;
                                qcom,hw-settle-time = <200>;
                                qcom,ratiometric;
+                               label = "xo_therm";
                        };
 
-                       msm_therm: msm_therm@4d {
+                       channel@4d {
                                reg = <ADC5_AMUX_THM1_100K_PU>;
                                qcom,pre-scaling = <1 1>;
                                qcom,decimation = <1024>;
                                qcom,hw-settle-time = <200>;
                                qcom,ratiometric;
+                               label = "msm_therm";
                        };
 
-                       emmc_therm: emmc_therm@4e {
+                       channel@4e {
                                reg = <ADC5_AMUX_THM2_100K_PU>;
                                qcom,pre-scaling = <1 1>;
                                qcom,decimation = <1024>;
                                qcom,hw-settle-time = <200>;
                                qcom,ratiometric;
+                               label = "emmc_therm";
                        };
 
-                       pa_therm0: thermistor0@4f {
+                       channel@4f {
                                reg = <ADC5_AMUX_THM3_100K_PU>;
                                qcom,pre-scaling = <1 1>;
                                qcom,decimation = <1024>;
                                qcom,hw-settle-time = <200>;
                                qcom,ratiometric;
+                               label = "pa_therm0";
                        };
 
-                       pa_therm1: thermistor1@50 {
+                       channel@50 {
                                reg = <ADC5_AMUX_THM4_100K_PU>;
                                qcom,pre-scaling = <1 1>;
                                qcom,decimation = <1024>;
                                qcom,hw-settle-time = <200>;
                                qcom,ratiometric;
+                               label = "pa_therm1";
                        };
 
-                       quiet_therm: quiet_therm@51 {
+                       channel@51 {
                                reg = <ADC5_AMUX_THM5_100K_PU>;
                                qcom,pre-scaling = <1 1>;
                                qcom,decimation = <1024>;
                                qcom,hw-settle-time = <200>;
                                qcom,ratiometric;
+                               label = "quiet_therm";
                        };
 
-                       vadc_vph_pwr: vph_pwr@83 {
+                       channel@83 {
                                reg = <ADC5_VPH_PWR>;
                                qcom,decimation = <1024>;
                                qcom,pre-scaling = <1 3>;
+                               label = "vph_pwr";
                        };
 
-                       vcoin: vcoin@85 {
+                       channel@85 {
                                reg = <ADC5_VCOIN>;
                                qcom,decimation = <1024>;
                                qcom,pre-scaling = <1 3>;
+                               label = "vcoin";
                        };
                };
 

diff --git a/arch/arm64/boot/dts/qcom/pm7250b.dtsi b/arch/arm64/boot/dts/qcom/pm7250b.dtsi
index daa6f1d30efa01b4616b45da0092875bc8fac0a0..22c0d5266179398425b56964848724a94374e5e4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm7250b.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm7250b.dtsi
@@ -62,56 +62,56 @@
                        #io-channel-cells = <1>;
                        interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
 
-                       adc-chan@0 {
+                       channel@0 {
                                reg = <ADC5_REF_GND>;
                                qcom,pre-scaling = <1 1>;
                                label = "ref_gnd";
                        };
 
-                       adc-chan@1 {
+                       channel@1 {
                                reg = <ADC5_1P25VREF>;
                                qcom,pre-scaling = <1 1>;
                                label = "vref_1p25";
                        };
 
-                       adc-chan@2 {
+                       channel@2 {
                                reg = <ADC5_DIE_TEMP>;
                                qcom,pre-scaling = <1 1>;
                                label = "die_temp";
                        };
 
-                       adc-chan@7 {
+                       channel@7 {
                                reg = <ADC5_USB_IN_I>;
                                qcom,pre-scaling = <1 1>;
                                label = "usb_in_i_uv";
                        };
 
-                       adc-chan@8 {
+                       channel@8 {
                                reg = <ADC5_USB_IN_V_16>;
                                qcom,pre-scaling = <1 16>;
                                label = "usb_in_v_div_16";
                        };
 
-                       adc-chan@9 {
+                       channel@9 {
                                reg = <ADC5_CHG_TEMP>;
                                qcom,pre-scaling = <1 1>;
                                label = "chg_temp";
                        };
 
-                       adc-chan@e {
+                       channel@e {
                                reg = <ADC5_AMUX_THM2>;
                                qcom,hw-settle-time = <200>;
                                qcom,pre-scaling = <1 1>;
                                label = "smb1390_therm";
                        };
 
-                       adc-chan@1e {
+                       channel@1e {
                                reg = <ADC5_MID_CHG_DIV6>;
                                qcom,pre-scaling = <1 6>;
                                label = "chg_mid";
                        };
 
-                       adc-chan@4b {
+                       channel@4b {
                                reg = <ADC5_BAT_ID_100K_PU>;
                                qcom,hw-settle-time = <200>;
                                qcom,pre-scaling = <1 1>;
@@ -119,19 +119,19 @@
                                label = "bat_id";
                        };
 
-                       adc-chan@83 {
+                       channel@83 {
                                reg = <ADC5_VPH_PWR>;
                                qcom,pre-scaling = <1 3>;
                                label = "vph_pwr";
                        };
 
-                       adc-chan@84 {
+                       channel@84 {
                                reg = <ADC5_VBAT_SNS>;
                                qcom,pre-scaling = <1 3>;
                                label = "vbat_sns";
                        };
 
-                       adc-chan@99 {
+                       channel@99 {
                                reg = <ADC5_SBUx>;
                                qcom,pre-scaling = <1 3>;
                                label = "chg_sbux";

diff --git a/arch/arm64/boot/dts/qcom/pm8150.dtsi b/arch/arm64/boot/dts/qcom/pm8150.dtsi
index db90c55fa2cf11d396618719a85919da5c130e2b..3ba3ba5d8fceb26574a0dcf00bb572b1b362edde 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8150.dtsi
@@ -90,19 +90,19 @@
                        #io-channel-cells = <1>;
                        interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
 
-                       ref-gnd@0 {
+                       channel@0 {
                                reg = <ADC5_REF_GND>;
                                qcom,pre-scaling = <1 1>;
                                label = "ref_gnd";
                        };
 
-                       vref-1p25@1 {
+                       channel@1 {
                                reg = <ADC5_1P25VREF>;
                                qcom,pre-scaling = <1 1>;
                                label = "vref_1p25";
                        };
 
-                       die-temp@6 {
+                       channel@6 {
                                reg = <ADC5_DIE_TEMP>;
                                qcom,pre-scaling = <1 1>;
                                label = "die_temp";

diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
index 66752cc063d6030cf897c689c304e54ebac82438..2b9123df5847e487d71d608b3d89dbc355050cb4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
@@ -76,25 +76,25 @@
                        #io-channel-cells = <1>;
                        interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
 
-                       ref-gnd@0 {
+                       channel@0 {
                                reg = <ADC5_REF_GND>;
                                qcom,pre-scaling = <1 1>;
                                label = "ref_gnd";
                        };
 
-                       vref-1p25@1 {
+                       channel@1 {
                                reg = <ADC5_1P25VREF>;
                                qcom,pre-scaling = <1 1>;
                                label = "vref_1p25";
                        };
 
-                       die-temp@6 {
+                       channel@6 {
                                reg = <ADC5_DIE_TEMP>;
                                qcom,pre-scaling = <1 1>;
                                label = "die_temp";
                        };
 
-                       chg-temp@9 {
+                       channel@9 {
                                reg = <ADC5_CHG_TEMP>;
                                qcom,pre-scaling = <1 1>;
                                label = "chg_temp";

diff --git a/arch/arm64/boot/dts/qcom/pm8150l.dtsi b/arch/arm64/boot/dts/qcom/pm8150l.dtsi
index cca45fad75acbbcfefc1e5c319eb16ea132599d2..b1686e5777b8ff514578f2eb5679440e66b2d8e4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8150l.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8150l.dtsi
@@ -70,19 +70,19 @@
                        #io-channel-cells = <1>;
                        interrupts = <0x4 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
 
-                       ref-gnd@0 {
+                       channel@0 {
                                reg = <ADC5_REF_GND>;
                                qcom,pre-scaling = <1 1>;
                                label = "ref_gnd";
                        };
 
-                       vref-1p25@1 {
+                       channel@1 {
                                reg = <ADC5_1P25VREF>;
                                qcom,pre-scaling = <1 1>;
                                label = "vref_1p25";
                        };
 
-                       die-temp@6 {
+                       channel@6 {
                                reg = <ADC5_DIE_TEMP>;
                                qcom,pre-scaling = <1 1>;
                                label = "die_temp";

diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi
index 1ea8920ff3694108672bdeea260ba587ed3e7303..223442f909f15de428c9f15c5234b2fe72140a0b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -66,27 +66,27 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
 
-                       adc-chan@0 {
+                       channel@0 {
                                reg = <VADC_USBIN>;
                                qcom,pre-scaling = <1 10>;
                        };
-                       adc-chan@7 {
+                       channel@7 {
                                reg = <VADC_VSYS>;
                                qcom,pre-scaling = <1 3>;
                        };
-                       adc-chan@8 {
+                       channel@8 {
                                reg = <VADC_DIE_TEMP>;
                        };
-                       adc-chan@9 {
+                       channel@9 {
                                reg = <VADC_REF_625MV>;
                        };
-                       adc-chan@a {
+                       channel@a {
                                reg = <VADC_REF_1250MV>;
                        };
-                       adc-chan@e {
+                       channel@e {
                                reg = <VADC_GND_REF>;
                        };
-                       adc-chan@f {
+                       channel@f {
                                reg = <VADC_VDD_VADC>;
                        };
                };

diff --git a/arch/arm64/boot/dts/qcom/pm8950.dtsi b/arch/arm64/boot/dts/qcom/pm8950.dtsi
index 5ec38b7e335ab6a53068d84a5e9afbd179916dd1..f03095779de0578990d28c4b16a70cd218bdbf4b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8950.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8950.dtsi
@@ -50,77 +50,90 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
 
-                       vcoin@5 {
+                       channel@5 {
                                reg = <VADC_VCOIN>;
                                qcom,pre-scaling = <1 1>;
+                               label = "vcoin";
                        };
 
-                       vph-pwr@7 {
+                       channel@7 {
                                reg = <VADC_VSYS>;
                                qcom,pre-scaling = <1 1>;
+                               label = "vph_pwr";
                        };
 
-                       die-temp@8 {
+                       channel@8 {
                                reg = <VADC_DIE_TEMP>;
                                qcom,pre-scaling = <1 1>;
+                               label = "die_temp";
                        };
 
-                       ref-625mv@9 {
+                       channel@9 {
                                reg = <VADC_REF_625MV>;
                                qcom,pre-scaling = <1 1>;
+                               label = "ref_625mv";
                        };
 
-                       ref-1250mv@a {
+                       channel@a {
                                reg = <VADC_REF_1250MV>;
                                qcom,pre-scaling = <1 1>;
+                               label = "ref_1250mv";
                        };
 
-                       ref-buf-625mv@c {
+                       channel@c {
                                reg = <VADC_SPARE1>;
                                qcom,pre-scaling = <1 1>;
+                               label = "ref_buf_625mv";
                        };
 
-                       ref-gnd@e {
+                       channel@e {
                                reg = <VADC_GND_REF>;
+                               label = "ref_gnd";
                        };
 
-                       ref-vdd@f {
+                       channel@f {
                                reg = <VADC_VDD_VADC>;
+                               label = "ref_vdd";
                        };
 
-                       pa-therm1@11 {
+                       channel@11 {
                                reg = <VADC_P_MUX2_1_1>;
                                qcom,pre-scaling = <1 1>;
                                qcom,ratiometric;
                                qcom,hw-settle-time = <200>;
+                               label = "pa_therm1";
                        };
 
-                       case-therm@13 {
+                       channel@13 {
                                reg = <VADC_P_MUX4_1_1>;
                                qcom,pre-scaling = <1 1>;
                                qcom,ratiometric;
                                qcom,hw-settle-time = <200>;
+                               label = "case_therm";
                        };
 
-                       xo-therm@32 {
+                       channel@32 {
                                reg = <VADC_LR_MUX3_XO_THERM>;
                                qcom,pre-scaling = <1 1>;
                                qcom,ratiometric;
                                qcom,hw-settle-time = <200>;
+                               label = "xo_therm";
                        };
 
-                       pa-therm0@36 {
+                       channel@36 {
                                reg = <VADC_LR_MUX7_HW_ID>;
                                qcom,pre-scaling = <1 1>;
                                qcom,ratiometric;
                                qcom,hw-settle-time = <200>;
+                               label = "pa_therm0";
                        };
 
-                       xo-therm-buf@3c {
+                       channel@3c {
                                reg = <VADC_LR_MUX3_BUF_XO_THERM>;
                                qcom,pre-scaling = <1 1>;
                                qcom,ratiometric;
                                qcom,hw-settle-time = <200>;
+                               label = "xo_therm_buf";
                        };
                };
 

diff --git a/arch/arm64/boot/dts/qcom/pm8953.dtsi b/arch/arm64/boot/dts/qcom/pm8953.dtsi
index d2dfc169917489a0f548937d55bff78ddbd40fd5..1067e141be6c470bb25feebff435c68e3a145d83 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8953.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8953.dtsi
@@ -84,22 +84,22 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
 
-                       adc-chan@8 {
+                       channel@8 {
                                reg = <VADC_DIE_TEMP>;
                        };
-                       adc-chan@9 {
+                       channel@9 {
                                reg = <VADC_REF_625MV>;
                        };
-                       adc-chan@a {
+                       channel@a {
                                reg = <VADC_REF_1250MV>;
                        };
-                       adc-chan@c {
+                       channel@c {
                                reg = <VADC_SPARE1>;
                        };
-                       adc-chan@e {
+                       channel@e {
                                reg = <VADC_GND_REF>;
                        };
-                       adc-chan@f {
+                       channel@f {
                                reg = <VADC_VDD_VADC>;
                        };
                };

diff --git a/arch/arm64/boot/dts/qcom/pm8994.dtsi b/arch/arm64/boot/dts/qcom/pm8994.dtsi
index 672094c8ca58692d4a73837243904a86d367ad13..d44a95caf04aec80e79b2bdb8ed314005441176d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8994.dtsi
@@ -83,27 +83,27 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
 
-                       adc-chan@7 {
+                       channel@7 {
                                reg = <VADC_VSYS>;
                                qcom,pre-scaling = <1 3>;
                                label = "vph_pwr";
                        };
-                       adc-chan@8 {
+                       channel@8 {
                                reg = <VADC_DIE_TEMP>;
                                label = "die_temp";
                        };
-                       adc-chan@9 {
+                       channel@9 {
                                reg = <VADC_REF_625MV>;
                                label = "ref_625mv";
                        };
-                       adc-chan@a {
+                       channel@a {
                                reg = <VADC_REF_1250MV>;
                                label = "ref_1250mv";
                        };
-                       adc-chan@e {
+                       channel@e {
                                reg = <VADC_GND_REF>;
                        };
-                       adc-chan@f {
+                       channel@f {
                                reg = <VADC_VDD_VADC>;
                        };
                };

diff --git a/arch/arm64/boot/dts/qcom/pm8998.dtsi b/arch/arm64/boot/dts/qcom/pm8998.dtsi
index 695d79116cde257b94ddc9083072863fca7cef76..3f82715392c6b8cc146ef9368e2080185c477c16 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8998.dtsi
@@ -86,7 +86,7 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
 
-                       adc-chan@6 {
+                       channel@6 {
                                reg = <ADC5_DIE_TEMP>;
                                label = "die_temp";
                        };

diff --git a/arch/arm64/boot/dts/qcom/pmi8950.dtsi b/arch/arm64/boot/dts/qcom/pmi8950.dtsi
index c16adca4e93a9ee29bb217decbb221ba4e790680..1029f3b1bb9a04241b274001bbaa6a933819907a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pmi8950.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmi8950.dtsi
@@ -20,37 +20,37 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
 
-                       adc-chan@0 {
+                       channel@0 {
                                reg = <VADC_USBIN>;
                                qcom,pre-scaling = <1 4>;
                                label = "usbin";
                        };
 
-                       adc-chan@1 {
+                       channel@1 {
                                reg = <VADC_DCIN>;
                                qcom,pre-scaling = <1 4>;
                                label = "dcin";
                        };
 
-                       adc-chan@2 {
+                       channel@2 {
                                reg = <VADC_VCHG_SNS>;
                                qcom,pre-scaling = <1 1>;
                                label = "vchg_sns";
                        };
 
-                       adc-chan@9 {
+                       channel@9 {
                                reg = <VADC_REF_625MV>;
                                qcom,pre-scaling = <1 1>;
                                label = "ref_625mv";
                        };
 
-                       adc-chan@a {
+                       channel@a {
                                reg = <VADC_REF_1250MV>;
                                qcom,pre-scaling = <1 1>;
                                label = "ref_1250mv";
                        };
 
-                       adc-chan@d {
+                       channel@d {
                                reg = <VADC_SPARE2>;
                                qcom,pre-scaling = <1 1>;
                                label = "chg_temp";

diff --git a/arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi b/arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi
index ee1e428d3a6e79f22be2c6742d76d29689a0e76f..dbd4b91dfe06c287e5d9ba6dc378d889820669ea 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi
@@ -77,19 +77,19 @@
                        #io-channel-cells = <1>;
                        interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
 
-                       ref-gnd@0 {
+                       channel@0 {
                                reg = <ADC5_REF_GND>;
                                qcom,pre-scaling = <1 1>;
                                label = "ref_gnd";
                        };
 
-                       vref-1p25@1 {
+                       channel@1 {
                                reg = <ADC5_1P25VREF>;
                                qcom,pre-scaling = <1 1>;
                                label = "vref_1p25";
                        };
 
-                       die-temp@6 {
+                       channel@6 {
                                reg = <ADC5_DIE_TEMP>;
                                qcom,pre-scaling = <1 1>;
                                label = "die_temp";

diff --git a/arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi b/arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi
index 1da4606e8ee67cb4ea1a6af24c7de8545841cf1a..1cee20ac2c9cb793a3ab4f966ef2d7cb2607877a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi
@@ -69,19 +69,19 @@
                        #io-channel-cells = <1>;
                        interrupts = <0x4 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
 
-                       ref-gnd@0 {
+                       channel@0 {
                                reg = <ADC5_REF_GND>;
                                qcom,pre-scaling = <1 1>;
                                label = "ref_gnd";
                        };
 
-                       vref-1p25@1 {
+                       channel@1 {
                                reg = <ADC5_1P25VREF>;
                                qcom,pre-scaling = <1 1>;
                                label = "vref_1p25";
                        };
 
-                       die-temp@6 {
+                       channel@6 {
                                reg = <ADC5_DIE_TEMP>;
                                qcom,pre-scaling = <1 1>;
                                label = "die_temp";

diff --git a/arch/arm64/boot/dts/qcom/pmp8074.dtsi b/arch/arm64/boot/dts/qcom/pmp8074.dtsi
index 580684411d74fb9b06fa6fdeb7bae84dd508aef2..0d0a846ac8d9f51771aaebe5420609822cb20af1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pmp8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmp8074.dtsi
@@ -18,57 +18,66 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
 
-                       ref-gnd@0 {
+                       channel@0 {
                                reg = <ADC5_REF_GND>;
                                qcom,pre-scaling = <1 1>;
+                               label = "ref_gnd";
                        };
 
-                       vref-1p25@1 {
+                       channel@1 {
                                reg = <ADC5_1P25VREF>;
                                qcom,pre-scaling = <1 1>;
+                               label = "vref_1p25";
                        };
 
-                       vref-vadc@2 {
+                       channel@2 {
                                reg = <ADC5_VREF_VADC>;
                                qcom,pre-scaling = <1 1>;
+                               label = "vref_vadc";
                        };
 
-                       pmic_die: die-temp@6 {
+                       channel@6 {
                                reg = <ADC5_DIE_TEMP>;
                                qcom,pre-scaling = <1 1>;
+                               label = "pmic_die";
                        };
 
-                       xo_therm: xo-temp@76 {
+                       channel@76 {
                                reg = <ADC5_XO_THERM_100K_PU>;
                                qcom,ratiometric;
                                qcom,hw-settle-time = <200>;
                                qcom,pre-scaling = <1 1>;
+                               label = "xo_therm";
                        };
 
-                       pa_therm1: thermistor1@77 {
+                       channel@77 {
                                reg = <ADC5_AMUX_THM1_100K_PU>;
                                qcom,ratiometric;
                                qcom,hw-settle-time = <200>;
                                qcom,pre-scaling = <1 1>;
+                               label = "pa_therm1";
                        };
 
-                       pa_therm2: thermistor2@78 {
+                       channel@78 {
                                reg = <ADC5_AMUX_THM2_100K_PU>;
                                qcom,ratiometric;
                                qcom,hw-settle-time = <200>;
                                qcom,pre-scaling = <1 1>;
+                               label = "pa_therm2";
                        };
 
-                       pa_therm3: thermistor3@79 {
+                       channel@79 {
                                reg = <ADC5_AMUX_THM3_100K_PU>;
                                qcom,ratiometric;
                                qcom,hw-settle-time = <200>;
                                qcom,pre-scaling = <1 1>;
+                               label = "pa_therm3";
                        };
 
-                       vph-pwr@131 {
+                       channel@131 {
                                reg = <ADC5_VPH_PWR>;
                                qcom,pre-scaling = <1 3>;
+                               label = "vph_pwr";
                        };
                };
 

diff --git a/arch/arm64/boot/dts/qcom/pms405.dtsi b/arch/arm64/boot/dts/qcom/pms405.dtsi
index 22edb47c6a849bfe3e70192198d0cbd47ea0ab00..461ad97032f78eeefe297d29b05e96f07434fc49 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pms405.dtsi
+++ b/arch/arm64/boot/dts/qcom/pms405.dtsi
@@ -81,45 +81,52 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
 
-                       ref_gnd@0 {
+                       channel@0 {
                                reg = <ADC5_REF_GND>;
                                qcom,pre-scaling = <1 1>;
+                               label = "ref_gnd";
                        };
 
-                       vref_1p25@1 {
+                       channel@1 {
                                reg = <ADC5_1P25VREF>;
                                qcom,pre-scaling = <1 1>;
+                               label = "vref_1p25";
                        };
 
-                       pon_1: vph_pwr@131 {
+                       channel@131 {
                                reg = <ADC5_VPH_PWR>;
                                qcom,pre-scaling = <1 3>;
+                               label = "vph_pwr";
                        };
 
-                       die_temp@6 {
+                       channel@6 {
                                reg = <ADC5_DIE_TEMP>;
                                qcom,pre-scaling = <1 1>;
+                               label = "die_temp";
                        };
 
-                       pa_therm1: thermistor1@77 {
+                       channel@77 {
                                reg = <ADC5_AMUX_THM1_100K_PU>;
                                qcom,ratiometric;
                                qcom,hw-settle-time = <200>;
                                qcom,pre-scaling = <1 1>;
+                               label = "pa_therm1";
                        };
 
-                       pa_therm3: thermistor3@79 {
+                       channel@79 {
                                reg = <ADC5_AMUX_THM3_100K_PU>;
                                qcom,ratiometric;
                                qcom,hw-settle-time = <200>;
                                qcom,pre-scaling = <1 1>;
+                               label = "pa_therm3";
                        };
 
-                       xo_therm: xo_temp@76 {
+                       channel@76 {
                                reg = <ADC5_XO_THERM_100K_PU>;
                                qcom,ratiometric;
                                qcom,hw-settle-time = <200>;
                                qcom,pre-scaling = <1 1>;
+                               label = "xo_therm";
                        };
                };
 

diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index 9022ad726741cb112a92076d6652930f9b64082f..7289da134962d9108a233a131a34fc326a5299f1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -640,16 +640,18 @@
 };
 
 &pm8150_adc {
-       xo-therm@4c {
+       channel@4c {
                reg = <ADC5_XO_THERM_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "xo_therm";
        };
 
-       wifi-therm@4e {
+       channel@4e {
                reg = <ADC5_AMUX_THM2_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "wifi_therm";
        };
 };
 
@@ -717,10 +719,11 @@
 };
 
 &pm8150b_adc {
-       conn-therm@4f {
+       channel@4f {
                reg = <ADC5_AMUX_THM3_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "conn_therm";
        };
 };
 
@@ -752,16 +755,18 @@
 };
 
 &pm8150l_adc {
-       skin-msm-therm@4e {
+       channel@4e {
                reg = <ADC5_AMUX_THM2_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "skin_msm_therm";
        };
 
-       pm8150l-therm@4f {
+       channel@4f {
                reg = <ADC5_AMUX_THM3_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "pm8150l_therm";
        };
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
index edfcd47e1a00f8d642d46effd1537015b678bd46..03d350dcec96e37213cedc9349354381450cb258 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
@@ -24,8 +24,8 @@
 };
 
 &pm6150_adc {
-       /delete-node/ skin-temp-thermistor@4e;
-       /delete-node/ charger-thermistor@4f;
+       /delete-node/ channel@4e;
+       /delete-node/ channel@4f;
 };
 
 &pm6150_adc_tm {

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
index 8b8ea8af165dc66155887e42c0fc00b33c765601..a532cc4aac4740eaf810406a70045eea93e55776 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
@@ -119,10 +119,11 @@ ap_ts_pen_1v8: &i2c4 {
 };
 
 &pm6150_adc {
-       skin-temp-thermistor@4e {
+       channel@4e {
                reg = <ADC5_AMUX_THM2_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "skin_therm";
        };
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
index b3ba23a88a0b29413db7a2e406846fc1f206face..b27dcd2ec856f009b2078b3c372748fe6d0da8a5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
@@ -145,10 +145,11 @@ ap_ts_pen_1v8: &i2c4 {
 };
 
 &pm6150_adc {
-       skin-temp-thermistor@4d {
+       channel@4d {
                reg = <ADC5_AMUX_THM1_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "skin_therm";
        };
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
index 269007d73162b3374af9b7e43a8aa3b00ad11a73..13339b723a9371a2307dbdb5723543c52d606730 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@ -55,7 +55,7 @@ ap_ts_pen_1v8: &i2c4 {
 };
 
 &pm6150_adc {
-       /delete-node/ charger-thermistor@4f;
+       /delete-node/ channel@4f;
 };
 
 &pm6150_adc_tm {

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
index 8467ff41e6d539c31f637a29757857781db43de7..ba222a60c4c665866225b52a98b766c7c32ef2d4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
@@ -27,7 +27,7 @@
 };
 
 &pm6150_adc {
-       /delete-node/ charger-thermistor@4f;
+       /delete-node/ channel@4f;
 };
 
 &pm6150_adc_tm {

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
index 88cf2246c18a65a9078015cdc2a5f392b6fdcf70..64d6172bf402064657ddf08b60029ac84ccab9bd 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
@@ -24,7 +24,7 @@
 };
 
 &pm6150_adc {
-       /delete-node/ charger-thermistor@4f;
+       /delete-node/ channel@4f;
 };
 
 &pm6150_adc_tm {

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
index 6c5287bd27d63db4b2d2f72b8856a0be3730eae9..fd944842dd6cdf53fe6d31350cdeeedbedcd7ba2 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
@@ -148,10 +148,11 @@ ap_ts_pen_1v8: &i2c4 {
 };
 
 &pm6150_adc {
-       5v-choke-thermistor@4e {
+       channel@4e {
                reg = <ADC5_AMUX_THM2_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "5v_choke_therm";
        };
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
index 2efa8a4bcda603f3806c9a5597f446cba91993e0..2f6a340ddd2ae34d26592c23e8a8610bec30fde4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
@@ -163,10 +163,11 @@
 };
 
 &pm6150_adc {
-       skin-temp-thermistor@4d {
+       channel@4d {
                reg = <ADC5_AMUX_THM1_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "skin_therm";
        };
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 681637cf6c4aff415352652e97f4692791b22d77..af16e36bcb408facd88420983dadb2340815f82f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -837,10 +837,11 @@ hp_i2c: &i2c9 {
 };
 
 &pm6150_adc {
-       charger-thermistor@4f {
+       channel@4f {
                reg = <ADC5_AMUX_THM3_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "charger_therm";
        };
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
index 15222e92e3f5e3fbe7dd383c82d017f7583c8e49..b5fe7356be48983aa1fd7a02060b3e90331144ab 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
@@ -73,7 +73,7 @@
 };
 
 &pmk8350_vadc {
-       pmr735a-die-temp@403 {
+       channel@403 {
                reg = <PMR735A_ADC7_DIE_TEMP>;
                label = "pmr735a_die_temp";
                qcom,pre-scaling = <1 1>;

diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
index 21027042cf1332481ae5934f957297420749c012..2ff549f4dc7a992ca5c794d4321fced766567bc7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
@@ -432,7 +432,7 @@
 };
 
 &pmk8350_vadc {
-       pmk8350-die-temp@3 {
+       channel@3 {
                reg = <PMK8350_ADC7_DIE_TEMP>;
                label = "pmk8350_die_temp";
                qcom,pre-scaling = <1 1>;

diff --git a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
index 9137db066d9e2581197b25edb4e7cad483b37513..f9b96bd2477ea60f94372924dd8823b5198ded65 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
@@ -383,13 +383,13 @@
 };
 
 &pmk8350_vadc {
-       pmk8350-die-temp@3 {
+       channel@3 {
                reg = <PMK8350_ADC7_DIE_TEMP>;
                label = "pmk8350_die_temp";
                qcom,pre-scaling = <1 1>;
        };
 
-       pmr735a-die-temp@403 {
+       channel@403 {
                reg = <PMR735A_ADC7_DIE_TEMP>;
                label = "pmr735a_die_temp";
                qcom,pre-scaling = <1 1>;

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index 6b5a7de6a27dd7cc912cfa3a1459e2869d307ae4..ffcca4f028e7e78759e6ffc1360f3adfda518f99 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -834,88 +834,88 @@
 &pmk8280_vadc {
        status = "okay";
 
-       pmic-die-temp@3 {
+       channel@3 {
                reg = <PMK8350_ADC7_DIE_TEMP>;
                qcom,pre-scaling = <1 1>;
                label = "pmk8350_die_temp";
        };
 
-       xo-therm@44 {
+       channel@44 {
                reg = <PMK8350_ADC7_AMUX_THM1_100K_PU>;
                qcom,hw-settle-time = <200>;
                qcom,ratiometric;
                label = "pmk8350_xo_therm";
        };
 
-       pmic-die-temp@103 {
+       channel@103 {
                reg = <PM8350_ADC7_DIE_TEMP(1)>;
                qcom,pre-scaling = <1 1>;
                label = "pmc8280_1_die_temp";
        };
 
-       sys-therm@144 {
+       channel@144 {
                reg = <PM8350_ADC7_AMUX_THM1_100K_PU(1)>;
                qcom,hw-settle-time = <200>;
                qcom,ratiometric;
                label = "sys_therm1";
        };
 
-       sys-therm@145 {
+       channel@145 {
                reg = <PM8350_ADC7_AMUX_THM2_100K_PU(1)>;
                qcom,hw-settle-time = <200>;
                qcom,ratiometric;
                label = "sys_therm2";
        };
 
-       sys-therm@146 {
+       channel@146 {
                reg = <PM8350_ADC7_AMUX_THM3_100K_PU(1)>;
                qcom,hw-settle-time = <200>;
                qcom,ratiometric;
                label = "sys_therm3";
        };
 
-       sys-therm@147 {
+       channel@147 {
                reg = <PM8350_ADC7_AMUX_THM4_100K_PU(1)>;
                qcom,hw-settle-time = <200>;
                qcom,ratiometric;
                label = "sys_therm4";
        };
 
-       pmic-die-temp@303 {
+       channel@303 {
                reg = <PM8350_ADC7_DIE_TEMP(3)>;
                qcom,pre-scaling = <1 1>;
                label = "pmc8280_2_die_temp";
        };
 
-       sys-therm@344 {
+       channel@344 {
                reg = <PM8350_ADC7_AMUX_THM1_100K_PU(3)>;
                qcom,hw-settle-time = <200>;
                qcom,ratiometric;
                label = "sys_therm5";
        };
 
-       sys-therm@345 {
+       channel@345 {
                reg = <PM8350_ADC7_AMUX_THM2_100K_PU(3)>;
                qcom,hw-settle-time = <200>;
                qcom,ratiometric;
                label = "sys_therm6";
        };
 
-       sys-therm@346 {
+       channel@346 {
                reg = <PM8350_ADC7_AMUX_THM3_100K_PU(3)>;
                qcom,hw-settle-time = <200>;
                qcom,ratiometric;
                label = "sys_therm7";
        };
 
-       sys-therm@347 {
+       channel@347 {
                reg = <PM8350_ADC7_AMUX_THM4_100K_PU(3)>;
                qcom,hw-settle-time = <200>;
                qcom,ratiometric;
                label = "sys_therm8";
        };
 
-       pmic-die-temp@403 {
+       channel@403 {
                reg = <PMR735A_ADC7_DIE_TEMP>;
                qcom,pre-scaling = <1 1>;
                label = "pmr735a_die_temp";

diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
index 1ce413263b7f99a7f67e9ab0b94f95d0cf5b3490..f86e7acdfd99f4d6bc3b82852e9c23102fbb448b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -1071,27 +1071,27 @@ ap_ts_i2c: &i2c14 {
 };
 
 &pm8998_adc {
-       adc-chan@4d {
+       channel@4d {
                reg = <ADC5_AMUX_THM1_100K_PU>;
                label = "sdm_temp";
        };
 
-       adc-chan@4e {
+       channel@4e {
                reg = <ADC5_AMUX_THM2_100K_PU>;
                label = "quiet_temp";
        };
 
-       adc-chan@4f {
+       channel@4f {
                reg = <ADC5_AMUX_THM3_100K_PU>;
                label = "lte_temp_1";
        };
 
-       adc-chan@50 {
+       channel@50 {
                reg = <ADC5_AMUX_THM4_100K_PU>;
                label = "lte_temp_2";
        };
 
-       adc-chan@51 {
+       channel@51 {
                reg = <ADC5_AMUX_THM5_100K_PU>;
                label = "charger_temp";
        };

diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index 41675a8de2689700a4cba87665f85c9aa180ba44..b3c27a5247429f815faac68e45b12ef8287a2b1c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -534,42 +534,42 @@
 };
 
 &pm8998_adc {
-       adc-chan@4c {
+       channel@4c {
                reg = <ADC5_XO_THERM_100K_PU>;
                label = "xo_therm";
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
        };
 
-       adc-chan@4d {
+       channel@4d {
                reg = <ADC5_AMUX_THM1_100K_PU>;
                label = "msm_therm";
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
        };
 
-       adc-chan@4f {
+       channel@4f {
                reg = <ADC5_AMUX_THM3_100K_PU>;
                label = "pa_therm1";
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
        };
 
-       adc-chan@51 {
+       channel@51 {
                reg = <ADC5_AMUX_THM5_100K_PU>;
                label = "quiet_therm";
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
        };
 
-       adc-chan@83 {
+       channel@83 {
                reg = <ADC5_VPH_PWR>;
                label = "vph_pwr";
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
        };
 
-       adc-chan@85 {
+       channel@85 {
                reg = <ADC5_VCOIN>;
                label = "vcoin";
                qcom,ratiometric;

diff --git a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
index e42a4e710cd2c36520c973989053ec3ffe36c250..fb4cba004367f16dd414e750d751349fb65894d9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
+++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
@@ -183,39 +183,44 @@
        pinctrl-names = "default";
        pinctrl-0 = <&camera_flash_therm &emmc_ufs_therm &rf_pa1_therm>;
 
-       rf-pa0-therm@4d {
+       channel@4d {
                reg = <ADC5_AMUX_THM1_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
                qcom,pre-scaling = <1 1>;
+               label = "rf_pa0_therm";
        };
 
-       quiet-therm@4e {
+       channel@4e {
                reg = <ADC5_AMUX_THM2_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
                qcom,pre-scaling = <1 1>;
+               label = "quiet_therm";
        };
 
-       camera-flash-therm@52 {
+       channel@52 {
                reg = <ADC5_GPIO1_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
                qcom,pre-scaling = <1 1>;
+               label = "camera_flash_therm";
        };
 
-       emmc-ufs-therm@54 {
+       channel@54 {
                reg = <ADC5_GPIO3_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
                qcom,pre-scaling = <1 1>;
+               label = "emmc_ufs_therm";
        };
 
-       rf-pa1-therm@55 {
+       channel@55 {
                reg = <ADC5_GPIO4_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
                qcom,pre-scaling = <1 1>;
+               label = "rf_pa1_therm";
        };
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
index e3dc499515238639b1af2573c7cb5f7698455bd6..18171c5d8a387722ccb35364eb6138db0980946e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
+++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
@@ -476,7 +476,7 @@
 };
 
 &pm7250b_adc {
-       adc-chan@4d {
+       channel@4d {
                reg = <ADC5_AMUX_THM1_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
@@ -484,7 +484,7 @@
                label = "charger_skin_therm";
        };
 
-       adc-chan@4f {
+       channel@4f {
                reg = <ADC5_AMUX_THM3_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
@@ -516,7 +516,7 @@
 };
 
 &pmk8350_vadc {
-       adc-chan@644 {
+       channel@644 {
                reg = <PMK8350_ADC7_AMUX_THM1_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;

diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
index ad2b60e281eb5ff4390f67b823e021df29330c4e..7ef99038cb37ba44b1e7f94397e551450331ad85 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
@@ -526,22 +526,25 @@
 };
 
 &pm8150_adc {
-       xo-therm@4c {
+       channel@4c {
                reg = <ADC5_XO_THERM_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "xo_therm";
        };
 
-       skin-therm@4d {
+       channel@4d {
                reg = <ADC5_AMUX_THM1_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "skin_therm";
        };
 
-       pa-therm1@4e {
+       channel@4e {
                reg = <ADC5_AMUX_THM2_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "pa_therm1";
        };
 };
 
@@ -571,10 +574,11 @@
 };
 
 &pm8150b_adc {
-       conn-therm@4f {
+       channel@4f {
                reg = <ADC5_AMUX_THM3_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "conn_therm";
        };
 };
 
@@ -615,22 +619,25 @@
 };
 
 &pm8150l_adc {
-       camera-flash-therm@4d {
+       channel@4d {
                reg = <ADC5_AMUX_THM1_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "camera_flash_therm";
        };
 
-       skin-msm-therm@4e {
+       channel@4e {
                reg = <ADC5_AMUX_THM2_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "skin_msm_therm";
        };
 
-       pa-therm2@4f {
+       channel@4f {
                reg = <ADC5_AMUX_THM3_100K_PU>;
                qcom,ratiometric;
                qcom,hw-settle-time = <200>;
+               label = "pa_therm2";
        };
 };