[PATCH v2 1/2] ARM: dts: qcom-pma8084: fix vadc channel node names

[PATCH v2 1/2] ARM: dts: qcom-pma8084: fix vadc channel node names

[Luca Weiss]

The spmi-vadc bindings require the '@' in the node.

Additionally change the node name to adc-chan which both makes it a
generic node name and also removes the underscore from it.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
Changes in v2:
* Make commit message more accurate
* Make number actually hex in node address (made it decimal before)

 arch/arm/boot/dts/qcom-pma8084.dtsi | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/qcom-pma8084.dtsi b/arch/arm/boot/dts/qcom-pma8084.dtsi
index 0da6c1a5d547..2dd4c6aa71c9 100644
--- a/arch/arm/boot/dts/qcom-pma8084.dtsi
+++ b/arch/arm/boot/dts/qcom-pma8084.dtsi
@@ -64,22 +64,27 @@ pma8084_vadc: adc@3100 {
 			#size-cells = <0>;
 			#io-channel-cells = <1>;
 
-			die_temp {
+			adc-chan@8 {
 				reg = <VADC_DIE_TEMP>;
 			};
-			ref_625mv {
+
+			adc-chan@9 {
 				reg = <VADC_REF_625MV>;
 			};
-			ref_1250v {
+
+			adc-chan@a {
 				reg = <VADC_REF_1250MV>;
 			};
-			ref_buf_625mv {
+
+			adc-chan@c {
 				reg = <VADC_SPARE1>;
 			};
-			ref_gnd {
+
+			adc-chan@e {
 				reg = <VADC_GND_REF>;
 			};
-			ref_vdd {
+
+			adc-chan@f {
 				reg = <VADC_VDD_VADC>;
 			};
 		};
-- 
2.38.1

[PATCH v2 2/2] ARM: dts: qcom: pm8941: fix vadc channel node names

[Luca Weiss]

The spmi-vadc bindings require the '@' in the node.

Additionally change the node name to adc-chan which both makes it a
generic node name and also removes the underscore from it.

At the same time sort the nodes by reg value.

Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
Changes in v2:
* Make commit message more accurate
* Make number actually hex in node address (made it decimal before)

 arch/arm/boot/dts/qcom-pm8941.dtsi | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi
index 863e598591b7..a9e83836bf86 100644
--- a/arch/arm/boot/dts/qcom-pm8941.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8941.dtsi
@@ -101,26 +101,33 @@ pm8941_vadc: adc@3100 {
 			#size-cells = <0>;
 			#io-channel-cells = <1>;
 
-			bat_temp {
-				reg = <VADC_LR_MUX1_BAT_THERM>;
+
+			adc-chan@6 {
+				reg = <VADC_VBAT_SNS>;
 			};
-			die_temp {
+
+			adc-chan@8 {
 				reg = <VADC_DIE_TEMP>;
 			};
-			ref_625mv {
+
+			adc-chan@9 {
 				reg = <VADC_REF_625MV>;
 			};
-			ref_1250v {
+
+			adc-chan@a {
 				reg = <VADC_REF_1250MV>;
 			};
-			ref_gnd {
+
+			adc-chan@e {
 				reg = <VADC_GND_REF>;
 			};
-			ref_vdd {
+
+			adc-chan@f {
 				reg = <VADC_VDD_VADC>;
 			};
-			vbat_sns {
-				reg = <VADC_VBAT_SNS>;
+
+			adc-chan@30 {
+				reg = <VADC_LR_MUX1_BAT_THERM>;
 			};
 		};
 
-- 
2.38.1

Re: (subset) [PATCH v2 1/2] ARM: dts: qcom-pma8084: fix vadc channel node names

[Bjorn Andersson]

On Mon, 31 Oct 2022 19:10:21 +0100, Luca Weiss wrote:
> The spmi-vadc bindings require the '@' in the node.
> 
> Additionally change the node name to adc-chan which both makes it a
> generic node name and also removes the underscore from it.
> 
> 

Applied, thanks!

[1/2] ARM: dts: qcom-pma8084: fix vadc channel node names
      commit: 31eab2bb9c1ddf8a9ab5a1e4dc59446eeed2ea9e
[2/2] ARM: dts: qcom: pm8941: fix vadc channel node names
      commit: c5ef315a38fb36779adadbafbcce2274a3dec0d2

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>