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

A future bindings update will replace the free-form qcom,spmi-vadc and
qcom,spmi-adc5 channel node names with the specific name `channel`, to
be more consistent with how the driver parses the nodes and to match the
generic node name set in `iio/adc/adc.yaml`.

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-1-e6c69bda8034@somainline.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/qcom-pm8226.dtsi b/arch/arm/boot/dts/qcom/qcom-pm8226.dtsi
index 3b8ad28cecb0d6a53f1b5aba11f3aa3d059a675c..2413778f371507ec2caa8b82eb77a726191417a6 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-pm8226.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-pm8226.dtsi
@@ -102,27 +102,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/arm/boot/dts/qcom/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom/qcom-pm8941.dtsi
index 1e3bf643af1bb1541ed6c2a0d60220f07ca44856..ed0ba591c755817de04c732fb90f94b94e3255f1 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-pm8941.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-pm8941.dtsi
@@ -145,31 +145,31 @@
                        #io-channel-cells = <1>;
 
 
-                       adc-chan@6 {
+                       channel@6 {
                                reg = <VADC_VBAT_SNS>;
                        };
 
-                       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>;
                        };
 
-                       adc-chan@30 {
+                       channel@30 {
                                reg = <VADC_LR_MUX1_BAT_THERM>;
                        };
                };

diff --git a/arch/arm/boot/dts/qcom/qcom-pma8084.dtsi b/arch/arm/boot/dts/qcom/qcom-pma8084.dtsi
index 2dd4c6aa71c9ed0eab4412dbb39c93d4171f45cc..2985f4805b93ee629ff0d97f3c41d3c88d4f3e5a 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-pma8084.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-pma8084.dtsi
@@ -64,27 +64,27 @@
                        #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/arm/boot/dts/qcom/qcom-pmx55.dtsi b/arch/arm/boot/dts/qcom/qcom-pmx55.dtsi
index e1b869480bbd9d57f6812403cdf1c02c17589810..da0851173c699702f4a7a96f58178700948f5426 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-pmx55.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-pmx55.dtsi
@@ -40,25 +40,25 @@
                        #io-channel-cells = <1>;
                        interrupts = <0x8 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";