MLK-18155-1 dts: mx6ulevk: Update DTS for i.MX6UL EVK boards
authorYe Li <ye.li@nxp.com>
Wed, 15 Apr 2020 08:39:03 +0000 (01:39 -0700)
committerYe Li <ye.li@nxp.com>
Thu, 29 Apr 2021 07:56:01 +0000 (00:56 -0700)
Update iMX6UL EVK DTS file to align with v5.4 kernel. And add DTS
for eMMC and NAND.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 21fcfc54e7cad149cbefbec8095112983e766d29)

arch/arm/dts/Makefile
arch/arm/dts/imx6ul-14x14-evk-emmc.dts [new file with mode: 0644]
arch/arm/dts/imx6ul-14x14-evk-gpmi-weim.dts [new file with mode: 0644]
arch/arm/dts/imx6ul-14x14-evk.dtsi
arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi
arch/arm/dts/imx6ul-9x9-evk.dts

index 748d3cd..fee2468 100644 (file)
@@ -751,7 +751,8 @@ dtb-$(CONFIG_MX6UL) += \
        imx6ul-isiot-nand.dtb \
        imx6ul-opos6uldev.dtb \
        imx6ul-14x14-evk.dtb \
-       imx6ul-9x9-evk.dtb \
+       imx6ul-14x14-evk-emmc.dtb \
+       imx6ul-14x14-evk-gpmi-weim.dtb \
        imx6ul-9x9-evk.dtb \
        imx6ul-liteboard.dtb \
        imx6ul-phytec-segin-ff-rdk-nand.dtb \
diff --git a/arch/arm/dts/imx6ul-14x14-evk-emmc.dts b/arch/arm/dts/imx6ul-14x14-evk-emmc.dts
new file mode 100644 (file)
index 0000000..bc4e53f
--- /dev/null
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2019 NXP
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ */
+
+#include "imx6ul-14x14-evk.dts"
+
+&usdhc2 {
+       pinctrl-names = "default", "state_100mhz", "state_200mhz";
+       pinctrl-0 = <&pinctrl_usdhc2_8bit>;
+       pinctrl-1 = <&pinctrl_usdhc2_8bit_100mhz>;
+       pinctrl-2 = <&pinctrl_usdhc2_8bit_200mhz>;
+       bus-width = <8>;
+       non-removable;
+       status = "okay";
+};
+
diff --git a/arch/arm/dts/imx6ul-14x14-evk-gpmi-weim.dts b/arch/arm/dts/imx6ul-14x14-evk-gpmi-weim.dts
new file mode 100644 (file)
index 0000000..b7fe014
--- /dev/null
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2015 Freescale Semiconductor, Inc.
+
+#include "imx6ul-14x14-evk.dts"
+
+&gpmi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gpmi_nand_1>;
+       status = "okay";
+       nand-on-flash-bbt;
+};
+
+&iomuxc {
+       pinctrl_gpmi_nand_1: gpmi-nand-1 {
+               fsl,pins = <
+                       MX6UL_PAD_NAND_CLE__RAWNAND_CLE         0xb0b1
+                       MX6UL_PAD_NAND_ALE__RAWNAND_ALE         0xb0b1
+                       MX6UL_PAD_NAND_WP_B__RAWNAND_WP_B       0xb0b1
+                       MX6UL_PAD_NAND_READY_B__RAWNAND_READY_B 0xb000
+                       MX6UL_PAD_NAND_CE0_B__RAWNAND_CE0_B     0xb0b1
+                       MX6UL_PAD_NAND_CE1_B__RAWNAND_CE1_B     0xb0b1
+                       MX6UL_PAD_NAND_RE_B__RAWNAND_RE_B       0xb0b1
+                       MX6UL_PAD_NAND_WE_B__RAWNAND_WE_B       0xb0b1
+                       MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00   0xb0b1
+                       MX6UL_PAD_NAND_DATA01__RAWNAND_DATA01   0xb0b1
+                       MX6UL_PAD_NAND_DATA02__RAWNAND_DATA02   0xb0b1
+                       MX6UL_PAD_NAND_DATA03__RAWNAND_DATA03   0xb0b1
+                       MX6UL_PAD_NAND_DATA04__RAWNAND_DATA04   0xb0b1
+                       MX6UL_PAD_NAND_DATA05__RAWNAND_DATA05   0xb0b1
+                       MX6UL_PAD_NAND_DATA06__RAWNAND_DATA06   0xb0b1
+                       MX6UL_PAD_NAND_DATA07__RAWNAND_DATA07   0xb0b1
+               >;
+       };
+};
+
+&qspi {
+       status = "disabled";
+};
+
+&usdhc2 {
+       status = "disabled";
+};
index 463d7ca..34e07a0 100644 (file)
@@ -31,6 +31,7 @@
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
                gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+               off-on-delay-us = <20000>;
                enable-active-high;
        };
 
