Skip to content

Commit

Permalink
Merge tag 'u-boot-imx-20210616' of https://gitlab.denx.de/u-boot/cust…
Browse files Browse the repository at this point in the history
…odians/u-boot-imx

u-boot-imx-20210616
-------------------

- imxrt : fixes, USB, imxrt1020-evk
- imx8m:
	fix for verdin-imx8mm
	Add conga-QMX8 board
- imx6 :
	documentation for pico-imx6:
	Add SeeedStudio NPI-IMX6ULL Support
	ventana: DM PCI
- imx7d:
	added SMEGW01 board

CI : https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/7765
  • Loading branch information
trini committed Jun 16, 2021
2 parents 9301a5c + 40496ac commit b2c4b7f
Show file tree
Hide file tree
Showing 94 changed files with 4,448 additions and 208 deletions.
12 changes: 12 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,18 @@ S: Orphaned (Since 2017-01)
T: git https://source.denx.de/u-boot/custodians/u-boot-onenand.git
F: drivers/mtd/onenand/

OUT4-IMX6ULL-NANO BOARD
M: Oleh Kravchenko <[email protected]>
S: Maintained
T: git https://github.com/Oleh-Kravchenko/u-boot-out4.git
F: arch/arm/dts/ev-imx280-nano-x-mb.dts
F: arch/arm/dts/o4-imx-nano.dts
F: arch/arm/dts/o4-imx6ull-nano.dtsi
F: board/out4
F: configs/ev-imx280-nano-x-mb_defconfig
F: configs/o4-imx6ull-nano_defconfig
F: include/configs/o4-imx6ull-nano.h

PATMAN
M: Simon Glass <[email protected]>
S: Maintained
Expand Down
1 change: 1 addition & 0 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2008,6 +2008,7 @@ source "board/hisilicon/poplar/Kconfig"
source "board/isee/igep003x/Kconfig"
source "board/kontron/sl28/Kconfig"
source "board/myir/mys_6ulx/Kconfig"
source "board/seeed/npi_imx6ull/Kconfig"
source "board/spear/spear300/Kconfig"
source "board/spear/spear310/Kconfig"
source "board/spear/spear320/Kconfig"
Expand Down
12 changes: 10 additions & 2 deletions arch/arm/dts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,7 @@ dtb-$(CONFIG_MX6ULL) += \
imx6ull-14x14-evk.dtb \
imx6ull-colibri.dtb \
imx6ull-myir-mys-6ulx-eval.dtb \
imx6ull-seeed-npi-imx6ull-dev-board.dtb \
imx6ull-phytec-segin-ff-rdk-emmc.dtb \
imx6ull-dart-6ul.dtb \
imx6ull-somlabs-visionsom.dtb \
Expand All @@ -819,6 +820,12 @@ dtb-$(CONFIG_ARCH_MX6) += \
imx6-apalis.dtb \
imx6-colibri.dtb

dtb-$(CONFIG_O4_IMX_NANO) += \
o4-imx-nano.dtb

dtb-$(CONFIG_EV_IMX280_NANO_X_MB) += \
ev-imx280-nano-x-mb.dtb

dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \
imx7d-sdb-qspi.dtb \
imx7-cm.dtb \
Expand All @@ -827,15 +834,16 @@ dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \
imx7s-warp.dtb \
imx7d-meerkat96.dtb \
imx7d-pico-pi.dtb \
imx7d-pico-hobbit.dtb

imx7d-pico-hobbit.dtb \
imx7d-smegw01.dtb

dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-com.dtb \
imx7ulp-evk.dtb

dtb-$(CONFIG_ARCH_IMX8) += \
fsl-imx8qm-apalis.dtb \
fsl-imx8qm-mek.dtb \
imx8qm-cgtqmx8.dtb \
imx8qm-rom7720-a1.dtb \
fsl-imx8qxp-ai_ml.dtb \
fsl-imx8qxp-colibri.dtb \
Expand Down
109 changes: 109 additions & 0 deletions arch/arm/dts/ev-imx280-nano-x-mb.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
// SPDX-License-Identifier: GPL-2.0+
// Copyright (C) 2021 Oleh Kravchenko <[email protected]>

/dts-v1/;

#include "o4-imx6ull-nano.dtsi"

/ {
model = "EV-iMX280-NANO-X-MB";
compatible = "evodbg,ev-imx280-nano-x-mb",
"out4,o4-imx6ull-nano",
"fsl,imx6ull";

aliases {
mmc1 = &usdhc1;
};

chosen {
stdout-path = &uart1;
};
};

&iomuxc {
pinctrl_uart1: uart1grp {
fsl,pins = <
MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
>;
};

pinctrl_usdhc1: usdhc1grp {
fsl,pins = <
MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10069
MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059
MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059
MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059
MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059
MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059
MX6UL_PAD_UART1_RTS_B__USDHC1_CD_B 0x03029
>;
};

pinctrl_mdio: mdiogrp {
fsl,pins = <
MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x1b0b0
MX6UL_PAD_GPIO1_IO07__ENET1_MDC 0x1b0b0
MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0xb0b0 /* RST */
>;
};

pinctrl_usb_otg1_id: usbotg1idgrp {
fsl,pins = <
MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID 0x17059
>;
};
};

