ARM: dts: stm32: Update to generic ADC channel binding on DHSOM systems

[ Upstream commit 9bcfc3cdc903485a52c6f471f4ae96a41fa51803 ]

The generic ADC channel binding is recommended over legacy one, update the
DT to the modern binding. No functional change. For further details, see
commit which adds the generic binding to STM32 ADC binding document:
'664b9879f56e ("dt-bindings: iio: stm32-adc: add generic channel binding")'

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>
Stable-dep-of: deb7edbc27a6 ("ARM: dts: stm32: Add missing detach mailbox for DHCOM SoM")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
index c06edd2eacb0cd3f35850f0247bda1dedab4f718..e61df23d361a764dd53d08fc86e476df2f9b5d7e 100644 (file)
--- a/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
@@ -80,17 +80,19 @@
        vdda-supply = <&vdda>;
        vref-supply = <&vdda>;
        status = "okay";
+};
 
-       adc1: adc@0 {
-               st,min-sample-time-nsecs = <5000>;
-               st,adc-channels = <0>;
-               status = "okay";
+&adc1 {
+       channel@0 {
+               reg = <0>;
+               st,min-sample-time-ns = <5000>;
        };
+};
 
-       adc2: adc@100 {
-               st,adc-channels = <1>;
-               st,min-sample-time-nsecs = <5000>;
-               status = "okay";
+&adc2 {
+       channel@1 {
+               reg = <1>;
+               st,min-sample-time-ns = <5000>;
        };
 };
 

diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi
index 7d5d6d436038573320cbecbda4c829f07a296f5c..c792dff433fc5210a586cbc0b0115e2b3492fedf 100644 (file)
--- a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi
@@ -111,17 +111,39 @@
        vdda-supply = <&vdda>;
        vref-supply = <&vdda>;
        status = "okay";
+};
 
-       adc1: adc@0 {
-               st,adc-channels = <0 1 6>;
-               st,min-sample-time-nsecs = <5000>;
-               status = "okay";
+&adc1 {
+       channel@0 {
+               reg = <0>;
+               st,min-sample-time-ns = <5000>;
        };
 
-       adc2: adc@100 {
-               st,adc-channels = <0 1 2>;
-               st,min-sample-time-nsecs = <5000>;
-               status = "okay";
+       channel@1 {
+               reg = <1>;
+               st,min-sample-time-ns = <5000>;
+       };
+
+       channel@6 {
+               reg = <6>;
+               st,min-sample-time-ns = <5000>;
+       };
+};
+
+&adc2 {
+       channel@0 {
+               reg = <0>;
+               st,min-sample-time-ns = <5000>;
+       };
+
+       channel@1 {
+               reg = <1>;
+               st,min-sample-time-ns = <5000>;
+       };
+
+       channel@2 {
+               reg = <2>;
+               st,min-sample-time-ns = <5000>;
        };
 };