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

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>

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 cdd4902b59a97f69e14aefe4dc425fe000bc8a3a..0069ad75d55e5e14ba530756a314e3c83fc889be 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>;
        };
 };