ARM: dts: imx6: add support for Ka-Ro TX6 HW Rev. 3 modules
authorLothar Waßmann <LW@KARO-electronics.de>
Thu, 26 Feb 2015 11:32:27 +0000 (12:32 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 27 Feb 2015 08:26:18 +0000 (09:26 +0100)
13 files changed:
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx6dl-tx6s-8034.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6dl-tx6s-8035.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6dl-tx6u-8033.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6dl-tx6u-80xx.dts [moved from arch/arm/boot/dts/imx6dl-tx6u-801x.dts with 97% similarity]
arch/arm/boot/dts/imx6dl-tx6u-811x.dts [deleted file]
arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6dl-tx6u-81xx.dts [moved from arch/arm/boot/dts/imx6dl-tx6u-811x-mb7.dts with 78% similarity]
arch/arm/boot/dts/imx6q-tx6q-1033.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts [moved from arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts with 94% similarity]
arch/arm/boot/dts/imx6q-tx6q-10x0.dts [moved from arch/arm/boot/dts/imx6q-tx6q-1010.dts with 97% similarity]
arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts
arch/arm/boot/dts/imx6q-tx6q-11x0.dts [moved from arch/arm/boot/dts/imx6q-tx6q-1110.dts with 50% similarity]

index 1f03600..fb43fe2 100644 (file)
@@ -196,9 +196,12 @@ dtb-$(CONFIG_ARCH_MXC) += \
        imx6dl-sabrelite.dtb \
        imx6dl-sabresd.dtb \
        imx6dl-tx6dl-comtft.dtb \
-       imx6dl-tx6u-801x.dtb \
-       imx6dl-tx6u-811x.dtb \
-       imx6dl-tx6u-811x-mb7.dtb \
+       imx6dl-tx6s-8034.dtb \
+       imx6dl-tx6s-8035.dtb \
+       imx6dl-tx6u-8033.dtb \
+       imx6dl-tx6u-80xx.dtb \
+       imx6dl-tx6u-81xx-mb7.dtb \
+       imx6dl-tx6u-81xx.dtb \
        imx6dl-wandboard.dtb \
        imx6q-arm2.dtb \
        imx6q-cm-fx6.dtb \
@@ -217,12 +220,13 @@ dtb-$(CONFIG_ARCH_MXC) += \
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
        imx6q-sbc6x.dtb \
-       imx6q-tx6q-1010.dtb \
-       imx6q-tx6q-1010-comtft.dtb \
        imx6q-tx6q-1020.dtb \
        imx6q-tx6q-1020-comtft.dtb \
-       imx6q-tx6q-1110.dtb \
+       imx6q-tx6q-1033.dtb \
+       imx6q-tx6q-10x0-comtft.dtb \
+       imx6q-tx6q-10x0.dtb \
        imx6q-tx6q-11x0-mb7.dtb \
+       imx6q-tx6q-11x0.dtb \
        imx6q-udoo.dtb \
        imx6q-wandboard.dtb \
        imx6sl-evk.dtb \
diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8034.dts b/arch/arm/boot/dts/imx6dl-tx6s-8034.dts
new file mode 100644 (file)
index 0000000..7120549
--- /dev/null
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6dl.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6S-8034 Module";
+       compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
+
+       aliases {
+               display = &mxcfb0;
+               mxcfb0 = &mxcfb0;
+       };
+
+       backlight: backlight {
+               compatible = "pwm-backlight";
+               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+               power-supply = <&reg_3v3>;
+               /*
+                * a poor man's way to create a 1:1 relationship between
+                * the PWM value and the actual duty cycle
+                */
+               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                    10 11 12 13 14 15 16 17 18 19
+                                    20 21 22 23 24 25 26 27 28 29
+                                    30 31 32 33 34 35 36 37 38 39
+                                    40 41 42 43 44 45 46 47 48 49
+                                    50 51 52 53 54 55 56 57 58 59
+                                    60 61 62 63 64 65 66 67 68 69
+                                    70 71 72 73 74 75 76 77 78 79
+                                    80 81 82 83 84 85 86 87 88 89
+                                    90 91 92 93 94 95 96 97 98 99
+                                   100>;
+               default-brightness-level = <50>;
+       };
+
+       mxcfb0: fb@2 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "lcd";
+               interface_pix_fmt = "RGB24";
+               mode_str = "";
+               default_bpp = <32>;
+               int_clk = <1>;
+               late_init = <0>;
+               status = "okay";
+
+               display-timings {
+                       VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hsync-len = <96>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vsync-len = <2>;
+                               vfront-porch = <12>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ETV570 {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <114>;
+                               hsync-len = <30>;
+                               hfront-porch = <16>;
+                               vback-porch = <32>;
+                               vsync-len = <3>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ET0350 {
+                               clock-frequency = <6413760>;
+                               hactive = <320>;
+                               vactive = <240>;
+                               hback-porch = <34>;
+                               hsync-len = <34>;
+                               hfront-porch = <20>;
+                               vback-porch = <15>;
+                               vsync-len = <3>;
+                               vfront-porch = <4>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ET0430 {
+                               clock-frequency = <9009000>;
+                               hactive = <480>;
+                               vactive = <272>;
+                               hback-porch = <2>;
+                               hsync-len = <41>;
+                               hfront-porch = <2>;
+                               vback-porch = <2>;
+                               vsync-len = <10>;
+                               vfront-porch = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       ET0500 {
+                               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 = <0>;
+                       };
+
+                       ET0700 { /* same as ET0500 */
+                               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 = <0>;
+                       };
+
+                       ETQ570 {
+                               clock-frequency = <6596040>;
+                               hactive = <320>;
+                               vactive = <240>;
+                               hback-porch = <38>;
+                               hsync-len = <30>;
+                               hfront-porch = <30>;
+                               vback-porch = <16>;
+                               vsync-len = <3>;
+                               vfront-porch = <4>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+               };
+       };
+
+       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 {
+       status = "disabled";
+};
+
+&reg_lcd0_pwr {
+       status = "okay";
+};
+
+&reg_lcd1_pwr {
+       status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8035.dts b/arch/arm/boot/dts/imx6dl-tx6s-8035.dts
new file mode 100644 (file)
index 0000000..aefcbba
--- /dev/null
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6dl.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6S-8035 Module";
+       compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
+
+       aliases {
+               display = &mxcfb0;
+               mxcfb0 = &mxcfb0;
+       };
+
+       backlight: backlight {
+               compatible = "pwm-backlight";
+               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+               power-supply = <&reg_3v3>;
+               /*
+                * a poor man's way to create a 1:1 relationship between
+                * the PWM value and the actual duty cycle
+                */
+               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                    10 11 12 13 14 15 16 17 18 19
+                                    20 21 22 23 24 25 26 27 28 29
+                                    30 31 32 33 34 35 36 37 38 39
+                                    40 41 42 43 44 45 46 47 48 49
+                                    50 51 52 53 54 55 56 57 58 59
+                                    60 61 62 63 64 65 66 67 68 69
+                                    70 71 72 73 74 75 76 77 78 79
+                                    80 81 82 83 84 85 86 87 88 89
+                                    90 91 92 93 94 95 96 97 98 99
+                                   100>;
+               default-brightness-level = <50>;
+       };
+
+       mxcfb0: fb@2 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "lcd";
+               interface_pix_fmt = "RGB24";
+               mode_str = "";
+               default_bpp = <32>;
+               int_clk = <1>;
+               late_init = <0>;
+               status = "okay";
+
+               display-timings {
+                       VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hsync-len = <96>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vsync-len = <2>;
+                               vfront-porch = <12>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ETV570 {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <114>;
+                               hsync-len = <30>;
+                               hfront-porch = <16>;
+                               vback-porch = <32>;
+                               vsync-len = <3>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ET0350 {
+                               clock-frequency = <6413760>;
+                               hactive = <320>;
+                               vactive = <240>;
+                               hback-porch = <34>;
+                               hsync-len = <34>;
+                               hfront-porch = <20>;
+                               vback-porch = <15>;
+                               vsync-len = <3>;
+                               vfront-porch = <4>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ET0430 {
+                               clock-frequency = <9009000>;
+                               hactive = <480>;
+                               vactive = <272>;
+                               hback-porch = <2>;
+                               hsync-len = <41>;
+                               hfront-porch = <2>;
+                               vback-porch = <2>;
+                               vsync-len = <10>;
+                               vfront-porch = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       ET0500 {
+                               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 = <0>;
+                       };
+
+                       ET0700 { /* same as ET0500 */
+                               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 = <0>;
+                       };
+
+                       ETQ570 {
+                               clock-frequency = <6596040>;
+                               hactive = <320>;
+                               vactive = <240>;
+                               hback-porch = <38>;
+                               hsync-len = <30>;
+                               hfront-porch = <30>;
+                               vback-porch = <16>;
+                               vsync-len = <3>;
+                               vfront-porch = <4>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+               };
+       };
+
+       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 {
+       status = "disabled";
+};
+
+&gpmi {
+       status = "disabled";
+};
+
+&iomuxc {
+       imx6qdl-tx6 {
+               pinctrl_usdhc4: usdhc4grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_SD4_CMD__SD4_CMD             0x070b1
+                               MX6QDL_PAD_SD4_CLK__SD4_CLK             0x070b1
+                               MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x070b1
+                               MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x070b1
+                               MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x070b1
+                               MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x070b1
+                               MX6QDL_PAD_NANDF_ALE__SD4_RESET         0x0b0b1
+                       >;
+               };
+       };
+};
+
+&reg_lcd0_pwr {
+       status = "okay";
+};
+
+&reg_lcd1_pwr {
+       status = "okay";
+};
+
+&usdhc4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc4>;
+       bus-width = <4>;
+       no-1-8-v;
+       fsl,wp-controller;
+       status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6dl-tx6u-8033.dts b/arch/arm/boot/dts/imx6dl-tx6u-8033.dts
new file mode 100644 (file)
index 0000000..550f9ac
--- /dev/null
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6dl.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6U-8033 Module";
+       compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
+
+       aliases {
+               display = &mxcfb0;
+               mxcfb0 = &mxcfb0;
+       };
+
+       backlight: backlight {
+               compatible = "pwm-backlight";
+               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+               power-supply = <&reg_3v3>;
+               /*
+                * a poor man's way to create a 1:1 relationship between
+                * the PWM value and the actual duty cycle
+                */
+               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                    10 11 12 13 14 15 16 17 18 19
+                                    20 21 22 23 24 25 26 27 28 29
+                                    30 31 32 33 34 35 36 37 38 39
+                                    40 41 42 43 44 45 46 47 48 49
+                                    50 51 52 53 54 55 56 57 58 59
+                                    60 61 62 63 64 65 66 67 68 69
+                                    70 71 72 73 74 75 76 77 78 79
+                                    80 81 82 83 84 85 86 87 88 89
+                                    90 91 92 93 94 95 96 97 98 99
+                                   100>;
+               default-brightness-level = <50>;
+       };
+
+       mxcfb0: fb@2 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "lcd";
+               interface_pix_fmt = "RGB24";
+               mode_str = "";
+               default_bpp = <32>;
+               int_clk = <1>;
+               late_init = <0>;
+               status = "okay";
+
+               display-timings {
+                       VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hsync-len = <96>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vsync-len = <2>;
+                               vfront-porch = <12>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ETV570 {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <114>;
+                               hsync-len = <30>;
+                               hfront-porch = <16>;
+                               vback-porch = <32>;
+                               vsync-len = <3>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ET0350 {
+                               clock-frequency = <6413760>;
+                               hactive = <320>;
+                               vactive = <240>;
+                               hback-porch = <34>;
+                               hsync-len = <34>;
+                               hfront-porch = <20>;
+                               vback-porch = <15>;
+                               vsync-len = <3>;
+                               vfront-porch = <4>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ET0430 {
+                               clock-frequency = <9009000>;
+                               hactive = <480>;
+                               vactive = <272>;
+                               hback-porch = <2>;
+                               hsync-len = <41>;
+                               hfront-porch = <2>;
+                               vback-porch = <2>;
+                               vsync-len = <10>;
+                               vfront-porch = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       ET0500 {
+                               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 = <0>;
+                       };
+
+                       ET0700 { /* same as ET0500 */
+                               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 = <0>;
+                       };
+
+                       ETQ570 {
+                               clock-frequency = <6596040>;
+                               hactive = <320>;
+                               vactive = <240>;
+                               hback-porch = <38>;
+                               hsync-len = <30>;
+                               hfront-porch = <30>;
+                               vback-porch = <16>;
+                               vsync-len = <3>;
+                               vfront-porch = <4>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+               };
+       };
+
+       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 {
+       status = "disabled";
+};
+
+&gpmi {
+       status = "disabled";
+};
+
+&iomuxc {
+       imx6qdl-tx6 {
+               pinctrl_usdhc4: usdhc4grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_SD4_CMD__SD4_CMD             0x070b1
+                               MX6QDL_PAD_SD4_CLK__SD4_CLK             0x070b1
+                               MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x070b1
+                               MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x070b1
+                               MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x070b1
+                               MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x070b1
+                               MX6QDL_PAD_NANDF_ALE__SD4_RESET         0x0b0b1
+                       >;
+               };
+       };
+};
+
+&reg_lcd0_pwr {
+       status = "okay";
+};
+
+&reg_lcd1_pwr {
+       status = "okay";
+};
+
+&usdhc4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc4>;
+       bus-width = <4>;
+       no-1-8-v;
+       fsl,wp-controller;
+       status = "okay";
+};
similarity index 97%
rename from arch/arm/boot/dts/imx6dl-tx6u-801x.dts
rename to arch/arm/boot/dts/imx6dl-tx6u-80xx.dts
index 1e7401c..6dbbe68 100644 (file)
 #include "imx6qdl-tx6.dtsi"
 
 / {
-       model = "Ka-Ro electronics TX6U-801x Module";
+       model = "Ka-Ro electronics TX6U-801x/-803x Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
        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";
                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 {
                        };
                };
        };
+
+       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";
+       };
 };
 
 &reg_lcd0_pwr {
diff --git a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts b/arch/arm/boot/dts/imx6dl-tx6u-811x.dts
deleted file mode 100644 (file)
index 37dcbba..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-#include "imx6dl.dtsi"
-#include "imx6qdl-tx6.dtsi"
-
-/ {
-       model = "Ka-Ro electronics TX6U-811x Module";
-       compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
-
-       aliases {
-               display = &lvds0;
-               lvds0 = &lvds0;
-               mxcfb0 = &lvds0;
-       };
-
-       backlight0: backlight0 {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 0>;
-               power-supply = <&reg_lcd0_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       backlight1: backlight1 {
-               compatible = "pwm-backlight";
-               pwms = <&pwm1 0 500000 0>;
-               power-supply = <&reg_lcd1_pwr>;
-               /*
-                * a poor man's way to create a 1:1 relationship between
-                * the PWM value and the actual duty cycle
-                */
-               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
-                                    10 11 12 13 14 15 16 17 18 19
-                                    20 21 22 23 24 25 26 27 28 29
-                                    30 31 32 33 34 35 36 37 38 39
-                                    40 41 42 43 44 45 46 47 48 49
-                                    50 51 52 53 54 55 56 57 58 59
-                                    60 61 62 63 64 65 66 67 68 69
-                                    70 71 72 73 74 75 76 77 78 79
-                                    80 81 82 83 84 85 86 87 88 89
-                                    90 91 92 93 94 95 96 97 98 99
-                                   100>;
-               default-brightness-level = <50>;
-       };
-
-       lvds0: fb@0 {
-               compatible = "fsl,mxc_sdc_fb";
-               disp_dev = "ldb";
-               interface_pix_fmt = "RGB666";
-               mode_str ="LDB-XGA";
-               default_bpp = <32>;
-               int_clk = <0>;
-               late_init = <0>;
-               status = "okay";
-       };
-};
-
-&i2c3 {
-       polytouch1: eeti@04 {
-               compatible = "eeti,egalax_ts";
-               reg = <0x04>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_eeti>;
-               interrupt-parent = <&gpio3>;
-               interrupts = <22 0>;
-               wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-               linux,wakeup;
-       };
-};
-
-&iomuxc {
-       imx6dl-tx6u-811x {
-               pinctrl_eeti: eetigrp {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */
-                       >;
-               };
-       };
-};
-
-&kpp {
-       status = "disabled"; /* pads partially clash with backlight1 PWM */
-};
-
-&ldb {
-       ipu_id = <0>;
-       disp_id = <0>;
-       ext_ref = <0>;
-       mode = "sep0";
-       sec_ipu_id = <1>;
-       sec_disp_id = <1>;
-       status = "okay";
-
-       display-timings {
-               native-mode = <&lvds_timing0>;
-
-               lvds_timing0: hsd100pxn1 {
-                       clock-frequency = <65000000>;
-                       hactive = <1024>;
-                       vactive = <768>;
-                       hback-porch = <220>;
-                       hfront-porch = <40>;
-                       vback-porch = <21>;
-                       vfront-porch = <7>;
-                       hsync-len = <60>;
-                       vsync-len = <10>;
-                       de-active = <1>;
-                       pixelclk-active = <1>;
-               };
-       };
-};
-
-&pwm1 {
-       status = "okay";
-};
-
-&reg_lcd0_pwr {
-       status = "okay";
-};
-
-&reg_lcd1_pwr {
-       status = "okay";
-};
diff --git a/arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts b/arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts
new file mode 100644 (file)
index 0000000..35f69d0
--- /dev/null
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6dl.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6U-81xx Module";
+       compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
+
+       aliases {
+               display = &lvds0;
+               lvds0 = &lvds0;
+               lvds1 = &lvds1;
+               mxcfb0 = &lvds0;
+               mxcfb1 = &lvds1;
+       };
+
+       backlight0: backlight0 {
+               compatible = "pwm-backlight";
+               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+               power-supply = <&reg_lcd0_pwr>;
+               /*
+                * a poor man's way to create a 1:1 relationship between
+                * the PWM value and the actual duty cycle
+                */
+               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                    10 11 12 13 14 15 16 17 18 19
+                                    20 21 22 23 24 25 26 27 28 29
+                                    30 31 32 33 34 35 36 37 38 39
+                                    40 41 42 43 44 45 46 47 48 49
+                                    50 51 52 53 54 55 56 57 58 59
+                                    60 61 62 63 64 65 66 67 68 69
+                                    70 71 72 73 74 75 76 77 78 79
+                                    80 81 82 83 84 85 86 87 88 89
+                                    90 91 92 93 94 95 96 97 98 99
+                                   100>;
+               default-brightness-level = <50>;
+       };
+
+       backlight1: backlight1 {
+               compatible = "pwm-backlight";
+               pwms = <&pwm1 0 500000 PWM_POLARITY_INVERTED>;
+               power-supply = <&reg_lcd1_pwr>;
+               /*
+                * a poor man's way to create a 1:1 relationship between
+                * the PWM value and the actual duty cycle
+                */
+               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                    10 11 12 13 14 15 16 17 18 19
+                                    20 21 22 23 24 25 26 27 28 29
+                                    30 31 32 33 34 35 36 37 38 39
+                                    40 41 42 43 44 45 46 47 48 49
+                                    50 51 52 53 54 55 56 57 58 59
+                                    60 61 62 63 64 65 66 67 68 69
+                                    70 71 72 73 74 75 76 77 78 79
+                                    80 81 82 83 84 85 86 87 88 89
+                                    90 91 92 93 94 95 96 97 98 99
+                                   100>;
+               default-brightness-level = <50>;
+       };
+
+       lvds0: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "ldb";
+               interface_pix_fmt = "RGB666";
+               mode_str = "LDB-VGA";
+               default_bpp = <32>;
+               int_clk = <0>;
+               late_init = <0>;
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
+               status = "okay";
+
+               display-timings {
+                       native-mode = <&lvds0_timing1>;
+
+                       lvds0_timing0: hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vfront-porch = <7>;
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       lvds0_timing1: VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vfront-porch = <12>;
+                               hsync-len = <96>;
+                               vsync-len = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       lvds0_timing2: nl12880bc20 {
+                               clock-frequency = <71000000>;
+                               hactive = <1280>;
+                               vactive = <800>;
+                               hback-porch = <50>;
+                               hfront-porch = <50>;
+                               vback-porch = <5>;
+                               vfront-porch = <5>;
+                               hsync-len = <60>;
+                               vsync-len = <13>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+               };
+       };
+
+       lvds1: fb@1 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "ldb";
+               interface_pix_fmt = "RGB24";
+               mode_str = "LDB-NL12880BC20";
+               default_bpp = <32>;
+               int_clk = <0>;
+               late_init = <0>;
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
+               status = "okay";
+
+               display-timings {
+                       native-mode = <&lvds1_timing2>;
+
+                       lvds1_timing0: hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vfront-porch = <7>;
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       lvds1_timing1: VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vfront-porch = <12>;
+                               hsync-len = <96>;
+                               vsync-len = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       lvds1_timing2: nl12880bc20 {
+                               clock-frequency = <71000000>;
+                               hactive = <1280>;
+                               vactive = <800>;
+                               hback-porch = <50>;
+                               hfront-porch = <50>;
+                               vback-porch = <5>;
+                               vfront-porch = <5>;
+                               hsync-len = <60>;
+                               vsync-len = <13>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+               };
+       };
+};
+
+&can1 {
+       status = "disabled";
+};
+
+&can2 {
+       xceiver-supply = <&reg_3v3>;
+};
+
+&i2c3 {
+       polytouch1: eeti@04 {
+               compatible = "eeti,egalax_ts";
+               reg = <0x04>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_eeti>;
+               interrupt-parent = <&gpio3>;
+               interrupts = <22 0>;
+               wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+               linux,wakeup;
+       };
+};
+
+&iomuxc {
+       imx6dl-tx6u-81xx {
+               pinctrl_eeti: eetigrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */
+                       >;
+               };
+       };
+};
+
+&kpp {
+       status = "disabled"; /* pads partially clash with backlight1 PWM */
+};
+
+&ldb {
+       ipu_id = <0>;
+       disp_id = <0>;
+       ext_ref = <0>;
+       mode = "sep0";
+       sec_ipu_id = <0>;
+       sec_disp_id = <1>;
+       status = "okay";
+};
+
+&pwm1 {
+       status = "okay";
+};
+
+&reg_lcd0_pwr {
+       status = "okay";
+};
+
+&reg_lcd1_pwr {
+       status = "okay";
+};
similarity index 78%
rename from arch/arm/boot/dts/imx6dl-tx6u-811x-mb7.dts
rename to arch/arm/boot/dts/imx6dl-tx6u-81xx.dts
index d42e5d4..3aceba9 100644 (file)
 #include "imx6qdl-tx6.dtsi"
 
 / {
-       model = "Ka-Ro electronics TX6U-811x Module";
+       model = "Ka-Ro electronics TX6U-81xx Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
        aliases {
-               display = &ldb;
+               display = &lvds0;
                lvds0 = &lvds0;
                lvds1 = &lvds1;
                mxcfb0 = &lvds0;
@@ -27,8 +27,7 @@
 
        backlight0: backlight0 {
                compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 1>;
-               power-supply = <&reg_lcd0_pwr>;
+               pwms = <&pwm2 0 500000 0>;
                /*
                 * a poor man's way to create a 1:1 relationship between
                 * the PWM value and the actual duty cycle
@@ -50,7 +49,6 @@
        backlight1: backlight1 {
                compatible = "pwm-backlight";
                pwms = <&pwm1 0 500000 0>;
-               power-supply = <&reg_lcd1_pwr>;
                /*
                 * a poor man's way to create a 1:1 relationship between
                 * the PWM value and the actual duty cycle
@@ -73,8 +71,7 @@
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "ldb";
                interface_pix_fmt = "RGB666";
-//             mode_str ="LDB-VGA";
-               mode_str ="LDB-NL12880BC20";
+               mode_str = "LDB-XGA";
                default_bpp = <32>;
                int_clk = <0>;
                late_init = <0>;
                status = "okay";
 
                display-timings {
-                       VGA {
+                       native-mode = <&lvds0_timing0>;
+
+                       lvds0_timing0: hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vfront-porch = <7>;
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       lvds0_timing1: VGA {
                                clock-frequency = <25200000>;
                                hactive = <640>;
                                vactive = <480>;
                                hback-porch = <48>;
-                               hsync-len = <96>;
                                hfront-porch = <16>;
                                vback-porch = <31>;
-                               vsync-len = <2>;
                                vfront-porch = <12>;
+                               hsync-len = <96>;
+                               vsync-len = <2>;
                                hsync-active = <0>;
                                vsync-active = <0>;
                                de-active = <1>;
-                               pixelclk-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       lvds0_timing2: nl12880bc20 {
+                               clock-frequency = <71000000>;
+                               hactive = <1280>;
+                               vactive = <800>;
+                               hback-porch = <50>;
+                               hfront-porch = <50>;
+                               vback-porch = <5>;
+                               vfront-porch = <5>;
+                               hsync-len = <60>;
+                               vsync-len = <13>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
                        };
                };
        };
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "ldb";
                interface_pix_fmt = "RGB666";
-               mode_str ="LDB-NL12880BC20";
-//             mode_str ="LDB-VGA";
+               mode_str = "LDB-XGA";
                default_bpp = <32>;
                int_clk = <0>;
                late_init = <0>;
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
                status = "okay";
-       };
-};
 
-&i2c3 {
-       polytouch1: eeti@04 {
-               compatible = "eeti,egalax_ts";
-               reg = <0x04>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_eeti>;
-               interrupt-parent = <&gpio3>;
-               interrupts = <22 0>;
-               wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-               linux,wakeup;
-       };
-};
-
-&iomuxc {
-       imx6dl-tx6u-811x {
-               pinctrl_eeti: eetigrp {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */
-                       >;
-               };
-       };
-};
-
-&kpp {
-       status = "disabled"; /* pads partially clash with backlight1 PWM */
-};
-
-&ldb {
-       ipu_id = <0>;
-       disp_id = <0>;
-       ext_ref = <1>;
-       mode = "sin1";
-       sec_ipu_id = <0>;
-       sec_disp_id = <1>;
-
-       fsl,data-mapping = "spwg";
-       fsl,data-width = <18>;
-       status = "okay";
-
-       lvds-channel@0 {
                display-timings {
-                       native-mode = <&lvds0_timing1>;
+                       native-mode = <&lvds1_timing0>;
 
-                       lvds0_timing0: hsd100pxn1 {
+                       lvds1_timing0: hsd100pxn1 {
                                clock-frequency = <65000000>;
                                hactive = <1024>;
                                vactive = <768>;
                                vfront-porch = <7>;
                                hsync-len = <60>;
                                vsync-len = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
                                de-active = <1>;
-                               pixelclk-active = <1>;
+                               pixelclk-active = <0>;
                        };
 
-                       lvds0_timing1: VGA {
+                       lvds1_timing1: VGA {
                                clock-frequency = <25200000>;
                                hactive = <640>;
                                vactive = <480>;
                                hback-porch = <48>;
-                               hsync-len = <96>;
                                hfront-porch = <16>;
                                vback-porch = <31>;
-                               vsync-len = <2>;
                                vfront-porch = <12>;
+                               hsync-len = <96>;
+                               vsync-len = <2>;
                                hsync-active = <0>;
                                vsync-active = <0>;
                                de-active = <1>;
                                pixelclk-active = <0>;
                        };
-               };
-       };
-
-       lvds-channel@1 {
-               display-timings {
-                       native-mode = <&lvds1_timing0>;
 
-                       lvds1_timing0: nl12880bc20 {
+                       lvds1_timing2: nl12880bc20 {
                                clock-frequency = <71000000>;
                                hactive = <1280>;
                                vactive = <800>;
                                hback-porch = <50>;
-                               hsync-len = <60>;
                                hfront-porch = <50>;
                                vback-porch = <5>;
-                               vsync-len = <13>;
                                vfront-porch = <5>;
+                               hsync-len = <60>;
+                               vsync-len = <13>;
                                hsync-active = <0>;
                                vsync-active = <0>;
                                de-active = <1>;
-                               pixelclk-active = <1>;
+                               pixelclk-active = <0>;
                        };
                };
        };
 };
 
-&pwm1 {
-       status = "okay";
+&i2c3 {
+       polytouch1: eeti@04 {
+               compatible = "eeti,egalax_ts";
+               reg = <0x04>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_eeti>;
+               interrupt-parent = <&gpio3>;
+               interrupts = <22 0>;
+               wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+               linux,wakeup;
+       };
+};
+
+&iomuxc {
+       imx6dl-tx6u-81xx {
+               pinctrl_eeti: eetigrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */
+                       >;
+               };
+       };
+};
+
+&kpp {
+       status = "disabled"; /* pads partially clash with backlight1 PWM */
 };
 
-&reg_lcd0_pwr {
+&ldb {
+       ipu_id = <0>;
+       disp_id = <0>;
+       ext_ref = <0>;
+       mode = "sep0";
+       sec_ipu_id = <0>;
+       sec_disp_id = <1>;
        status = "okay";
 };
 
-&reg_lcd1_pwr {
+&pwm1 {
        status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6q-tx6q-1033.dts b/arch/arm/boot/dts/imx6q-tx6q-1033.dts
new file mode 100644 (file)
index 0000000..cab7acd
--- /dev/null
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+       model = "Ka-Ro electronics TX6Q-1033 Module";
+       compatible = "karo,imx6q-tx6q", "fsl,imx6q";
+
+       aliases {
+               display = &mxcfb0;
+               mxcfb0 = &mxcfb0;
+       };
+
+       backlight: backlight {
+               compatible = "pwm-backlight";
+               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+               power-supply = <&reg_3v3>;
+               /*
+                * a poor man's way to create a 1:1 relationship between
+                * the PWM value and the actual duty cycle
+                */
+               brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                    10 11 12 13 14 15 16 17 18 19
+                                    20 21 22 23 24 25 26 27 28 29
+                                    30 31 32 33 34 35 36 37 38 39
+                                    40 41 42 43 44 45 46 47 48 49
+                                    50 51 52 53 54 55 56 57 58 59
+                                    60 61 62 63 64 65 66 67 68 69
+                                    70 71 72 73 74 75 76 77 78 79
+                                    80 81 82 83 84 85 86 87 88 89
+                                    90 91 92 93 94 95 96 97 98 99
+                                   100>;
+               default-brightness-level = <50>;
+       };
+
+       mxcfb0: fb@2 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "lcd";
+               interface_pix_fmt = "RGB24";
+               mode_str = "";
+               default_bpp = <32>;
+               int_clk = <1>;
+               late_init = <0>;
+               status = "okay";
+
+               display-timings {
+                       VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hsync-len = <96>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vsync-len = <2>;
+                               vfront-porch = <12>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ETV570 {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <114>;
+                               hsync-len = <30>;
+                               hfront-porch = <16>;
+                               vback-porch = <32>;
+                               vsync-len = <3>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ET0350 {
+                               clock-frequency = <6413760>;
+                               hactive = <320>;
+                               vactive = <240>;
+                               hback-porch = <34>;
+                               hsync-len = <34>;
+                               hfront-porch = <20>;
+                               vback-porch = <15>;
+                               vsync-len = <3>;
+                               vfront-porch = <4>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       ET0430 {
+                               clock-frequency = <9009000>;
+                               hactive = <480>;
+                               vactive = <272>;
+                               hback-porch = <2>;
+                               hsync-len = <41>;
+                               hfront-porch = <2>;
+                               vback-porch = <2>;
+                               vsync-len = <10>;
+                               vfront-porch = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       ET0500 {
+                               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 = <0>;
+                       };
+
+                       ET0700 { /* same as ET0500 */
+                               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 = <0>;
+                       };
+
+                       ETQ570 {
+                               clock-frequency = <6596040>;
+                               hactive = <320>;
+                               vactive = <240>;
+                               hback-porch = <38>;
+                               hsync-len = <30>;
+                               hfront-porch = <30>;
+                               vback-porch = <16>;
+                               vsync-len = <3>;
+                               vfront-porch = <4>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+               };
+       };
+
+       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 {
+       status = "disabled";
+};
+
+&gpmi {
+       status = "disabled";
+};
+
+&iomuxc {
+       imx6qdl-tx6 {
+               pinctrl_usdhc4: usdhc4grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_SD4_CMD__SD4_CMD             0x070b1
+                               MX6QDL_PAD_SD4_CLK__SD4_CLK             0x070b1
+                               MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x070b1
+                               MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x070b1
+                               MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x070b1
+                               MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x070b1
+                               MX6QDL_PAD_NANDF_ALE__SD4_RESET         0x0b0b1
+                       >;
+               };
+       };
+};
+
+&ipu2 {
+       status = "disabled";
+};
+
+&reg_lcd0_pwr {
+       status = "okay";
+};
+
+&reg_lcd1_pwr {
+       status = "okay";
+};
+
+&usdhc4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc4>;
+       bus-width = <4>;
+       no-1-8-v;
+       fsl,wp-controller;
+       status = "okay";
+};
similarity index 94%
rename from arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
rename to arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts
index cc3524e..e8c9bbe 100644 (file)
 #include "imx6qdl-tx6.dtsi"
 
 / {
-       model = "Ka-Ro electronics TX6Q-1010 Module on CoMpact TFT";
+       model = "Ka-Ro electronics TX6Q-1010/-1030 Module on CoMpact TFT";
        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";
                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 {
                        native-mode = <&ET070001DM6>;
                        };
                };
        };
+
+       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";
+       };
 };
 
 &can1 {
similarity index 97%
rename from arch/arm/boot/dts/imx6q-tx6q-1010.dts
rename to arch/arm/boot/dts/imx6q-tx6q-10x0.dts
index 6eeccda..ea3a8ac 100644 (file)
 #include "imx6qdl-tx6.dtsi"
 
 / {
-       model = "Ka-Ro electronics TX6Q-1010 Module";
+       model = "Ka-Ro electronics TX6Q-1010/-1030 Module";
        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";
                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 {
                        };
                };
        };
+
+       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";
+       };
 };
 
 &ipu2 {
index f14ed86..d4c6a0e 100644 (file)
 #include "imx6qdl-tx6.dtsi"
 
 / {
-       model = "Ka-Ro electronics TX6Q-1110 Module";
+       model = "Ka-Ro electronics TX6Q-1110/-1130 Module";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
 
        aliases {
-               display = &ldb;
+               display = &lvds0;
                ipu1 = &ipu2;
                lvds0 = &lvds0;
                lvds1 = &lvds1;
                default_bpp = <32>;
                int_clk = <0>;
                late_init = <0>;
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
                status = "okay";
+
+               display-timings {
+                       native-mode = <&lvds0_timing1>;
+
+                       lvds0_timing0: hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vfront-porch = <7>;
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       lvds0_timing1: VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vfront-porch = <12>;
+                               hsync-len = <96>;
+                               vsync-len = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       lvds0_timing2: nl12880bc20 {
+                               clock-frequency = <71000000>;
+                               hactive = <1280>;
+                               vactive = <800>;
+                               hback-porch = <50>;
+                               hfront-porch = <50>;
+                               vback-porch = <5>;
+                               vfront-porch = <5>;
+                               hsync-len = <60>;
+                               vsync-len = <13>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+               };
        };
 
        lvds1: fb@1 {
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "ldb";
-               interface_pix_fmt = "RGB666";
+               interface_pix_fmt = "RGB24";
                mode_str = "LDB-NL12880BC20";
                default_bpp = <32>;
                int_clk = <0>;
                late_init = <0>;
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
                status = "okay";
+
+               display-timings {
+                       native-mode = <&lvds1_timing2>;
+
+                       lvds1_timing0: hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vfront-porch = <7>;
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       lvds1_timing1: VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vfront-porch = <12>;
+                               hsync-len = <96>;
+                               vsync-len = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       lvds1_timing2: nl12880bc20 {
+                               clock-frequency = <71000000>;
+                               hactive = <1280>;
+                               vactive = <800>;
+                               hback-porch = <50>;
+                               hfront-porch = <50>;
+                               vback-porch = <5>;
+                               vfront-porch = <5>;
+                               hsync-len = <60>;
+                               vsync-len = <13>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+               };
        };
 };
 
+&can1 {
+       status = "disabled";
+};
+
+&can2 {
+       xceiver-supply = <&reg_3v3>;
+};
+
 &i2c3 {
        polytouch1: eeti@04 {
                compatible = "eeti,egalax_ts";
 };
 
 &iomuxc {
-       imx6q-tx6q-1110 {
+       imx6q-tx6q-11x0 {
                pinctrl_eeti: eetigrp {
                        fsl,pins = <
                                MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */
 };
 
 &ipu2 {
-       status = "okay";
+       status = "disabled";
 };
 
 &kpp {
        sec_ipu_id = <0>;
        sec_disp_id = <1>;
        status = "okay";
-       fsl,data-mapping = "spwg";
-       fsl,data-width = <18>;
-
-       display_timings: display-timings {
-               native-mode = <&lvds_timing0>;
-
-               lvds_timing0: hsd100pxn1 {
-                       clock-frequency = <65000000>;
-                       hactive = <1024>;
-                       vactive = <768>;
-                       hback-porch = <220>;
-                       hfront-porch = <40>;
-                       vback-porch = <21>;
-                       vfront-porch = <7>;
-                       hsync-len = <60>;
-                       vsync-len = <10>;
-                       de-active = <1>;
-                       pixelclk-active = <1>;
-               };
-
-               lvds_timing1: VGA {
-                       clock-frequency = <25200000>;
-                       hactive = <640>;
-                       vactive = <480>;
-                       hback-porch = <48>;
-                       hfront-porch = <16>;
-                       vback-porch = <31>;
-                       vfront-porch = <12>;
-                       hsync-len = <96>;
-                       vsync-len = <2>;
-                       hsync-active = <0>;
-                       vsync-active = <0>;
-                       de-active = <1>;
-                       pixelclk-active = <0>;
-               };
-
-               lvds_timing2: nl12880bc20 {
-                       clock-frequency = <50000000>;
-                       hactive = <1280>;
-                       vactive = <800>;
-                       hback-porch = <50>;
-                       hfront-porch = <50>;
-                       vback-porch = <5>;
-                       vfront-porch = <5>;
-                       hsync-len = <60>;
-                       vsync-len = <13>;
-                       hsync-active = <0>;
-                       vsync-active = <0>;
-                       de-active = <1>;
-                       pixelclk-active = <1>;
-               };
-       };
-};
-
-&lvds0 {
-       display-timings {
-               native-mode = <&lvds0_timing2>;
-
-               lvds0_timing0: hsd100pxn1 {
-                       clock-frequency = <65000000>;
-                       hactive = <1024>;
-                       vactive = <768>;
-                       hback-porch = <220>;
-                       hfront-porch = <40>;
-                       vback-porch = <21>;
-                       vfront-porch = <7>;
-                       hsync-len = <60>;
-                       vsync-len = <10>;
-                       de-active = <1>;
-                       pixelclk-active = <1>;
-               };
-
-               lvds0_timing1: VGA {
-                       clock-frequency = <25200000>;
-                       hactive = <640>;
-                       vactive = <480>;
-                       hback-porch = <48>;
-                       hfront-porch = <16>;
-                       vback-porch = <31>;
-                       vfront-porch = <12>;
-                       hsync-len = <96>;
-                       vsync-len = <2>;
-                       hsync-active = <0>;
-                       vsync-active = <0>;
-                       de-active = <1>;
-                       pixelclk-active = <0>;
-               };
-
-               lvds0_timing2: nl12880bc20 {
-                       clock-frequency = <71000000>;
-                       hactive = <1280>;
-                       vactive = <800>;
-                       hback-porch = <50>;
-                       hfront-porch = <50>;
-                       vback-porch = <5>;
-                       vfront-porch = <5>;
-                       hsync-len = <60>;
-                       vsync-len = <13>;
-                       hsync-active = <0>;
-                       vsync-active = <0>;
-                       de-active = <1>;
-                       pixelclk-active = <1>;
-               };
-       };
-};
-
-&lvds1 {
-       display-timings {
-               native-mode = <&lvds1_timing2>;
-
-               lvds1_timing0: hsd100pxn1 {
-                       clock-frequency = <65000000>;
-                       hactive = <1024>;
-                       vactive = <768>;
-                       hback-porch = <220>;
-                       hfront-porch = <40>;
-                       vback-porch = <21>;
-                       vfront-porch = <7>;
-                       hsync-len = <60>;
-                       vsync-len = <10>;
-                       de-active = <1>;
-                       pixelclk-active = <1>;
-               };
-
-               lvds1_timing1: VGA {
-                       clock-frequency = <25200000>;
-                       hactive = <640>;
-                       vactive = <480>;
-                       hback-porch = <48>;
-                       hfront-porch = <16>;
-                       vback-porch = <31>;
-                       vfront-porch = <12>;
-                       hsync-len = <96>;
-                       vsync-len = <2>;
-                       hsync-active = <0>;
-                       vsync-active = <0>;
-                       de-active = <1>;
-                       pixelclk-active = <0>;
-               };
-
-               lvds1_timing2: nl12880bc20 {
-                       clock-frequency = <71000000>;
-                       hactive = <1280>;
-                       vactive = <800>;
-                       hback-porch = <50>;
-                       hfront-porch = <50>;
-                       vback-porch = <5>;
-                       vfront-porch = <5>;
-                       hsync-len = <60>;
-                       vsync-len = <13>;
-                       hsync-active = <0>;
-                       vsync-active = <0>;
-                       de-active = <1>;
-                       pixelclk-active = <1>;
-               };
-       };
 };
 
 &pwm1 {
similarity index 50%
rename from arch/arm/boot/dts/imx6q-tx6q-1110.dts
rename to arch/arm/boot/dts/imx6q-tx6q-11x0.dts
index bbd3c60..c66524b 100644 (file)
 #include "imx6qdl-tx6.dtsi"
 
 / {
-       model = "Ka-Ro electronics TX6Q-1110 Module";
+       model = "Ka-Ro electronics TX6Q-1110/-1130 Module";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
 
        aliases {
                display = &lvds0;
                ipu1 = &ipu2;
                lvds0 = &lvds0;
+               lvds1 = &lvds1;
                mxcfb0 = &lvds0;
+               mxcfb1 = &lvds1;
        };
 
        backlight0: backlight0 {
                compatible = "pwm-backlight";
                pwms = <&pwm2 0 500000 0>;
-               power-supply = <&reg_lcd0_pwr>;
                /*
                 * a poor man's way to create a 1:1 relationship between
                 * the PWM value and the actual duty cycle
@@ -49,7 +50,6 @@
        backlight1: backlight1 {
                compatible = "pwm-backlight";
                pwms = <&pwm1 0 500000 0>;
-               power-supply = <&reg_lcd1_pwr>;
                /*
                 * a poor man's way to create a 1:1 relationship between
                 * the PWM value and the actual duty cycle
                compatible = "fsl,mxc_sdc_fb";
                disp_dev = "ldb";
                interface_pix_fmt = "RGB666";
-               mode_str ="LDB-XGA";
+               mode_str = "LDB-XGA";
                default_bpp = <32>;
                int_clk = <0>;
                late_init = <0>;
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
                status = "okay";
+
+               display-timings {
+                       native-mode = <&lvds0_timing0>;
+
+                       lvds0_timing0: hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vfront-porch = <7>;
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+
+                       lvds0_timing1: VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vfront-porch = <12>;
+                               hsync-len = <96>;
+                               vsync-len = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       lvds0_timing2: nl12880bc20 {
+                               clock-frequency = <71000000>;
+                               hactive = <1280>;
+                               vactive = <800>;
+                               hback-porch = <50>;
+                               hfront-porch = <50>;
+                               vback-porch = <5>;
+                               vfront-porch = <5>;
+                               hsync-len = <60>;
+                               vsync-len = <13>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+               };
+       };
+
+       lvds1: fb@1 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "ldb";
+               interface_pix_fmt = "RGB666";
+               mode_str = "LDB-XGA";
+               default_bpp = <32>;
+               int_clk = <0>;
+               late_init = <0>;
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
+               status = "okay";
+
+               display-timings {
+                       native-mode = <&lvds1_timing0>;
+
+                       lvds1_timing0: hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vfront-porch = <7>;
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       lvds1_timing1: VGA {
+                               clock-frequency = <25200000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <48>;
+                               hfront-porch = <16>;
+                               vback-porch = <31>;
+                               vfront-porch = <12>;
+                               hsync-len = <96>;
+                               vsync-len = <2>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+
+                       lvds1_timing2: nl12880bc20 {
+                               clock-frequency = <71000000>;
+                               hactive = <1280>;
+                               vactive = <800>;
+                               hback-porch = <50>;
+                               hfront-porch = <50>;
+                               vback-porch = <5>;
+                               vfront-porch = <5>;
+                               hsync-len = <60>;
+                               vsync-len = <13>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+               };
        };
 };
 
 };
 
 &iomuxc {
-       imx6q-tx6q-1110 {
+       imx6q-tx6q-11x0 {
                pinctrl_eeti: eetigrp {
                        fsl,pins = <
                                MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */
        disp_id = <0>;
        ext_ref = <0>;
        mode = "sep0";
-       sec_ipu_id = <1>;
+       sec_ipu_id = <0>;
        sec_disp_id = <1>;
        status = "okay";
-
-       display-timings {
-               native-mode = <&lvds_timing0>;
-
-               lvds_timing0: hsd100pxn1 {
-                       clock-frequency = <65000000>;
-                       hactive = <1024>;
-                       vactive = <768>;
-                       hback-porch = <220>;
-                       hfront-porch = <40>;
-                       vback-porch = <21>;
-                       vfront-porch = <7>;
-                       hsync-len = <60>;
-                       vsync-len = <10>;
-                       de-active = <1>;
-                       pixelclk-active = <1>;
-               };
-       };
 };
 
 &pwm1 {
        status = "okay";
 };
 
-&reg_lcd0_pwr {
-       status = "okay";
-};
-
-&reg_lcd1_pwr {
-       status = "okay";
-};
-
 &sata {
        status = "okay";
 };