ARM: dts: imx6qdl: Move existing MIPI DSI ports into a new 'ports' node

The MIPI DSI node contains some ports which represent possible DRM CRTCs
it can connect with.  Each port has a 'reg' property embedded.  This
property will be wrongly interpretted by the MIPI DSI bus driver, because
the driver will take each subnode which contains a 'reg' property as a
DSI peripheral device.  This patch moves the existing MIPI DSI ports into
a new 'ports' node so that the MIPI DSI bus driver may distinguish its
DSI peripheral device(s) from the existing ports.

Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

2 files changed, 25 insertions, 18 deletions

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 93ec79bb6b35..399103b8e2c9 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -294,19 +294,21 @@
 };
 
 &mipi_dsi {
-        port@2 {
-                reg = <2>;
+        ports {
+                port@2 {
+                        reg = <2>;
 
-                mipi_mux_2: endpoint {
-                        remote-endpoint = <&ipu2_di0_mipi>;
+                        mipi_mux_2: endpoint {
+                                remote-endpoint = <&ipu2_di0_mipi>;
+                        };
                 };
-        };
 
-        port@3 {
-                reg = <3>;
+                port@3 {
+                        reg = <3>;
 
-                mipi_mux_3: endpoint {
-                        remote-endpoint = <&ipu2_di1_mipi>;
+                        mipi_mux_3: endpoint {
+                                remote-endpoint = <&ipu2_di1_mipi>;
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index d6c69ec44314..6159640f2422 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -1022,19 +1022,24 @@
                                 reg = <0x021e0000 0x4000>;
                                 status = "disabled";
 
-                                port@0 {
-                                        reg = <0>;
+                                ports {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+
+                                        port@0 {
+                                                reg = <0>;
 
-                                        mipi_mux_0: endpoint {
-                                                remote-endpoint = <&ipu1_di0_mipi>;
+                                                mipi_mux_0: endpoint {
+                                                        remote-endpoint = <&ipu1_di0_mipi>;
+                                                };
                                         };
-                                };
 
-                                port@1 {
-                                        reg = <1>;
+                                        port@1 {
+                                                reg = <1>;
 
-                                        mipi_mux_1: endpoint {
-                                                remote-endpoint = <&ipu1_di1_mipi>;
+                                                mipi_mux_1: endpoint {
+                                                        remote-endpoint = <&ipu1_di1_mipi>;
+                                                };
                                         };
                                 };
                         };