[PATCH v4 1/5] ARM: dts: qcom: Use labels with generic node names for ADC channels

From: Marijn Suijten
Date: Mon Apr 10 2023 - 16:29:39 EST


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@xxxxxxxxxxxxxx>
---
arch/arm/boot/dts/qcom-pm8226.dtsi | 12 ++++++------
arch/arm/boot/dts/qcom-pm8941.dtsi | 14 +++++++-------
arch/arm/boot/dts/qcom-pma8084.dtsi | 12 ++++++------
arch/arm/boot/dts/qcom-pmx55.dtsi | 8 ++++----
4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/arch/arm/boot/dts/qcom-pm8226.dtsi b/arch/arm/boot/dts/qcom-pm8226.dtsi
index 46ba84f86c9f..bcd689a9b2d1 100644
--- a/arch/arm/boot/dts/qcom-pm8226.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8226.dtsi
@@ -63,27 +63,27 @@ pm8226_vadc: adc@3100 {
#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-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi
index a821f0368a28..a35300ed1197 100644
--- a/arch/arm/boot/dts/qcom-pm8941.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8941.dtsi
@@ -102,31 +102,31 @@ pm8941_vadc: adc@3100 {
#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-pma8084.dtsi b/arch/arm/boot/dts/qcom-pma8084.dtsi
index 2dd4c6aa71c9..2985f4805b93 100644
--- a/arch/arm/boot/dts/qcom-pma8084.dtsi
+++ b/arch/arm/boot/dts/qcom-pma8084.dtsi
@@ -64,27 +64,27 @@ pma8084_vadc: adc@3100 {
#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-pmx55.dtsi b/arch/arm/boot/dts/qcom-pmx55.dtsi
index e1b869480bbd..da0851173c69 100644
--- a/arch/arm/boot/dts/qcom-pmx55.dtsi
+++ b/arch/arm/boot/dts/qcom-pmx55.dtsi
@@ -40,25 +40,25 @@ pmx55_adc: adc@3100 {
#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";
--
2.40.0