@@ -47,6 +48,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_spi4>;
                status = "okay";
+               pinctrl-assert-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>;
                gpio-sck = <&gpio5 11 0>;
                gpio-mosi = <&gpio5 10 0>;
                cs-gpios = <&gpio5 7 0>;
@@ -60,6 +62,7 @@
                        #gpio-cells = <2>;
                        reg = <0>;
                        registers-number = <1>;
+                       registers-default = /bits/ 8 <0x57>;
                        spi-max-frequency = <100000>;
                };
        };
@@ -82,7 +85,7 @@
 };
 
 &i2c2 {
-       clock_frequency = <100000>;
+       clock-frequency = <100000>;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_i2c2>;
        status = "okay";
        flash0: n25q256a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "micron,n25q256a";
+               compatible = "micron,n25q256a", "jedec,spi-nor";
                spi-max-frequency = <29000000>;
-               spi-rx-bus-width = <4>;
-               spi-tx-bus-width = <4>;
                reg = <0>;
        };
 };
 
 &usbotg1 {
        dr_mode = "otg";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usb_otg1>;
        status = "okay";
 };
 
                >;
        };
 
+       pinctrl_usb_otg1: usbotg1grp {
+               fsl,pins = <
+                       MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID    0x17059
+               >;
+       };
+
        pinctrl_usdhc1: usdhc1grp {
                fsl,pins = <
                        MX6UL_PAD_SD1_CMD__USDHC1_CMD           0x17059
-                       MX6UL_PAD_SD1_CLK__USDHC1_CLK           0x10059
+                       MX6UL_PAD_SD1_CLK__USDHC1_CLK           0x10071
                        MX6UL_PAD_SD1_DATA0__USDHC1_DATA0       0x17059
                        MX6UL_PAD_SD1_DATA1__USDHC1_DATA1       0x17059
                        MX6UL_PAD_SD1_DATA2__USDHC1_DATA2       0x17059
                >;
        };
 
+       pinctrl_usdhc2_8bit: usdhc2grp_8bit {
+               fsl,pins = <
+                       MX6UL_PAD_NAND_RE_B__USDHC2_CLK     0x10069
+                       MX6UL_PAD_NAND_WE_B__USDHC2_CMD     0x17059
+                       MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059
+                       MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059
+                       MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059
+                       MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059
+                       MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059
+                       MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059
+                       MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059
+                       MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059
+               >;
+       };
+
+       pinctrl_usdhc2_8bit_100mhz: usdhc2grp_8bit_100mhz {
+               fsl,pins = <
+                       MX6UL_PAD_NAND_RE_B__USDHC2_CLK     0x100b9
+                       MX6UL_PAD_NAND_WE_B__USDHC2_CMD     0x170b9
+                       MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x170b9
+                       MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x170b9
+                       MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x170b9
+                       MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x170b9
+                       MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x170b9
+                       MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x170b9
+                       MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x170b9
+                       MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x170b9
+               >;
+       };
+
+       pinctrl_usdhc2_8bit_200mhz: usdhc2grp_8bit_200mhz {
+               fsl,pins = <
+                       MX6UL_PAD_NAND_RE_B__USDHC2_CLK     0x100f9
+                       MX6UL_PAD_NAND_WE_B__USDHC2_CMD     0x170f9
+                       MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x170f9
+                       MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x170f9
+                       MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x170f9
+                       MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x170f9
+                       MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x170f9
+                       MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x170f9
+                       MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x170f9
+                       MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x170f9
+               >;
+       };
+
        pinctrl_wdog: wdoggrp {
                fsl,pins = <
                        MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY    0x30b0
index 77cb461..4a8311d 100644 (file)
@@ -3,8 +3,29 @@
  * Copyright 2018 NXP
  */
 
+&{/aliases} {
+       u-boot,dm-pre-reloc;
+       display0 = &lcdif;
+};
+
 &qspi {
        flash0: n25q256a@0 {
                compatible = "jedec,spi-nor";
        };
-};
\ No newline at end of file
+};
+
+&{/soc} {
+       u-boot,dm-pre-reloc;
+};
+
+&aips2 {
+       u-boot,dm-pre-reloc;
+};
+
+&iomuxc {
+       u-boot,dm-pre-reloc;
+};
+
+&lcdif {
+       u-boot,dm-pre-reloc;
+};
index 2270451..576eb08 100644 (file)
@@ -9,7 +9,7 @@
 #include "imx6ul.dtsi"
 
 / {
-       model = "Freescale i.MX6 UltraLite 9x9 EVK Board";
+       model = "i.MX6 UltraLite 9x9 EVK Board";
        compatible = "fsl,imx6ul-9x9-evk", "fsl,imx6ul";
 
        aliases {
@@ -56,7 +56,7 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-                       off-on-delay = <20000>;
+                       off-on-delay-us = <20000>;
                        enable-active-high;
                };
        };
        sda-gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
        status = "okay";
 
