video: mxc: search for display-timings in the mxcfb node, rather than ldb or mxc_lcdif

[karo-tx-linux.git] / arch / arm / boot / dts / imx6q-tx6q-1020.dts

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020.dts b/arch/arm/boot/dts/imx6q-tx6q-1020.dts
index 6c62f0c073cae5619c94eca2592efb2d56145ecf..fa3a825feabf2644028c1224b99a1293d05ed46d 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1020.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1020.dts
@@ -18,8 +18,8 @@
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
 
        aliases {
-               display = &lcd;
-               mxcfb0 = &display;
+               display = &mxcfb0;
+               mxcfb0 = &mxcfb0;
        };
 
        backlight: backlight {
@@ -44,7 +44,7 @@
                default-brightness-level = <50>;
        };
 
-       display: fb@2 {
+       mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
@@ -53,16 +53,6 @@
                int_clk = <1>;
                late_init = <0>;
                status = "okay";
-       };
-
-       lcd: lcd@0 {
-               compatible = "fsl,lcd";
-               ipu_id = <0>;
-               disp_id = <0>;
-               default_ifmt = "RGB24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;
-               status = "okay";
 
                display-timings {
                        VGA {
@@ -178,6 +168,16 @@
                        };
                };
        };
+
+       lcd: lcd@0 {
+               compatible = "fsl,lcd";
+               ipu_id = <0>;
+               disp_id = <0>;
+               default_ifmt = "RGB24";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_2>;
+               status = "okay";
+       };
 };
 
 &ds1339 {