mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-23 19:43:33 +00:00
529faf80c3
--------------------
- Board fixes:
- imx6logic
- wandboard
- mx6sabre boots again
- imx8qm_mek
- pico-* boards
- Toradex apalis / colibri
- engicam imx6 (environment)
- KP MX53
- opos6ul
- Switch to DM:
- vining2000
- dh MX6
- Toradex colibri i.MX7
- Novena
- Security : fix CSF size for HAB
- Other:
- imx: fix building for i.mx8 without spl
- pcie and switch to DM
mx6sabreauto: Enable SPL SDP support
-----BEGIN PGP SIGNATURE-----
iQHDBAABCgAtFiEEiZClFGvhzbUNsmAvKMTY0yrV63cFAlz/bLMPHHNiYWJpY0Bk
ZW54LmRlAAoJECjE2NMq1et3W7oL/1rYXpSr2JE8fdXvqtmugjaPr7lQFzE7Bjkw
pDyDZA+3tpG8lv5xwjUi0Q+c38RRY6K/1lP/bztGXal+ryx/V0HFNAKKdhzedxhy
kgB3BGyp0rdEpzRwBLEkUCVFKJyVMI9ztPpzun6FDm+pyvIN4vnvziYPlkrYSyVk
ZrvCGk6X8OYAJ3qNcTcttPIXTfv0QTs8l6bpw3kHSVoUSAGGQc2FxOUmxvwsZedN
jpVJ5iB/2xrmSyWMIcGAfXLhzNolooeFgcqdKj7X+x0l0Q1p/S4srGKfYRqqhsAO
q4H/Xjt47e6oWVclbh3TypnUuxAw0i2BhhczAbr/nnN42aNySWrtQyZm33h/esAy
dcriYUvHlsoC00sfB1xShF4rhBno8OW+ExJVDwsVMalJr9WI4FujwsE/Aw+CUec8
ompz1IUz+2+BG+PcVbDNxysM5TcqpdQOaq0JKQUnz/xzyocV75M2pFw9YzQE85J7
yHAoq5OlW//B1wSRuPlH3vBkVWf2SA==
=pRXQ
-----END PGP SIGNATURE-----
Merge tag 'u-boot-imx-20190612' of git://git.denx.de/u-boot-imx
u-boot-imx-20190612
--------------------
- Board fixes:
- imx6logic
- wandboard
- mx6sabre boots again
- imx8qm_mek
- pico-* boards
- Toradex apalis / colibri
- engicam imx6 (environment)
- KP MX53
- opos6ul
- Switch to DM:
- vining2000
- dh MX6
- Toradex colibri i.MX7
- Novena
- Security : fix CSF size for HAB
- Other:
- imx: fix building for i.mx8 without spl
- pcie and switch to DM
mx6sabreauto: Enable SPL SDP support
94 lines
2 KiB
Text
94 lines
2 KiB
Text
// SPDX-License-Identifier: GPL-2.0+ OR X11
|
|
/*
|
|
* Copyright 2019 Toradex AG
|
|
*/
|
|
|
|
/dts-v1/;
|
|
#include "imx7-colibri.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;
|
|
usb0 = &usbotg1; /* required for ums */
|
|
};
|
|
|
|
chosen {
|
|
stdout-path = &uart1;
|
|
};
|
|
|
|
reg_5v0: regulator-5v0 {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "5V";
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
};
|
|
|
|
reg_usbh_vbus: regulator-usbh-vbus {
|
|
compatible = "regulator-fixed";
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_usbh_reg>;
|
|
regulator-name = "VCC_USB[1-4]";
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
gpio = <&gpio4 7 GPIO_ACTIVE_LOW>;
|
|
vin-supply = <®_5v0>;
|
|
};
|
|
};
|
|
|
|
&usdhc3 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_usdhc3>;
|
|
bus-width = <8>;
|
|
non-removable;
|
|
status = "okay";
|
|
};
|
|
|
|
&iomuxc {
|
|
pinctrl_usdhc3: usdhc3grp {
|
|
fsl,pins = <
|
|
MX7D_PAD_SD3_CMD__SD3_CMD 0x59
|
|
MX7D_PAD_SD3_CLK__SD3_CLK 0x19
|
|
MX7D_PAD_SD3_DATA0__SD3_DATA0 0x59
|
|
MX7D_PAD_SD3_DATA1__SD3_DATA1 0x59
|
|
MX7D_PAD_SD3_DATA2__SD3_DATA2 0x59
|
|
MX7D_PAD_SD3_DATA3__SD3_DATA3 0x59
|
|
MX7D_PAD_SD3_DATA4__SD3_DATA4 0x59
|
|
MX7D_PAD_SD3_DATA5__SD3_DATA5 0x59
|
|
MX7D_PAD_SD3_DATA6__SD3_DATA6 0x59
|
|
MX7D_PAD_SD3_DATA7__SD3_DATA7 0x59
|
|
MX7D_PAD_SD3_STROBE__SD3_STROBE 0x19
|
|
>;
|
|
};
|
|
|
|
pinctrl_usbh_reg: gpio-usbh-vbus {
|
|
fsl,pins = <
|
|
MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14
|
|
>;
|
|
};
|
|
};
|
|
|
|
/* Colibri USBC */
|
|
&usbotg1 {
|
|
/*
|
|
* usbotg1 on Colibri iMX7 can function in both host/otg modes.
|
|
* Gadget stack currently does not look at this at all while
|
|
* the host stack refuses to bind/load if it is not set to host
|
|
* (it obviously won't be enumerated during usb start invocation
|
|
* if dr_mode = "otg")
|
|
*/
|
|
dr_mode = "host";
|
|
status = "okay";
|
|
};
|
|
|
|
/* Colibri USBH */
|
|
&usbotg2 {
|
|
dr_mode = "host";
|
|
vbus-supply = <®_usbh_vbus>;
|
|
status = "okay";
|
|
};
|