]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: dts: imx6-tx6: move display configuration to .dtsi file
authorLothar Waßmann <LW@KARO-electronics.de>
Tue, 24 Oct 2017 13:15:52 +0000 (15:15 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 24 Oct 2017 13:15:52 +0000 (15:15 +0200)
Currently the display (LCD or LVDS) configuration is duplicated with
slight variations in each TX6 module specific file.

Move it to an include file for simplification and consistency.

17 files changed:
arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
arch/arm/boot/dts/imx6dl-tx6s-8034.dts
arch/arm/boot/dts/imx6dl-tx6s-8035.dts
arch/arm/boot/dts/imx6dl-tx6u-801x.dts
arch/arm/boot/dts/imx6dl-tx6u-8033.dts
arch/arm/boot/dts/imx6dl-tx6u-811x.dts
arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts
arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
arch/arm/boot/dts/imx6q-tx6q-1010.dts
arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
arch/arm/boot/dts/imx6q-tx6q-1020.dts
arch/arm/boot/dts/imx6q-tx6q-1036.dts
arch/arm/boot/dts/imx6q-tx6q-1110.dts
arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts
arch/arm/boot/dts/imx6qdl-tx6-lcd.dtsi [new file with mode: 0644]
arch/arm/boot/dts/imx6qdl-tx6-lvds.dtsi [new file with mode: 0644]
arch/arm/boot/dts/imx6qdl-tx6.dtsi

index aac42ac465b64619a82773bf097cc49051c5aa08..51a9bb9d6bc2811bc347b1553e8ba74a2f2f642f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-2017 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6DL Module on CoMpact TFT";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
+};
 
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 0>;
-               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>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&ET070001DM6>;
-
-                       ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
+&backlight {
+       pwms = <&pwm2 0 500000 0>;
+       /delete-property/ turn-on-delay-ms;
 };
 
 &can1 {
        xceiver-supply = <&reg_3v3>;
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &kpp {
        status = "disabled";
 };
 
+&lcd_panel {
+       compatible = "edt,etm0700g0edh6";
+};
+
 &reg_can_xcvr {
        status = "disabled";
 };
index ff8f7b1c42825b5f24fe16846a7a01367cae992a..9eb2ef17339c739080b9ea02b753574ba582197f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2015-2017 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6S-8034 Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
-       aliases {
-               display = &display;
-               ipu1 = &ipu1;
-       };
-
        cpus {
                /delete-node/ cpu@1;
        };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_lcd0_pwr>;
-               enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-               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>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;
-               interface-pix-fmt = "rgb24";
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&vga>;
-
-                       vga: 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>;
-                       };
-               };
-       };
 };
 
 &ds1339 {
                MX6QDL_PAD_SD3_CMD__GPIO7_IO02          0x170b0 /* SD1 CD */
        >;
 };
-
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
-&reg_lcd0_pwr {
-       status = "disabled";
-};
index f988950e9443d44b19886f12ad9d9f423556c91e..a5532ecc18c5ad9d3901f53e575483da3cbe9cc6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2015-2017 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6S-8035 Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
-       aliases {
-               display = &display;
-               ipu1 = &ipu1;
-       };
-
        cpus {
                /delete-node/ cpu@1;
        };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_lcd0_pwr>;
-               enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-               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>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;
-               interface-pix-fmt = "rgb24";
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&vga>;
-
-                       vga: 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>;
-                       };
-               };
-       };
 };
 
 &ds1339 {
        status = "disabled";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
-&reg_lcd0_pwr {
-       status = "disabled";
-};
-
 &usdhc4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc4>;
index d1f1298ec55a8f28e80a297ee9e15d62d8385d28..67ed0452f5de5c1a2437a6ccbf70b7fdcdb195e4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-2017 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6U-801x Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
-
-       aliases {
-               display = &display;
-       };
-
-       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>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               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>;
-                       };
-               };
-       };
-};
-
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
 };
