From: Marcel Ziswiler
Synchronise device tree with linux-next next-20220708.
Please note that this also means that instead of the previous "generic"
U-Boot specific carrier board agnostic device trees we are now using the
regular ones for the Colibri Evaluation (carrier) board V3 (e.g.
imx7d-colibri-eval-v3.dtb rather than the previous
imx7-colibri-rawnand.dtb and imx7d-colibri-emmc-eval-v3.dtb rather than
the previous imx7-colibri-emmc.dtb).
Please further note that the PMIC node name got changed from rn5t567@33
to pmic@33 which required adjustment in resp. board file
board/toradex/colibri_imx7/colibri_imx7.c.
Signed-off-by: Marcel Ziswiler
---
arch/arm/dts/Makefile |4 +-
arch/arm/dts/imx7-colibri-emmc.dts| 94 --
arch/arm/dts/imx7-colibri-eval-v3.dtsi| 110 ++
arch/arm/dts/imx7-colibri-rawnand.dts | 96 --
arch/arm/dts/imx7-colibri.dtsi| 1156 +++--
.../imx7d-colibri-emmc-eval-v3-u-boot.dtsi|1 +
arch/arm/dts/imx7d-colibri-emmc-eval-v3.dts | 21 +
arch/arm/dts/imx7d-colibri-emmc.dtsi | 61 +
...dtsi => imx7d-colibri-eval-v3-u-boot.dtsi} | 10 +-
arch/arm/dts/imx7d-colibri-eval-v3.dts| 56 +
arch/arm/dts/imx7d-colibri.dtsi | 35 +
board/toradex/colibri_imx7/MAINTAINERS| 14 +-
board/toradex/colibri_imx7/colibri_imx7.c |4 +-
configs/colibri_imx7_defconfig|2 +-
configs/colibri_imx7_emmc_defconfig |2 +-
15 files changed, 1325 insertions(+), 341 deletions(-)
delete mode 100644 arch/arm/dts/imx7-colibri-emmc.dts
create mode 100644 arch/arm/dts/imx7-colibri-eval-v3.dtsi
delete mode 100644 arch/arm/dts/imx7-colibri-rawnand.dts
create mode 12 arch/arm/dts/imx7d-colibri-emmc-eval-v3-u-boot.dtsi
create mode 100644 arch/arm/dts/imx7d-colibri-emmc-eval-v3.dts
create mode 100644 arch/arm/dts/imx7d-colibri-emmc.dtsi
rename arch/arm/dts/{imx7-colibri-u-boot.dtsi =>
imx7d-colibri-eval-v3-u-boot.dtsi} (79%)
create mode 100644 arch/arm/dts/imx7d-colibri-eval-v3.dts
create mode 100644 arch/arm/dts/imx7d-colibri.dtsi
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 5890ee1fecf..dcd827d011b 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -905,8 +905,8 @@ dtb-$(CONFIG_EV_IMX280_NANO_X_MB) += \
dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \
imx7d-sdb-qspi.dtb \
imx7-cm.dtb \
- imx7-colibri-emmc.dtb \
- imx7-colibri-rawnand.dtb \
+ imx7d-colibri-emmc-eval-v3.dtb \
+ imx7d-colibri-eval-v3.dtb \
imx7s-warp.dtb \
imx7d-meerkat96.dtb \
imx7d-pico-pi.dtb \
diff --git a/arch/arm/dts/imx7-colibri-emmc.dts
b/arch/arm/dts/imx7-colibri-emmc.dts
deleted file mode 100644
index 8545498275e..000
--- a/arch/arm/dts/imx7-colibri-emmc.dts
+++ /dev/null
@@ -1,94 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-/*
- * Copyright 2019 Toradex AG
- */
-
-/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 {
- 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 = <500>;
- regulator-max-microvolt = <500>;
- };
-
- 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 = <500>;
- regulator-max-microvolt = <500>;
- 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
-