&uart1 {
pinctrl-0 = <&pinctrl_uart1>;
pinctrl-names = "default";
status = "okay";
};

&usdhc1 {
bus-width = <4>;
no-1-8-v;
pinctrl-0 = <&pinctrl_usdhc1>;
pinctrl-names = "default";
status = "okay";
wakeup-source;
};

&fec1 {
phy-handle = <&phy0>;
phy-mode = "rmii";
phy-reset-duration = <250>;
phy-reset-post-delay = <100>;
phy-reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&pinctrl_fec1 &pinctrl_mdio>;
pinctrl-names = "default";
status = "okay";

mdio {
#address-cells = <1>;
#size-cells = <0>;

phy0: ethernet-phy@0 {
clocks = <&clks IMX6UL_CLK_ENET_REF>;
clock-names = "rmii-ref";
interrupt-parent = <&gpio5>;
interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
pinctrl-0 = <&pinctrl_phy0_irq>;
pinctrl-names = "default";
reg = <0>;
};
};
};

&usbotg1 {
dr_mode = "otg";
pinctrl-0 = <&pinctrl_usb_otg1_id>;
pinctrl-names = "default";
status = "okay";
};

&usbotg2 {
dr_mode = "host";
status = "okay";
};
2 changes: 2 additions & 0 deletions arch/arm/dts/imx6qdl-gw51xx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id";
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
phy-reset-duration = <10>;
phy-reset-post-delay = <100>;
status = "okay";
};

Expand Down
2 changes: 2 additions & 0 deletions arch/arm/dts/imx6qdl-gw52xx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id";
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
phy-reset-duration = <10>;
phy-reset-post-delay = <100>;
status = "okay";
};

Expand Down
3 changes: 3 additions & 0 deletions arch/arm/dts/imx6qdl-gw53xx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id";
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
phy-reset-duration = <10>;
phy-reset-post-delay = <100>;
status = "okay";
};

Expand Down Expand Up @@ -597,6 +599,7 @@
MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x1b0b0
>;
};

Expand Down
3 changes: 3 additions & 0 deletions arch/arm/dts/imx6qdl-gw54xx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id";
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
phy-reset-duration = <10>;
phy-reset-post-delay = <100>;
status = "okay";
};

Expand Down Expand Up @@ -675,6 +677,7 @@
MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x1b0b0
>;
};

Expand Down
2 changes: 2 additions & 0 deletions arch/arm/dts/imx6qdl-gw560x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,8 @@
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id";
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
phy-reset-duration = <10>;
phy-reset-post-delay = <100>;
status = "okay";
};

Expand Down
3 changes: 3 additions & 0 deletions arch/arm/dts/imx6qdl-gw5903.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id";
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
phy-reset-duration = <10>;
phy-reset-post-delay = <100>;
status = "okay";
};

Expand Down
3 changes: 3 additions & 0 deletions arch/arm/dts/imx6qdl-gw5904.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,9 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id";
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
phy-reset-duration = <10>;
phy-reset-post-delay = <100>;
status = "okay";

fixed-link {
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/dts/imx6qdl-gw5907.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id";
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
phy-reset-duration = <10>;
phy-reset-post-delay = <100>;
status = "okay";
};

Expand Down
3 changes: 3 additions & 0 deletions arch/arm/dts/imx6qdl-gw5910.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id";
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
phy-reset-duration = <10>;
phy-reset-post-delay = <100>;
status = "okay";
};

Expand Down
4 changes: 4 additions & 0 deletions arch/arm/dts/imx6qdl-gw5912.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id";
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
phy-reset-duration = <10>;
phy-reset-post-delay = <100>;
status = "okay";
};

Expand Down Expand Up @@ -426,6 +429,7 @@
MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x1b0b0
>;
};

Expand Down
3 changes: 3 additions & 0 deletions arch/arm/dts/imx6qdl-gw5913.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii-id";
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
phy-reset-duration = <10>;
phy-reset-post-delay = <100>;
status = "okay";
};

Expand Down
19 changes: 19 additions & 0 deletions arch/arm/dts/imx6ull-seeed-npi-imx6ull-dev-board.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (c) 2021 Linumiz
* Author: Navin Sankar Velliangiri <[email protected]>
*/

/dts-v1/;
#include "imx6ull.dtsi"
#include "imx6ull-seeed-npi-imx6ull.dtsi"
#include "imx6ull-seeed-npi-imx6ull-u-boot.dtsi"

/ {
model = "Seeed NPi iMX6ULL Dev Board with NAND";
compatible = "seeed,imx6ull-seeed-npi-imx6ull", "fsl,imx6ull";
};

&gpmi {
status = "okay";
};
24 changes: 24 additions & 0 deletions arch/arm/dts/imx6ull-seeed-npi-imx6ull-u-boot.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (c) 2021 Linumiz
* Author: Navin Sankar Velliangiri <[email protected]>
*/

&pinctrl_uart1 {
u-boot,dm-pre-reloc;
};

&gpmi {
u-boot,dm-spl;
u-boot,dm-pre-reloc;
};

&usdhc1 {
u-boot,dm-spl;
u-boot,dm-pre-reloc;
};

&usdhc2 {
u-boot,dm-spl;
u-boot,dm-pre-reloc;
};
Loading

0 comments on commit b2c4b7f

Please sign in to comment.