ARM: dts: imx7-colibri: multiple node updates

1. Move u-boot specific nodes to u-boot dts include: legacy lcdif
node and aliases.
2. Add iomux configuration for LCD.
3. Drop un-needed u-boot,dm-pre-reloc for alias node.
4. Fix display-timings, use the one from Toradex downstream kernel [1]

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

diff --git a/arch/arm/dts/imx7-colibri-emmc.dts b/arch/arm/dts/imx7-colibri-emmc.dts
index bc0d10c716d369a61a644d3fde48768dfff3d991..8545498275e12b6818a7acb90e5f7d29b6bd47de 100644 (file)
--- a/arch/arm/dts/imx7-colibri-emmc.dts
+++ b/arch/arm/dts/imx7-colibri-emmc.dts
@@ -5,13 +5,13 @@
 
 /dts-v1/;
 #include "imx7-colibri.dtsi"
+#include "imx7-colibri-u-boot.dtsi"
 
 / {
        model = "Toradex Colibri iMX7D 1GB (eMMC)";
        compatible = "toradex,imx7d-colibri-emmc", "fsl,imx7d";
 
        aliases {
-               u-boot,dm-pre-reloc;
                mmc0 = &usdhc3;
                mmc1 = &usdhc1;
                display1 = &lcdif;

diff --git a/arch/arm/dts/imx7-colibri-rawnand.dts b/arch/arm/dts/imx7-colibri-rawnand.dts
index 5f12a2ac2a3be9ea7fdae48e5b6370790f8043bc..5211fb1f44f96e57627a184dffae8b809524bb04 100644 (file)
--- a/arch/arm/dts/imx7-colibri-rawnand.dts
+++ b/arch/arm/dts/imx7-colibri-rawnand.dts
@@ -5,19 +5,21 @@
 
 /dts-v1/;
 #include "imx7-colibri.dtsi"
+#include "imx7-colibri-u-boot.dtsi"
 
 / {
        model = "Toradex Colibri iMX7S/D";
        compatible = "toradex,imx7-colibri", "fsl,imx7";
 
-       chosen {
-               stdout-path = &uart1;
-       };
-
        aliases {
+               display1 = &lcdif;
                usb0 = &usbotg1; /* required for ums */
        };
 
+       chosen {
+               stdout-path = &uart1;
+       };
+
        reg_5v0: regulator-5v0 {
                compatible = "regulator-fixed";
                regulator-name = "5V";

diff --git a/arch/arm/dts/imx7-colibri-u-boot.dtsi b/arch/arm/dts/imx7-colibri-u-boot.dtsi
new file mode 100644 (file)
index 0000000..9138647
--- /dev/null
+++ b/arch/arm/dts/imx7-colibri-u-boot.dtsi
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Copyright 2020 Toradex
+ */
+
+&lcdif {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_lcdif_dat
+                    &pinctrl_lcdif_ctrl>;
+       display = <&display0>;
+       u-boot,dm-pre-reloc;
+
+       display0: display0 {
+               bits-per-pixel = <18>;
+               bus-width = <18>;
+               status = "okay";
+
+               display-timings {
+                       native-mode = <&timing_vga>;
+                       timing_vga: 640x480 {
+                               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/imx7-colibri.dtsi b/arch/arm/dts/imx7-colibri.dtsi
index ec95f22a0c38b31a172ed6bf81a4580e6f12f8c8..b352036e304f9df627de5d228e5d3b5d14de1eea 100644 (file)
--- a/arch/arm/dts/imx7-colibri.dtsi
+++ b/arch/arm/dts/imx7-colibri.dtsi
@@ -172,6 +172,38 @@
                >;
        };
 
+       pinctrl_lcdif_dat: lcdif-dat-grp {
+               fsl,pins = <
+                       MX7D_PAD_LCD_DATA00__LCD_DATA0          0x79
+                       MX7D_PAD_LCD_DATA01__LCD_DATA1          0x79
+                       MX7D_PAD_LCD_DATA02__LCD_DATA2          0x79
+                       MX7D_PAD_LCD_DATA03__LCD_DATA3          0x79
+                       MX7D_PAD_LCD_DATA04__LCD_DATA4          0x79
+                       MX7D_PAD_LCD_DATA05__LCD_DATA5          0x79
+                       MX7D_PAD_LCD_DATA06__LCD_DATA6          0x79
+                       MX7D_PAD_LCD_DATA07__LCD_DATA7          0x79
+                       MX7D_PAD_LCD_DATA08__LCD_DATA8          0x79
+                       MX7D_PAD_LCD_DATA09__LCD_DATA9          0x79
+                       MX7D_PAD_LCD_DATA10__LCD_DATA10         0x79
+                       MX7D_PAD_LCD_DATA11__LCD_DATA11         0x79
+                       MX7D_PAD_LCD_DATA12__LCD_DATA12         0x79
+                       MX7D_PAD_LCD_DATA13__LCD_DATA13         0x79
+                       MX7D_PAD_LCD_DATA14__LCD_DATA14         0x79
+                       MX7D_PAD_LCD_DATA15__LCD_DATA15         0x79
+                       MX7D_PAD_LCD_DATA16__LCD_DATA16         0x79
+                       MX7D_PAD_LCD_DATA17__LCD_DATA17         0x79
+               >;
+       };
+
+       pinctrl_lcdif_ctrl: lcdif-ctrl-grp {
+               fsl,pins = <
+                       MX7D_PAD_LCD_CLK__LCD_CLK               0x79
+                       MX7D_PAD_LCD_ENABLE__LCD_ENABLE         0x79
+                       MX7D_PAD_LCD_VSYNC__LCD_VSYNC           0x79
+                       MX7D_PAD_LCD_HSYNC__LCD_HSYNC           0x79
+               >;
+       };
+
        pinctrl_enet1: enet1grp {
                fsl,pins = <
                        MX7D_PAD_ENET1_CRS__GPIO7_IO14                  0x14
@@ -227,36 +259,3 @@
                >;
        };
 };
-
-&lcdif {
-       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>;
-                       };
-               };
-       };
-};

diff --git a/board/toradex/colibri_imx7/MAINTAINERS b/board/toradex/colibri_imx7/MAINTAINERS
index 82246be16036dcd6e4039a6072ff2d4c26ac0adb..61a504487a3af0edd73a33e8e3c681f9fdf9a3c4 100644 (file)
--- a/board/toradex/colibri_imx7/MAINTAINERS
+++ b/board/toradex/colibri_imx7/MAINTAINERS
@@ -9,5 +9,6 @@ F:      include/configs/colibri_imx7.h
 F:     configs/colibri_imx7_defconfig
 F:     configs/colibri_imx7_emmc_defconfig
 F:     arch/arm/dts/imx7-colibri.dtsi
+F:     arch/arm/dts/imx7-colibri-u-boot.dtsi
 F:     arch/arm/dts/imx7-colibri-emmc.dts
 F:     arch/arm/dts/imx7-colibri-rawnand.dts