ARM: dts: update Ka-Ro DTS files

diff --git a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
index e2ef0cbdfaff9a613207edafbb804394fd45089f..4b537313333387c01d33e72435bc756aa126ea67 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
@@ -18,7 +18,8 @@
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
        aliases {
-               display = &mxcfb3;
+               display = &display;
+               mxcfb0 = &display;
        };
 
        backlight: backlight {
@@ -43,13 +44,13 @@
                default-brightness-level = <50>;
         };
 
-       mxcfb3: fb@2 {
+       display: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "lcd";
-               interface_pix_fmt = "RGB565";
-               mode_str ="CLAA-WVGA";
-               default_bpp = <16>;
-               int_clk = <0>;
+               interface_pix_fmt = "RGB24";
+               mode_str ="ET0500";
+               default_bpp = <32>;
+               int_clk = <1>;
                late_init = <0>;
                status = "okay";
        };
@@ -58,7 +59,7 @@
                compatible = "fsl,lcd";
                ipu_id = <0>;
                disp_id = <0>;
-               default_ifmt = "RGB565";
+               default_ifmt = "RGB24";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_2>;
                status = "okay";
@@ -81,6 +82,10 @@
        status = "disabled";
 };
 
+&reg_lcd0_pwr {
+       status = "okay";
+};
+
 &reg_lcd1_pwr {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6dl-tx6u-801x.dts b/arch/arm/boot/dts/imx6dl-tx6u-801x.dts
index 6657798cb9fc02b428a3d5af30d161dad6ff8c96..288fe3762298f352c9dbac6fa9a2227c7b033133 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6u-801x.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6u-801x.dts
@@ -18,8 +18,8 @@
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
        aliases {
-               display = &mxcfb3;
-               mxcfb2 = &mxcfb3;
+               display = &display;
+               mxcfb0 = &display;
        };
 
        backlight: backlight {
@@ -44,13 +44,13 @@
                default-brightness-level = <50>;
         };
 
-       mxcfb3: fb@2 {
+       display: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "lcd";
-               interface_pix_fmt = "RGB565";
-               mode_str ="CLAA-WVGA";
-               default_bpp = <16>;
-               int_clk = <0>;
+               interface_pix_fmt = "RGB24";
+               mode_str ="ET0500";
+               default_bpp = <32>;
+               int_clk = <1>;
                late_init = <0>;
                status = "okay";
        };
@@ -59,7 +59,7 @@
                compatible = "fsl,lcd";
                ipu_id = <0>;
                disp_id = <0>;
-               default_ifmt = "RGB565";
+               default_ifmt = "RGB24";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_2>;
                status = "okay";

diff --git a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts b/arch/arm/boot/dts/imx6dl-tx6u-811x.dts
index a496fc4ef6c22c7b56a0d723948d9408f39347b8..75e8be8b84247c0f5f92ab213d99de270c4d6d07 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6u-811x.dts
@@ -18,8 +18,8 @@
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
        aliases {
-               display = &ldb;
-               mxcfb0 = &mxcfb1;
+               display = &lvds0;
+               mxcfb0 = &lvds0;
        };
 
        backlight0: backlight0 {
@@ -66,12 +66,12 @@
                default-brightness-level = <50>;
        };
 
-       mxcfb1: fb@0 {
+       lvds0: fb@0 {
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "ldb";
                interface_pix_fmt = "RGB666";
                mode_str ="LDB-XGA";
-               default_bpp = <16>;
+               default_bpp = <32>;
                int_clk = <0>;
                late_init = <0>;
                status = "okay";

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
index 56c5972de0a61bc8c5a4696663b6343307706642..00829488ccd810c33540e39c6782fe043576e393 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
@@ -18,8 +18,8 @@
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
 
        aliases {
-               display = &mxcfb3;
-               mxcfb2 = &mxcfb3;
+               display = &display;
+               mxcfb0 = &display;
        };
 
        backlight: backlight {
@@ -44,13 +44,13 @@
                default-brightness-level = <50>;
         };
 
-       mxcfb3: fb@2 {
+       display: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "lcd";
-               interface_pix_fmt = "RGB565";
-               mode_str ="CLAA-WVGA";
-               default_bpp = <16>;
-               int_clk = <0>;
+               interface_pix_fmt = "RGB24";
+               mode_str ="ET0500";
+               default_bpp = <32>;
+               int_clk = <1>;
                late_init = <0>;
                status = "okay";
        };
@@ -59,7 +59,7 @@
                compatible = "fsl,lcd";
                ipu_id = <0>;
                disp_id = <0>;
-               default_ifmt = "RGB565";
+               default_ifmt = "RGB24";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_2>;
                status = "okay";
@@ -86,6 +86,10 @@
        status = "disabled";
 };
 
+&reg_lcd0_pwr {
+       status = "okay";
+};
+
 &reg_lcd1_pwr {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010.dts b/arch/arm/boot/dts/imx6q-tx6q-1010.dts
index 7299664eb79a8072fee4c3e8245688cdf18a9abf..01c1414428817724fdbfbbb64d3a31316a1f52ee 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1010.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1010.dts
@@ -18,11 +18,8 @@
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
 
        aliases {
-               display = &mxcfb3;
-               mxcfb0 = &mxcfb1;
-               mxcfb1 = &mxcfb2;
-               mxcfb2 = &mxcfb3;
-               mxcfb3 = &mxcfb4;
+               display = &display;
+               mxcfb0 = &display;
        };
 
        backlight: backlight {
@@ -47,50 +44,17 @@
                default-brightness-level = <50>;
         };
 
-       mxcfb1: fb@0 {
-               compatible = "fsl,mxc_sdc_fb";
-               disp_dev = "ldb";
-               interface_pix_fmt = "RGB666";
-               mode_str ="LDB-XGA";
-               default_bpp = <16>;
-               int_clk = <0>;
-               late_init = <0>;
-               status = "disabled";
-       };
-
-       mxcfb2: fb@1 {
-               compatible = "fsl,mxc_sdc_fb";
-               disp_dev = "hdmi";
-               interface_pix_fmt = "RGB24";
-               mode_str ="1920x1080M@60";
-               default_bpp = <24>;
-               int_clk = <0>;
-               late_init = <0>;
-               status = "disabled";
-       };
-
-       mxcfb3: fb@2 {
+       display: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
-               mode_str ="CLAA-WVGA";
+               mode_str ="ET0500";
                default_bpp = <32>;
                int_clk = <1>;
                late_init = <0>;
                status = "okay";
        };
 
-       mxcfb4: fb@3 {
-               compatible = "fsl,mxc_sdc_fb";
-               disp_dev = "ldb";
-               interface_pix_fmt = "RGB666";
-               mode_str ="LDB-XGA";
-               default_bpp = <16>;
-               int_clk = <0>;
-               late_init = <0>;
-               status = "disabled";
-       };
-
        lcd@0 {
                compatible = "fsl,lcd";
                ipu_id = <0>;
@@ -103,7 +67,11 @@
 };
 
 &ipu2 {
-//     status = "disabled";
+       status = "disabled";
+};
+
+&reg_lcd0_pwr {
+       status = "okay";
 };
 
 &reg_lcd1_pwr {

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
index 03b33d12c69590f6ba88962a0caecb07d9a074bd..2848f8eb0b30fb43c8174407fa8fc3de8101a2ab 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
@@ -18,8 +18,8 @@
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
 
        aliases {
-               display = &mxcfb3;
-               mxcfb2 = &mxcfb3;
+               display = &display;
+               mxcfb0 = &display;
        };
 
        backlight: backlight {
@@ -44,13 +44,13 @@
                default-brightness-level = <50>;
         };
 
-       mxcfb3: fb@2 {
+       display: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "lcd";
-               interface_pix_fmt = "RGB565";
-               mode_str ="CLAA-WVGA";
-               default_bpp = <16>;
-               int_clk = <0>;
+               interface_pix_fmt = "RGB24";
+               mode_str ="ET0500";
+               default_bpp = <32>;
+               int_clk = <1>;
                late_init = <0>;
                status = "okay";
        };
@@ -59,7 +59,7 @@
                compatible = "fsl,lcd";
                ipu_id = <0>;
                disp_id = <0>;
-               default_ifmt = "RGB565";
+               default_ifmt = "RGB24";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_2>;
                status = "okay";
@@ -110,6 +110,10 @@
        status = "disabled";
 };
 
+&reg_lcd0_pwr {
+       status = "okay";
+};
+
 &reg_lcd1_pwr {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020.dts b/arch/arm/boot/dts/imx6q-tx6q-1020.dts
index 305e71d9d76d597c466dca110ce0d9d59006f787..c33206d1d39ccb32d38914e54a92f5b76a501827 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 = &mxcfb3;
-               mxcfb2 = &mxcfb3;
+               display = &display;
+               mxcfb0 = &display;
        };
 
        backlight: backlight {
@@ -44,13 +44,13 @@
                default-brightness-level = <50>;
         };
 
-       mxcfb3: fb@2 {
+       display: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "lcd";
-               interface_pix_fmt = "RGB565";
-               mode_str ="CLAA-WVGA";
-               default_bpp = <16>;
-               int_clk = <0>;
+               interface_pix_fmt = "RGB24";
+               mode_str ="ET0500";
+               default_bpp = <32>;
+               int_clk = <1>;
                late_init = <0>;
                status = "okay";
        };
@@ -59,7 +59,7 @@
                compatible = "fsl,lcd";
                ipu_id = <0>;
                disp_id = <0>;
-               default_ifmt = "RGB565";
+               default_ifmt = "RGB24";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_2>;
                status = "okay";
@@ -94,6 +94,10 @@
        };
 };
 
+&reg_lcd0_pwr {
+       status = "okay";
+};
+
 &reg_lcd1_pwr {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1110.dts b/arch/arm/boot/dts/imx6q-tx6q-1110.dts
index ff3603da588970f72d6733b9aa6dad23bc8bd080..75fdbde8e058c3349e647db6a1c16bcbcff32282 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1110.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1110.dts
@@ -18,9 +18,9 @@
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
 
        aliases {
-               display = &ldb;
+               display = &lvds0;
                ipu1 = &ipu2;
-               mxcfb0 = &mxcfb1;
+               mxcfb0 = &lvds0;
        };
 
        backlight0: backlight0 {
@@ -67,12 +67,12 @@
                default-brightness-level = <50>;
        };
 
-       mxcfb1: fb@0 {
+       lvds0: fb@0 {
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "ldb";
                interface_pix_fmt = "RGB666";
                mode_str ="LDB-XGA";
-               default_bpp = <16>;
+               default_bpp = <32>;
                int_clk = <0>;
                late_init = <0>;
                status = "okay";