ARM: dts: imx6-tx6: move display configuration to .dtsi file

[karo-tx-linux.git] / arch / arm / boot / dts / imx6q-tx6q-11x0-mb7.dts

diff --git a/arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts b/arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts
index be9233d6dff555576a219e23e8dad5ac0d4aedc9..9648c21dbdd0b3c190fb649d12558965ad0e16f0 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts
@@ -42,60 +42,23 @@
 /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 {
@@ -110,132 +73,12 @@
        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 {