ARM: dts: stm32: enable adc on stm32mp15xx-dkx boards

U-Boot enables ADC1&2 to support USB power measurement and ADC
calibration on STM32MP15x Disco boards.
When leaving U-boot the ADCs do not return to power down state
to keep ADC linear calibration available for kernel.
Enable ADC1&2 by default on STM32MP15xx-DKx boards to align kernel
DT with Uboot. This avoids to shutdown the ADCs VDDA, while the
ADCs are not in power down.

Use STM32 ADC generic bindings instead of legacy bindings on
STM32MP15xx-DKx boards.

The ADC pins on Arduino connector are not set by default.
These pins are added in A7 Disco example DTs only.

Signed-off-by: Olivier Moysan <olivier.moysan@foss.st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>

diff --git a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
index a6e2e20f12fa0fb228821f8284c8c0fd61460d50..e78ba956b9d0f4398b192df41144293a6cc262c1 100644 (file)
--- a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi
@@ -93,28 +93,39 @@
 
 &adc {
        pinctrl-names = "default";
-       pinctrl-0 = <&adc12_ain_pins_a>, <&adc12_usb_cc_pins_a>;
+       pinctrl-0 = <&adc12_usb_cc_pins_a>;
        vdd-supply = <&vdd>;
        vdda-supply = <&vdd>;
        vref-supply = <&vrefbuf>;
-       status = "disabled";
+       status = "okay";
        adc1: adc@0 {
+               status = "okay";
                /*
                 * Type-C USB_PWR_CC1 & USB_PWR_CC2 on in18 & in19.
                 * Use at least 5 * RC time, e.g. 5 * (Rp + Rd) * C:
                 * 5 * (56 + 47kOhms) * 5pF => 2.5us.
                 * Use arbitrary margin here (e.g. 5us).
                 */
-               st,min-sample-time-nsecs = <5000>;
-               /* AIN connector, USB Type-C CC1 & CC2 */
-               st,adc-channels = <0 1 6 13 18 19>;
-               status = "okay";
+               channel@18 {
+                       reg = <18>;
+                       st,min-sample-time-ns = <5000>;
+               };
+               channel@19 {
+                       reg = <19>;
+                       st,min-sample-time-ns = <5000>;
+               };
        };
        adc2: adc@100 {
-               /* AIN connector, USB Type-C CC1 & CC2 */
-               st,adc-channels = <0 1 2 6 18 19>;
-               st,min-sample-time-nsecs = <5000>;
                status = "okay";
+               /* USB Type-C CC1 & CC2 */
+               channel@18 {
+                       reg = <18>;
+                       st,min-sample-time-ns = <5000>;
+               };
+               channel@19 {
+                       reg = <19>;
+                       st,min-sample-time-ns = <5000>;
+               };
        };
 };