diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-18 10:42:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-18 10:42:12 -0400 |
| commit | 98f3ee09d096c6c1bc49e08d805f6354dffb0e59 (patch) | |
| tree | b02cd94de7fc93381d8ce7d07481ff9952986218 /arch/arm/dts/fsl-imx8qxp-colibri.dts | |
| parent | 9de3126e80cdac7ee15b6671065a952184533dda (diff) | |
| parent | 4516b535bf16db4231ea27bb95197d869f86893b (diff) | |
Merge tag 'u-boot-imx-20200918' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
----------------------------------------------------------------
Fixes for 2020.10
-----------------
- Toradex boards
- mx6qsabrelite: fix env offset
- esdhc_imx: waiting for clock instead of sleep
- dyn RAM calibration for entry point i.MX6
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/728274602
Diffstat (limited to 'arch/arm/dts/fsl-imx8qxp-colibri.dts')
| -rw-r--r-- | arch/arm/dts/fsl-imx8qxp-colibri.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/dts/fsl-imx8qxp-colibri.dts b/arch/arm/dts/fsl-imx8qxp-colibri.dts index 0c20edf2cf..11ece34c02 100644 --- a/arch/arm/dts/fsl-imx8qxp-colibri.dts +++ b/arch/arm/dts/fsl-imx8qxp-colibri.dts @@ -9,8 +9,8 @@ #include "fsl-imx8qxp-colibri-u-boot.dtsi" / { - model = "Toradex Colibri iMX8QXP"; - compatible = "toradex,colibri-imx8qxp", "fsl,imx8qxp"; + model = "Toradex Colibri iMX8X"; + compatible = "toradex,colibri-imx8x", "fsl,imx8qxp"; chosen { bootargs = "console=ttyLP3,115200 earlycon=lpuart32,0x5a090000,115200"; @@ -32,7 +32,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hog0>, <&pinctrl_hog1>, <&pinctrl_hog2>; - colibri-imx8qxp { + colibri-imx8x { pinctrl_lpuart0: lpuart0grp { fsl,pins = < SC_P_UART0_RX_ADMA_UART0_RX 0x06000020 |