-       pmic: pfuze3000@08 {
+       pmic: pfuze3000@8 {
                compatible = "fsl,pfuze3000";
                reg = <0x08>;
 
                };
        };
 
-       mag3110@0e {
+       mag3110@e {
                compatible = "fsl,mag3110";
                reg = <0x0e>;
                position = <2>;
                        >;
                };
 
+               pinctrl_lcdif_ctrl: lcdifctrlgrp {
+                       fsl,pins = <
+                               MX6UL_PAD_LCD_CLK__LCDIF_CLK        0x79
+                               MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE  0x79
+                               MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC    0x79
+                               MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC    0x79
+                               /* used for lcd reset */
+                               MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09  0x79
+                       >;
+               };
+
+               pinctrl_lcdif_dat: lcdifdatgrp {
+                       fsl,pins = <
+                               MX6UL_PAD_LCD_DATA00__LCDIF_DATA00  0x79
+                               MX6UL_PAD_LCD_DATA01__LCDIF_DATA01  0x79
+                               MX6UL_PAD_LCD_DATA02__LCDIF_DATA02  0x79
+                               MX6UL_PAD_LCD_DATA03__LCDIF_DATA03  0x79
+                               MX6UL_PAD_LCD_DATA04__LCDIF_DATA04  0x79
+                               MX6UL_PAD_LCD_DATA05__LCDIF_DATA05  0x79
+                               MX6UL_PAD_LCD_DATA06__LCDIF_DATA06  0x79
+                               MX6UL_PAD_LCD_DATA07__LCDIF_DATA07  0x79
+                               MX6UL_PAD_LCD_DATA08__LCDIF_DATA08  0x79
+                               MX6UL_PAD_LCD_DATA09__LCDIF_DATA09  0x79
+                               MX6UL_PAD_LCD_DATA10__LCDIF_DATA10  0x79
+                               MX6UL_PAD_LCD_DATA11__LCDIF_DATA11  0x79
+                               MX6UL_PAD_LCD_DATA12__LCDIF_DATA12  0x79
+                               MX6UL_PAD_LCD_DATA13__LCDIF_DATA13  0x79
+                               MX6UL_PAD_LCD_DATA14__LCDIF_DATA14  0x79
+                               MX6UL_PAD_LCD_DATA15__LCDIF_DATA15  0x79
+                               MX6UL_PAD_LCD_DATA16__LCDIF_DATA16  0x79
+                               MX6UL_PAD_LCD_DATA17__LCDIF_DATA17  0x79
+                               MX6UL_PAD_LCD_DATA18__LCDIF_DATA18  0x79
+                               MX6UL_PAD_LCD_DATA19__LCDIF_DATA19  0x79
+                               MX6UL_PAD_LCD_DATA20__LCDIF_DATA20  0x79
+                               MX6UL_PAD_LCD_DATA21__LCDIF_DATA21  0x79
+                               MX6UL_PAD_LCD_DATA22__LCDIF_DATA22  0x79
+                               MX6UL_PAD_LCD_DATA23__LCDIF_DATA23  0x79
+                       >;
+               };
+
                pinctrl_qspi: qspigrp {
                        fsl,pins = <
                                MX6UL_PAD_NAND_WP_B__QSPI_A_SCLK      0x70a1
        };
 };
 
+
+&lcdif {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_lcdif_dat
+                    &pinctrl_lcdif_ctrl>;
+
+       display = <&display0>;
+       status = "okay";
+
+       display0: display {
+               bits-per-pixel = <16>;
+               bus-width = <24>;
+
+               display-timings {
+                       native-mode = <&timing0>;
+                       timing0: timing0 {
+                       clock-frequency = <9200000>;
+                       hactive = <480>;
+                       vactive = <272>;
+                       hfront-porch = <8>;
+                       hback-porch = <4>;
+                       hsync-len = <41>;
+                       vback-porch = <2>;
+                       vfront-porch = <4>;
+                       vsync-len = <10>;
+
+                       hsync-active = <0>;
+                       vsync-active = <0>;
+                       de-active = <1>;
+                       pixelclk-active = <0>;
+                       };
+               };
+       };
+};
+
 &qspi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_qspi>;