index 4d3204a56f46114347be5943691be5917e752dab..7030b2654bbd23d33580d79679e7016671b8a0e0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-2017 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6U-8033 Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
-
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_lcd0_pwr>;
-               enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-               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>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;
-               interface-pix-fmt = "rgb24";
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&vga>;
-
-                       vga: 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>;
-                       };
-               };
-       };
 };
 
 &ds1339 {
        status = "disabled";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
-&reg_lcd0_pwr {
-       status = "disabled";
-};
-
 &usdhc4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc4>;
index f0f759af9a13ee63cd7053a0a9ff582944da56b3..5342f2f5a8a856c25fbc70200212f6f6aec96ce1 100644 (file)
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lvds.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6U-811x Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
-
-       aliases {
-               display = &lvds0;
-               lvds0 = &lvds0;
-               lvds1 = &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
-                */
-               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>;
-       };
-};
-
-&kpp {
-       status = "disabled"; /* pad conflict with backlight1 PWM */
-};
-
-&ldb {
-       status = "okay";
-
-       lvds0: lvds-channel@0 {
-               fsl,data-mapping = "spwg";
-               fsl,data-width = <18>;
-               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>;
-                       };
-               };
-       };
-
-       lvds1: lvds-channel@1 {
-               fsl,data-mapping = "spwg";
-               fsl,data-width = <18>;
-               status = "disabled";
-
-               display-timings {
-                       native-mode = <&lvds_timing1>;
-                       lvds_timing1: 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";
 };
index c817324756e055aa16f22f193fee891190087f2c..e43ff12399bf0004e73811171e9690bc6305c635 100644 (file)
 /dts-v1/;
 #include "imx6dl.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lvds.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6U-81xx Module on MB7 baseboard";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
+};
 
-       aliases {
-               display = &lvds0;
-               lvds0 = &lvds0;
-               lvds1 = &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>;
-       };
+&backlight0 {
+       pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+       turn-on-delay-ms = <35>;
+};
 
-       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>;
-       };
+&backlight1 {
+       pwms = <&pwm1 0 500000 PWM_POLARITY_INVERTED>;
+       turn-on-delay-ms = <35>;
 };
 
 &can1 {
 &can2 {
        xceiver-supply = <&reg_3v3>;
 };
-
-&kpp {
-       status = "disabled"; /* pads partially clash with backlight1 PWM */
-};
-
-&ldb {
-       status = "okay";
-
-       lvds0: lvds-channel@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: lvds-channel@1 {
-               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>;
-                       };
-               };
-       };
-};
-
-&pwm1 {
-       status = "okay";
-};
index 71746edc2ee9218d21cd8a738188ff24370862b0..ac3050a835e5502bf24ed3f04dc6500003d534f8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-2017 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6Q-1010 Module on CoMpact TFT";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
+};
 
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 0>;
-               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>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&ET070001DM6>;
-
-                       ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
+&backlight {
+       pwms = <&pwm2 0 500000 0>;
+       /delete-property/ turn-on-delay-ms;
 };
 
 &can1 {
        xceiver-supply = <&reg_3v3>;
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &kpp {
        status = "disabled";
 };
 
+&lcd_panel {
+       compatible = "edt,etm0700g0edh6";
+};
+
 &reg_can_xcvr {
        status = "disabled";
 };
index 54bc442af8650cdfbdc489d461604dd895362bea..4ee860b626ff6842d23ee3971d1a85b21416f79c 100644 (file)
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6Q-1010/-1030 Module";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
-
-       aliases {
-               display = &display;
-       };
-
-       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>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               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>;
-                       };
-               };
-       };
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
+&ipu2 {
+       status = "disabled";
 };
index 959ff3fb7304e4c3aef373eb6801e54ddb086d90..a773f252816cb54091a60189be147c6d92616a03 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-2017 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6Q-1020 Module on CoMpact TFT";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
+};
 
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 0>;
-               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>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&ET070001DM6>;
-
-                       ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-       };
+&backlight {
+       pwms = <&pwm2 0 500000 0>;
+       /delete-property/ turn-on-delay-ms;
 };
 
 &can1 {
        status = "disabled";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &kpp {
        status = "disabled";
 };
 
+&lcd_panel {
+       compatible = "edt,etm0700g0edh6";
+};
+
 &reg_can_xcvr {
        status = "disabled";
 };
index b49133d25d80995e7a38d87195fc1c588c753efc..0a4daec8d3ad3abd733892febf7ab11029bc47ff 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-2017 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6Q-1020 Module";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
-
-       aliases {
-               display = &display;
-       };
-
-       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>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_1>;
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               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>;
-                       };
-               };
-       };
 };
 
 &ds1339 {
        status = "disabled";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
+&ipu2 {
+       status = "disabled";
 };
 
 &usdhc4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc4>;
        bus-width = <4>;
+       non-removable;
        no-1-8-v;
        fsl,wp-controller;
        status = "okay";
index 7c152e32758cbc63b634daa37b55c0c44a947d01..cb2fcb4896c6590efae1c8e411eca573426243aa 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>
+ * Copyright 2014-2017 Lothar Waßmann <LW@KARO-electronics.de>
  *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lcd.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6Q-1036 Module";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
-
-       aliases {
-               display = &display;
-       };
-
-       backlight: backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_lcd0_pwr>;
-               enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-               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>;
-       };
-
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;
-               interface-pix-fmt = "rgb24";
-               status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&vga>;
-
-                       vga: 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>;
-                       };
-               };
-       };
 };
 
 &ds1339 {
        status = "disabled";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &ipu2 {
        status = "disabled";
 };
 
-&reg_lcd0_pwr {
-       status = "disabled";
-};
-
 &usdhc4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc4>;
index 900557de84a4406a94e87497788b076bb99e6851..f7b0acb65352c3c3852c3e2ca7f70aef2a37a508 100644 (file)
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lvds.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6Q-1110/-1130 Module";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
-
-       aliases {
-               display = &lvds0;
-               lvds0 = &lvds0;
-               lvds1 = &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
-                */
-               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>;
-       };
 };
 
