updated Ka-Ro DTS files;LVDS display works

[karo-tx-linux.git] / arch / arm / boot / dts / imx6dl-tx6dl-comtft.dts

diff --git a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
index a2812a4e25fe81171158cc5838f1a70cbbd4bcf5..e2ef0cbdfaff9a613207edafbb804394fd45089f 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
@@ -18,12 +18,12 @@
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
        aliases {
-               display = &display;
+               display = &mxcfb3;
        };
 
        backlight: backlight {
                compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 0>;
+               pwms = <&pwm2 0 500000>;
                power-supply = <&reg_3v3>;
                /*
                 * a poor man's way to create a 1:1 relationship between
@@ -41,50 +41,35 @@
                                     90 91 92 93 94 95 96 97 98 99
                                    100>;
                default-brightness-level = <50>;
+        };
+
+       mxcfb3: fb@2 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "lcd";
+               interface_pix_fmt = "RGB565";
+               mode_str ="CLAA-WVGA";
+               default_bpp = <16>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
        };
 
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               crtcs = <&ipu1 0>;
-               interface-pix-fmt = "rgb24";
+       lcd@0 {
+               compatible = "fsl,lcd";
+               ipu_id = <0>;
+               disp_id = <0>;
+               default_ifmt = "RGB565";
                pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
+               pinctrl-0 = <&pinctrl_disp0_2>;
                status = "okay";
-
-               display-timings {
-                       native-mode = <&ET070001DM6>;
-
-                       ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-        };
-
-       panel {
-               compatible = "simple-panel";
-               power-supply = <&reg_lcd1_pwr>;
-               enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-               backlight = <&backlight>;
        };
 };
 
-&can1 {
+&flexcan1 {
        status = "disabled";
 };
 
-&can2 {
+&flexcan2 {
        xceiver-supply = <&reg_3v3>;
 };