ARM: dts: stm32: stm32mp15x-mecio1-io: Move divergent mecio1 ADC channels to board...

Move the divergent adc1 channel definitions out of the common
mecio1-io.dtsi file and into the specific Revision 0 and Revision 1
board files.

The original common file contained incorrect schematic labels for the
Revision 0 hardware (e.g., labeling ana0 as p24v_hpdcm instead of
ain_aux0) and failed to account for physical signal routing changes
between the board revisions.

Retain only the strictly shared channels in the common include file. Map
the correct channels and schematic labels directly within
stm32mp151c-mecio1r0.dts and stm32mp153c-mecio1r1.dts.

Crucially, ensure that the required 200us sample time follows the
phint1_ain signal to its new physical location on channel 3 for the
Revision 1 hardware.

Fixes: 8267753c891c ("ARM: dts: stm32: Add MECIO1 and MECT1S board variants")
Co-developed-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: David Jander <david@protonic.nl>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20260318105123.819807-4-o.rempel@pengutronix.de
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>

diff --git a/arch/arm/boot/dts/st/stm32mp151c-mecio1r0.dts b/arch/arm/boot/dts/st/stm32mp151c-mecio1r0.dts
index a5ea1431c3991cf37c11d4cc063a2ebcb013298d..4e795ad42928b2417c487f4cf035680475bdbf6b 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp151c-mecio1r0.dts
+++ b/arch/arm/boot/dts/st/stm32mp151c-mecio1r0.dts
@@ -36,6 +36,56 @@
        };
 };
 
+&adc1 {
+       channel@0 {
+               reg = <0>;
+               st,min-sample-time-ns = <20000>;
+               label = "ain_aux0";
+       };
+
+       channel@1 {
+               reg = <1>;
+               st,min-sample-time-ns = <20000>;
+               label = "ain_aux1";
+       };
+
+       channel@3 {
+               reg = <3>;
+               st,min-sample-time-ns = <20000>;
+               label = "hpdcm1_i2";
+       };
+
+       channel@5 {
+               reg = <5>;
+               st,min-sample-time-ns = <20000>;
+               label = "pout1_i";
+       };
+
+       channel@9 {
+               reg = <9>;
+               st,min-sample-time-ns = <20000>;
+               label = "pout0_i";
+       };
+
+       channel@13 {
+               reg = <13>;
+               st,min-sample-time-ns = <200000>;
+               label = "phint1_ain";
+       };
+
+       channel@15 {
+               reg = <15>;
+               st,min-sample-time-ns = <20000>;
+               label = "hpdcm0_i1";
+       };
+
+       channel@18 {
+               reg = <18>;
+               st,min-sample-time-ns = <20000>;
+               label = "hpdcm0_i2";
+       };
+};
+
 &clk_hse {
        clock-frequency = <25000000>;
 };

diff --git a/arch/arm/boot/dts/st/stm32mp153c-mecio1r1.dts b/arch/arm/boot/dts/st/stm32mp153c-mecio1r1.dts
index 16b814c19350c77c37264cd99457b0dea0c5945d..d32816093e47d7c441b649e26c41f5875ab76f95 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp153c-mecio1r1.dts
+++ b/arch/arm/boot/dts/st/stm32mp153c-mecio1r1.dts
@@ -36,6 +36,56 @@
        };
 };
 
+&adc1 {
+       channel@0 {
+               reg = <0>;
+               st,min-sample-time-ns = <20000>;
+               label = "p24v_hpdcm";
+       };
+
+       channel@1 {
+               reg = <1>;
+               st,min-sample-time-ns = <20000>;
+               label = "p24v_stp";
+       };
+
+       channel@3 {
+               reg = <3>;
+               st,min-sample-time-ns = <200000>;
+               label = "phint1_ain";
+       };
+
+       channel@5 {
+               reg = <5>;
+               st,min-sample-time-ns = <20000>;
+               label = "hpout1_i";
+       };
+
+       channel@9 {
+               reg = <9>;
+               st,min-sample-time-ns = <20000>;
+               label = "hpout0_i";
+       };
+
+       channel@13 {
+               reg = <13>;
+               st,min-sample-time-ns = <20000>;
+               label = "hpdcm0_i2";
+       };
+
+       channel@15 {
+               reg = <15>;
+               st,min-sample-time-ns = <20000>;
+               label = "hpdcm1_i2";
+       };
+
+       channel@18 {
+               reg = <18>;
+               st,min-sample-time-ns = <20000>;
+               label = "hpdcm0_i1";
+       };
+};
+
 &clk_hse {
        clock-frequency = <24000000>;
 };

diff --git a/arch/arm/boot/dts/st/stm32mp15x-mecio1-io.dtsi b/arch/arm/boot/dts/st/stm32mp15x-mecio1-io.dtsi
index 1b1299770ca0d3401ce0f35734012b1cff1e9576..f91b3d1f037b5e0ab5095e84f16721d9ec6a097e 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp15x-mecio1-io.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15x-mecio1-io.dtsi
@@ -90,7 +90,7 @@
 };
 
 &adc {
-       /* ANA0, ANA1 are dedicated pins and don't need pinctrl: only in6. */
+       /* ANA0, ANA1 are dedicated pins and don't need pinctrl. */
        pinctrl-0 = <&adc12_pins_mecsbc>;
        pinctrl-names = "default";
        vdd-supply = <&v3v3>;
@@ -102,78 +102,30 @@
 &adc1 {
        status = "okay";
 
-       channel@0 {
-               reg = <0>;
-               st,min-sample-time-ns = <20000>;
-               label = "p24v_stp";
-       };
-
-       channel@1 {
-               reg = <1>;
-               st,min-sample-time-ns = <20000>;
-               label = "p24v_hpdcm";
-       };
-
        channel@2 {
                reg = <2>;
                st,min-sample-time-ns = <20000>;
                label = "ain0";
        };
 
-       channel@3 {
-               reg = <3>;
-               st,min-sample-time-ns = <20000>;
-               label = "hpdcm1_i2";
-       };
-
-       channel@5 {
-               reg = <5>;
-               st,min-sample-time-ns = <20000>;
-               label = "hpout1_i";
-       };
-
        channel@6 {
                reg = <6>;
                st,min-sample-time-ns = <20000>;
                label = "ain1";
        };
 
-       channel@9 {
-               reg = <9>;
-               st,min-sample-time-ns = <20000>;
-               label = "hpout0_i";
-       };
-
        channel@10 {
                reg = <10>;
                st,min-sample-time-ns = <200000>;
                label = "phint0_ain";
        };
 
-       channel@13 {
-               reg = <13>;
-               st,min-sample-time-ns = <200000>;
-               label = "phint1_ain";
-       };
-
-       channel@15 {
-               reg = <15>;
-               st,min-sample-time-ns = <20000>;
-               label = "hpdcm0_i1";
-       };
-
        channel@16 {
                reg = <16>;
                st,min-sample-time-ns = <20000>;
                label = "lsin";
        };
 
-       channel@18 {
-               reg = <18>;
-               st,min-sample-time-ns = <20000>;
-               label = "hpdcm0_i2";
-       };
-
        channel@19 {
                reg = <19>;
                st,min-sample-time-ns = <20000>;