ARM: dts: imx6ull-colibri: move u-boot specific node

1. Move aliases and legacy lcdif node to the u-boot specific dts include.
2. Provide proper display timings, as in the downstream Toradex kernel
[1].

[1]: https://git.toradex.com/cgit/linux-toradex.git/tree/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi?h=toradex_4.9-2.3.x-imx#n183
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>

diff --git a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi
index 531cdcc4da4b680c920c603c167f201814017bf6..afdb0f43cf0ddab5e62d307229adc3add7318f63 100644 (file)
--- a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi
+++ b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi
@@ -3,6 +3,15 @@
  * Copyright 2019 Toradex AG
  */
 
+/ {
+       aliases {
+               u-boot,dm-pre-reloc;
+               mmc0 = &usdhc1;
+               usb0 = &usbotg1; /* required for ums */
+               display0 = &lcdif;
+       };
+};
+
 &pinctrl_uart1 {
        u-boot,dm-pre-reloc;
 };
@@ -10,3 +19,39 @@
 &pinctrl_uart1_ctrl1 {
        u-boot,dm-pre-reloc;
 };
+
+&lcdif {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_lcdif_dat
+                    &pinctrl_lcdif_ctrl>;
+       status = "okay";
+       display = <&display0>;
+       u-boot,dm-pre-reloc;
+
+       display0: display0 {
+               bits-per-pixel = <18>;
+               bus-width = <24>;
+               status = "okay";
+
+               display-timings {
+                       native-mode = <&timing_vga>;
+                       timing_vga: 640x480 {
+                               u-boot,dm-pre-reloc;
+                               clock-frequency = <25175000>;
+                               hactive = <640>;
+                               vactive = <480>;
+                               hback-porch = <40>;
+                               hfront-porch = <24>;
+                               vback-porch = <32>;
+                               vfront-porch = <11>;
+                               hsync-len = <96>;
+                               vsync-len = <2>;
+
+                               de-active = <1>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               pixelclk-active = <0>;
+                       };
+               };
+       };
+};

diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi
index fca53119fe7914d0b7ad356a41afcb7f03816c6c..b7bf79f28cb68963facaa00cfd9331f1015024f6 100644 (file)
--- a/arch/arm/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/dts/imx6ull-colibri.dtsi
@@ -8,13 +8,6 @@
 #include "imx6ull.dtsi"
 
 / {
-       aliases {
-               u-boot,dm-pre-reloc;
-               mmc0 = &usdhc1;
-               usb0 = &usbotg1; /* required for ums */
-               display0 = &lcdif;
-       };
-
        chosen {
                stdout-path = &uart1;
        };
@@ -151,42 +144,6 @@
        };
 };
 
-&lcdif {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lcdif_dat
-                    &pinctrl_lcdif_ctrl>;
-       status = "okay";
-       display = <&display0>;
-       u-boot,dm-pre-reloc;
-
-       display0: display0 {
-               bits-per-pixel = <18>;
-               bus-width = <24>;
-               status = "okay";
-
-               display-timings {
-                       native-mode = <&timing_vga>;
-                       timing_vga: 640x480 {
-                               u-boot,dm-pre-reloc;
-                               clock-frequency = <25175000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hfront-porch = <16>;
-                               vback-porch = <33>;
-                               vfront-porch = <10>;
-                               hsync-len = <96>;
-                               vsync-len = <2>;
-
-                               de-active = <1>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               pixelclk-active = <0>;
-                       };
-               };
-       };
-};
-
 /* PWM <A> */
 &pwm4 {
        pinctrl-names = "default";