ARM: dts: tx6: move LCD related pinctrl properties to 'display' node

[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 e2ef0cbdfaff9a613207edafbb804394fd45089f..d78197b8bf987d8f274128f060e92205ab3ca2ef 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
@@ -18,12 +18,13 @@
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
        aliases {
-               display = &mxcfb3;
+               display = &mxcfb0;
+               mxcfb0 = &mxcfb0;
        };
 
        backlight: backlight {
                compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000>;
+               pwms = <&pwm2 0 500000 0>;
                power-supply = <&reg_3v3>;
                /*
                 * a poor man's way to create a 1:1 relationship between
@@ -41,35 +42,55 @@
                                     90 91 92 93 94 95 96 97 98 99
                                    100>;
                default-brightness-level = <50>;
-        };
+       };
 
-       mxcfb3: fb@2 {
+       mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_2>;
                disp_dev = "lcd";
-               interface_pix_fmt = "RGB565";
-               mode_str ="CLAA-WVGA";
-               default_bpp = <16>;
-               int_clk = <0>;
+               interface_pix_fmt = "RGB24";
+               mode_str = "";
+               default_bpp = <32>;
+               int_clk = <1>;
                late_init = <0>;
                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>;
+                       };
+               };
        };
 
-       lcd@0 {
+       lcd: lcd@0 {
                compatible = "fsl,lcd";
                ipu_id = <0>;
                disp_id = <0>;
-               default_ifmt = "RGB565";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;
+               default_ifmt = "RGB24";
                status = "okay";
        };
 };
 
-&flexcan1 {
+&can1 {
        status = "disabled";
 };
 
-&flexcan2 {
+&can2 {
        xceiver-supply = <&reg_3v3>;
 };
 
@@ -81,6 +102,10 @@
        status = "disabled";
 };
 
+&reg_lcd0_pwr {
+       status = "okay";
+};
+
 &reg_lcd1_pwr {
        status = "okay";
 };