ARM: dts: imx6q(dl): Move 'port' nodes under 'ports' for HDMI encoder

In preparation for the conversion of the DWC HDMI TX device tree
bindings to YAML, move the HDMI encoder's 'port' nodes under a 'ports'
node. The 'ports' node is optional in the OF graph implementation, but
YAML bindings require it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 5277e390329126313549b2021fd1d1f447d995bc..8d209c1b3ca77d9e23cdeb5ac37e76700d72c47b 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -406,19 +406,21 @@
 &hdmi {
        compatible = "fsl,imx6q-hdmi";
 
-       port@2 {
-               reg = <2>;
+       ports {
+               port@2 {
+                       reg = <2>;
 
-               hdmi_mux_2: endpoint {
-                       remote-endpoint = <&ipu2_di0_hdmi>;
+                       hdmi_mux_2: endpoint {
+                               remote-endpoint = <&ipu2_di0_hdmi>;
+                       };
                };
-       };
 
-       port@3 {
-               reg = <3>;
+               port@3 {
+                       reg = <3>;
 
-               hdmi_mux_3: endpoint {
-                       remote-endpoint = <&ipu2_di1_hdmi>;
+                       hdmi_mux_3: endpoint {
+                               remote-endpoint = <&ipu2_di1_hdmi>;
+                       };
                };
        };
 };

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 6f59a99cbe82f974d973b73866e7abfe9455a4cf..82e01ce026ea3d9bcad557daac33e8e62bd33673 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -182,8 +182,6 @@
                };
 
                hdmi: hdmi@120000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
                        reg = <0x00120000 0x9000>;
                        interrupts = <0 115 0x04>;
                        gpr = <&gpr>;
@@ -192,19 +190,24 @@
                        clock-names = "iahb", "isfr";
                        status = "disabled";
 
-                       port@0 {
-                               reg = <0>;
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
 
-                               hdmi_mux_0: endpoint {
-                                       remote-endpoint = <&ipu1_di0_hdmi>;
+                                       hdmi_mux_0: endpoint {
+                                               remote-endpoint = <&ipu1_di0_hdmi>;
+                                       };
                                };
-                       };
 
-                       port@1 {
-                               reg = <1>;
+                               port@1 {
+                                       reg = <1>;
 
-                               hdmi_mux_1: endpoint {
-                                       remote-endpoint = <&ipu1_di1_hdmi>;
+                                       hdmi_mux_1: endpoint {
+                                               remote-endpoint = <&ipu1_di1_hdmi>;
+                                       };
                                };
                        };
                };