Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / arch / arm / dts / imx6q.dtsi

diff --git a/arch/arm/dts/imx6q.dtsi b/arch/arm/dts/imx6q.dtsi
index ab1716b6b0e06c168730554414042bf9bdd59683..71543a4a68441eac7cc8a4a60b95bf019a97bc3a 100644 (file)
--- a/arch/arm/dts/imx6q.dtsi
+++ b/arch/arm/dts/imx6q.dtsi
@@ -9,6 +9,7 @@
 / {
        aliases {
                ipu1 = &ipu2;
+               video1 = &ipu2;
                spi4 = &ecspi5;
        };
 
@@ -202,6 +203,7 @@
                                 <&clks IMX6QDL_CLK_GPU2D_CORE>;
                        clock-names = "bus", "core";
                        power-domains = <&pd_pu>;
+                       #cooling-cells = <2>;
                };
 
                ipu2: ipu@2800000 {
@@ -234,6 +236,8 @@
                        };
 
                        ipu2_di0: port@2 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <2>;
 
                                ipu2_di0_disp0: endpoint@0 {
@@ -262,6 +266,8 @@
                        };
 
                        ipu2_di1: port@3 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <3>;
 
                                ipu2_di1_hdmi: endpoint@1 {