]> git.kernelconcepts.de Git - karo-tx-linux.git/blobdiff - arch/arm/boot/dts/imx53-tx53-x03x.dts
projects / karo-tx-linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
[karo-tx-linux.git] / arch / arm / boot / dts / imx53-tx53-x03x.dts
diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts
index 13e842b0c7857b1050c73319842113d6bf08dbb3..b654780f66038957928920299b97db5309bd39e5 100644 (file)
--- a/arch/arm/boot/dts/imx53-tx53-x03x.dts
+++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts
@@ -23,132 +23,131 @@
                display = &display;
        };
 
-       soc {
-               display: display@di0 {
-                       compatible = "fsl,imx-parallel-display";
-                       interface-pix-fmt = "rgb24";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_rgb24_vga1>;
-                       status = "okay";
+       display: display@di0 {
+               compatible = "fsl,imx-parallel-display";
+               interface-pix-fmt = "rgb24";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_rgb24_vga1>;
+               fsl,panel = <&lcd>;
+               status = "okay";
 
-                       port {
-                               display0_in: endpoint {
-                                       remote-endpoint = <&ipu_di0_disp0>;
-                               };
+               port {
+                       display0_in: endpoint {
+                               remote-endpoint = <&ipu_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>;
-                               };
+               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>;
-                               };
+                       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>;
-                               };
+                       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>;
-                               };
+                       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>;
-                               };
+                       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>;
-                               };
+                       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>;
-                               };
+                       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>;
                        };
                };
        };
@@ -156,7 +155,7 @@
        backlight: backlight {
                compatible = "pwm-backlight";
                pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
-               power-supply = <&reg_3v3>;
+               power-supply = <&reg_lcd_pwr>;
                brightness-levels = <
                          0  1  2  3  4  5  6  7  8  9
                         10 11 12 13 14 15 16 17 18 19
@@ -173,6 +172,14 @@
                default-brightness-level = <50>;
        };
 
+       lcd: panel {
+               compatible = "simple-panel";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_lcd_reset>;
+               enable-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
+               backlight = <&backlight>;
+       };
+
        regulators {
                reg_lcd_pwr: regulator@5 {
                        compatible = "regulator-fixed";
@@ -181,19 +188,9 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_lcd_pwr>;
                        enable-active-high;
-                       regulator-boot-on;
-               };
-
-               reg_lcd_reset: regulator@6 {
-                       compatible = "regulator-fixed";
-                       reg = <6>;
-                       regulator-name = "LCD RESET";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       regulator-boot-on;
                };
        };
 };
@@ -258,6 +255,18 @@
                        >;
                };
 
+               pinctrl_lcd_reset: lcd-resetgrp {
+                       fsl,pins = <
+                               MX53_PAD_EIM_D29__GPIO3_29 0x1f0 /* LCD reset */
+                       >;
+               };
+
+               pinctrl_lcd_pwr: lcd-pwrgrp {
+                       fsl,pins = <
+                               MX53_PAD_EIM_EB3__GPIO2_31 0x1f0 /* LCD enable */
+                       >;
+               };
+
                pinctrl_rgb24_vga1: rgb24-vgagrp1 {
                        fsl,pins = <
                                MX53_PAD_DI0_DISP_CLK__IPU_DI0_DISP_CLK         0x5
Linux kernel for KaRo TX COM modules