-&kpp {
-       status = "disabled"; /* pad conflict with backlight1 PWM */
-};
-
-&ldb {
-       status = "okay";
-
-       lvds0: lvds-channel@0 {
-               fsl,data-mapping = "spwg";
-               fsl,data-width = <18>;
-               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>;
-                       };
-               };
-       };
-
-       lvds1: lvds-channel@1 {
-               fsl,data-mapping = "spwg";
-               fsl,data-width = <18>;
-               status = "disabled";
-
-               display-timings {
-                       native-mode = <&lvds_timing1>;
-                       lvds_timing1: 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";
+&ipu2 {
+       status = "disabled";
 };
 
 &sata {
index be9233d6dff555576a219e23e8dad5ac0d4aedc9..9648c21dbdd0b3c190fb649d12558965ad0e16f0 100644 (file)
 /dts-v1/;
 #include "imx6q.dtsi"
 #include "imx6qdl-tx6.dtsi"
+#include "imx6qdl-tx6-lvds.dtsi"
 
 / {
        model = "Ka-Ro electronics TX6Q-1110/-1130 Module on MB7 baseboard";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
+};
 
-       aliases {
-               display = &lvds0;
-               lvds0 = &lvds0;
-               lvds1 = &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>;
-       };
+&backlight0 {
+       pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+       turn-on-delay-ms = <35>;
+       power-supply = <&reg_lcd1_pwr>;
+};
 
-       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>;
-       };
+&backlight1 {
+       pwms = <&pwm1 0 500000 PWM_POLARITY_INVERTED>;
+       turn-on-delay-ms = <35>;
+       power-supply = <&reg_lcd1_pwr>;
 };
 
 &can1 {
        status = "disabled";
 };
 
-&kpp {
-       status = "disabled"; /* pads partially clash with backlight1 PWM */
+&lvds0_panel {
+       compatible = "edt,et057090dhu";
 };
 
-&ldb {
-       status = "okay";
-
-       lvds0: lvds-channel@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: lvds-channel@1 {
-               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>;
-                       };
-               };
-       };
-};
-
-&pwm1 {
-       status = "okay";
+&lvds1_panel {
+       compatible = "edt,et057090dhu";
 };
 
 &sata {
diff --git a/arch/arm/boot/dts/imx6qdl-tx6-lcd.dtsi b/arch/arm/boot/dts/imx6qdl-tx6-lcd.dtsi
new file mode 100644 (file)
index 0000000..5102fc4
--- /dev/null
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2017 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/ {
+       aliases {
+               display = &display;
+       };
+
+       backlight: backlight {
+               compatible = "pwm-backlight";
+               pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_lcd1_pwr>;
+               enable-gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>;
+               power-supply = <&reg_3v3>;
+               turn-on-delay-ms = <35>;
+               /*
+                * 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>;
+       };
+
+       lcd_panel: lcd-panel {
+               compatible = "edt,etm0700g0dh6";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_lcd0_pwr>;
+               enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
+               power-supply = <&reg_3v3>;
+               backlight = <&backlight>;
+               bus-format-override = "rgb24";
+
+               port {
+                       lcd_panel_in: endpoint {
+                               remote-endpoint = <&lcd_out>;
+                       };
+               };
+       };
+
+       display: disp0 {
+               compatible = "fsl,imx-parallel-display";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_1>;
+               status = "okay";
+
+               port@0 {
+                       reg = <0>;
+
+                       lcd_in: endpoint {
+                               remote-endpoint = <&ipu1_di0_disp0>;
+                       };
+               };
+
+               port@1 {
+                       reg = <1>;
+
+                       lcd_out: endpoint {
+                               remote-endpoint = <&lcd_panel_in>;
+                       };
+               };
+
+               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 {
+                               u-boot,panel-name = "edt,et057090dhu";
+                               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 {
+                               u-boot,panel-name = "edt,et0350g0dh6";
+                               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 {
+                               u-boot,panel-name = "edt,et0430g0dh6";
+                               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 */
+                               u-boot,panel-name = "edt,etm0700g0dh6";
+                               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>;
+                       };
+
+                       CoMTFT { /* same as ET0700 but with inverted pixel clock */
+                               u-boot,panel-name = "edt,etm0700g0edh6";
+                               clock-frequency = <33264000>;
+                               hactive = <800>;
+                               vactive = <480>;
+                               hback-porch = <88>;
+                               hsync-len = <128>;
+                               hfront-porch = <40>;
+                               vback-porch = <33>;
+                               vsync-len = <2>;
+                               vfront-porch = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <1>;
+                       };
+               };
+       };
+};
+
+&ipu1_di0_disp0 {
+       remote-endpoint = <&lcd_in>;
+};
diff --git a/arch/arm/boot/dts/imx6qdl-tx6-lvds.dtsi b/arch/arm/boot/dts/imx6qdl-tx6-lvds.dtsi
new file mode 100644 (file)
index 0000000..2ca2eb3
--- /dev/null
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2017 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/ {
+       aliases {
+               display = &lvds0;
+               lvds0 = &lvds0;
+               lvds1 = &lvds1;
+       };
+
+       backlight0: backlight0 {
+               compatible = "pwm-backlight";
+               pwms = <&pwm2 0 500000 0>;
+               power-supply = <&reg_lcd0_pwr>;
+               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>;
+               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_panel: lvds0-panel {
+               compatible = "nlt,nl12880bc20-spwg-24";
+               backlight = <&backlight0>;
+               power-supply = <&reg_3v3>;
+
+               port {
+                       panel_in_lvds0: endpoint {
+                               remote-endpoint = <&lvds0_out>;
+                       };
+               };
+       };
+
+       lvds1_panel: lvds1-panel {
+               compatible = "nlt,nl12880bc20-spwg-24";
+               backlight = <&backlight1>;
+               power-supply = <&reg_3v3>;
+
+               port {
+                       panel_in_lvds1: endpoint {
+                               remote-endpoint = <&lvds1_out>;
+                       };
+               };
+       };
+};
+
+&kpp {
+       status = "disabled"; /* pad conflict with backlight1 PWM */
+};
+
+&ldb {
+       status = "okay";
+
+       lvds0: lvds-channel@0 {
+               fsl,data-width = <18>;
+               status = "okay";
+
+               port@4 {
+                       reg = <4>;
+
+                       lvds0_out: endpoint {
+                               remote-endpoint = <&panel_in_lvds0>;
+                       };
+               };
+
+               display-timings {
+                       hsd100pxn1 {
+                               u-boot,panel-name = "hannstar,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>;
+                       };
+
+                       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>;
+                       };
+
+                       nl12880bc20 {
+                               u-boot,panel-name = "nlt,nl12880bc20-spwg-24";
+                               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>;
+                       };
+
+                       ET0700 {
+                               u-boot,panel-name = "edt,etm0700g0dh6";
+                               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>;
+                       };
+
+                       ETV570 {
+                               u-boot,panel-name = "edt,et057090dhu";
+                               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>;
+                       };
+               };
+       };
+
+       lvds1: lvds-channel@1 {
+               fsl,data-width = <18>;
+               status = "okay";
+
+               port@4 {
+                       reg = <4>;
+
+                       lvds1_out: endpoint {
+                               remote-endpoint = <&panel_in_lvds1>;
+                       };
+               };
+
+               display-timings {
+                       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>;
+                       };
+
+                       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>;
+                       };
+
+                       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 {
+       status = "okay";
+};
+
+&reg_lcd0_pwr {
+       status = "okay";
+};
+
+&reg_lcd1_pwr {
+       status = "okay";
+};
index c1404020581c375e25f56467e14a13ce4a89a235..6e24ac97b94b1eb555f888f5467f6c7e2fb7cc6c 100644 (file)
                pinctrl-0 = <&pinctrl_lcd0_pwr>;
                gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
                enable-active-high;
-               regulator-boot-on;
+               status = "disabled";
        };
 
        reg_lcd1_pwr: regulator-lcd1-pwr {
                pinctrl-0 = <&pinctrl_lcd1_pwr>;
                gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
                enable-active-high;
-               regulator-boot-on;
+               status = "disabled";
        };
 
        reg_usbh1_vbus: regulator-usbh1-vbus {