ARM: dts: stm32: Deduplicate DSI node on stm32mp15

All boards using the DSI node duplicate the same pattern common pattern
in board DTs, that pattern is ports with endpoint labels and the same
in-SoC regulator connection. Move that common pattern into stm32mp157.dtsi
instead.

The two boards which do define panel@0 directly in the DSI bridge node now
have #address-cells/#size-cells in their board DT instead of it being in
stm32mp157.dtsi and activated incorrectly for all boards, even the ones
which use e.g. another DSI-to-something bridge.

Signed-off-by: Marek Vasut <marex@denx.de>
Acked-by: Raphaël Gallais-Pou <raphael.gallais-pou@foss.st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>

diff --git a/arch/arm/boot/dts/st/stm32mp157.dtsi b/arch/arm/boot/dts/st/stm32mp157.dtsi
index 5e733cd16ff9e3426a7a5eabecf6b568c7fbe87f..6197d878894de26cb1c36a32332ae4ff7840d6e4 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp157.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp157.dtsi
@@ -22,9 +22,27 @@
                        reg = <0x5a000000 0x800>;
                        clocks = <&rcc DSI_K>, <&clk_hse>, <&rcc DSI_PX>;
                        clock-names = "pclk", "ref", "px_clk";
+                       phy-dsi-supply = <&reg18>;
                        resets = <&rcc DSI_R>;
                        reset-names = "apb";
                        status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       dsi_in: endpoint {
+                                       };
+                               };
+
+                               port@1 {
+                                       reg = <1>;
+                                       dsi_out: endpoint {
+                                       };
+                               };
+                       };
                };
        };
 };

diff --git a/arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-ctouch2-of10.dts b/arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-ctouch2-of10.dts
index 4279b26547dfdcfa3569a13eb91cf7533b251675..df97e03d2a5ac8359e13241e7fef310bd0fd1496 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-ctouch2-of10.dts
+++ b/arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-ctouch2-of10.dts
@@ -46,26 +46,14 @@
 
 &dsi {
        status = "okay";
-       phy-dsi-supply = <&reg18>;
-
-       ports {
-               #address-cells = <1>;
-               #size-cells = <0>;
+};
 
-               port@0 {
-                       reg = <0>;
-                       dsi_in: endpoint {
-                               remote-endpoint = <&ltdc_ep0_out>;
-                       };
-               };
+&dsi_in {
+       remote-endpoint = <&ltdc_ep0_out>;
+};
 
-               port@1 {
-                       reg = <1>;
-                       dsi_out: endpoint {
-                               remote-endpoint = <&bridge_in>;
-                       };
-               };
-       };
+&dsi_out {
+       remote-endpoint = <&bridge_in>;
 };
 
 &i2c6 {

diff --git a/arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-edimm2.2.dts b/arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-edimm2.2.dts
index efba542898207b2fc15e33c82ea181e4c90f2f53..f8e404346396474866b14fa865e687d9e0b88030 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-edimm2.2.dts
+++ b/arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-edimm2.2.dts
@@ -46,26 +46,14 @@
 
 &dsi {
        status = "okay";
-       phy-dsi-supply = <&reg18>;
-
-       ports {
-               #address-cells = <1>;
-               #size-cells = <0>;
+};
 
-               port@0 {
-                       reg = <0>;
-                       dsi_in_ltdc: endpoint {
-                               remote-endpoint = <&ltdc_out_dsi>;
-                       };
-               };
+&dsi_in {
+       remote-endpoint = <&ltdc_out_dsi>;
+};
 
-               port@1 {
-                       reg = <1>;
-                       dsi_out_bridge: endpoint {
-                               remote-endpoint = <&bridge_in_dsi>;
-                       };
-               };
-       };
+&dsi_out {
+       remote-endpoint = <&bridge_in_dsi>;
 };
 
 &i2c6 {
@@ -88,7 +76,7 @@
                        port@0 {
                                reg = <0>;
                                bridge_in_dsi: endpoint {
-                                       remote-endpoint = <&dsi_out_bridge>;
+                                       remote-endpoint = <&dsi_out>;
                                        data-lanes = <1 2>;
                                };
                        };
@@ -108,7 +96,7 @@
 
        port {
                ltdc_out_dsi: endpoint {
-                       remote-endpoint = <&dsi_in_ltdc>;
+                       remote-endpoint = <&dsi_in>;
                };
        };
 };

diff --git a/arch/arm/boot/dts/st/stm32mp157c-dk2.dts b/arch/arm/boot/dts/st/stm32mp157c-dk2.dts
index 4bef2300ed7ca78dd36435f65702d2dcf91f83e5..510cca5acb79ca449dc11ba043475cfc43becc4c 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp157c-dk2.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-dk2.dts
@@ -34,26 +34,6 @@
        #address-cells = <1>;
        #size-cells = <0>;
        status = "okay";
-       phy-dsi-supply = <&reg18>;
-
-       ports {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               port@0 {
-                       reg = <0>;
-                       dsi_in: endpoint {
-                               remote-endpoint = <&ltdc_ep1_out>;
-                       };
-               };
-
-               port@1 {
-                       reg = <1>;
-                       dsi_out: endpoint {
-                               remote-endpoint = <&panel_in>;
-                       };
-               };
-       };
 
        panel@0 {
                compatible = "orisetech,otm8009a";
@@ -70,6 +50,14 @@
        };
 };
 
+&dsi_in {
+       remote-endpoint = <&ltdc_ep1_out>;
+};
+
+&dsi_out {
+       remote-endpoint = <&panel_in>;
+};
+
 &i2c1 {
        touchscreen@38 {
                compatible = "focaltech,ft6236";

diff --git a/arch/arm/boot/dts/st/stm32mp157c-ev1.dts b/arch/arm/boot/dts/st/stm32mp157c-ev1.dts
index af3800501875c011965df2de42582c4d5bab117c..cd9c3ff5378bd6f83b9cad29f05b64e6ceeef577 100644 (file)
--- a/arch/arm/boot/dts/st/stm32mp157c-ev1.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-ev1.dts
@@ -100,30 +100,10 @@
 };
 
 &dsi {
-       phy-dsi-supply = <&reg18>;
        #address-cells = <1>;
        #size-cells = <0>;
        status = "okay";
 
-       ports {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               port@0 {
-                       reg = <0>;
-                       dsi_in: endpoint {
-                               remote-endpoint = <&ltdc_ep0_out>;
-                       };
-               };
-
-               port@1 {
-                       reg = <1>;
-                       dsi_out: endpoint {
-                               remote-endpoint = <&dsi_panel_in>;
-                       };
-               };
-       };
-
        panel@0 {
                compatible = "raydium,rm68200";
                reg = <0>;
@@ -140,6 +120,14 @@
        };
 };
 
+&dsi_in {
+       remote-endpoint = <&ltdc_ep0_out>;
+};
+
+&dsi_out {
+       remote-endpoint = <&dsi_panel_in>;
+};
+
 &ethernet0 {
        status = "okay";
        pinctrl-0 = <&ethernet0_rgmii_pins_a>;