From: Marcel Ziswiler
Synchronise device tree with linux-next 20220706.
Please note that this also means that instead of the previous "generic"
U-Boot specific carrier board agnostic device tree we are now using the
regular one for the Apalis Evaluation (carrier) board (e.g.
imx6q-apalis-eval.dtb rather than the previous imx6-apalis.dtb).
Signed-off-by: Marcel Ziswiler
---
arch/arm/dts/Makefile |4 +-
arch/arm/dts/imx6-apalis-u-boot.dtsi | 11 -
arch/arm/dts/imx6-apalis.dts | 752 ---
arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi | 25 +
arch/arm/dts/imx6q-apalis-eval.dts | 170 +++
arch/arm/dts/imx6qdl-apalis.dtsi | 1372
board/toradex/apalis_imx6/MAINTAINERS |6 +-
configs/apalis_imx6_defconfig |2 +-
8 files changed, 1574 insertions(+), 768 deletions(-)
delete mode 100644 arch/arm/dts/imx6-apalis-u-boot.dtsi
delete mode 100644 arch/arm/dts/imx6-apalis.dts
create mode 100644 arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6q-apalis-eval.dts
create mode 100644 arch/arm/dts/imx6qdl-apalis.dtsi
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 66c719908cd..d3fcb9336d0 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -801,7 +801,7 @@ endif
ifneq ($(CONFIG_MX6Q)$(CONFIG_MX6QDL),)
dtb-y += \
- imx6-apalis.dtb \
+ imx6q-apalis-eval.dtb \
imx6q-bosch-acc.dtb \
imx6q-cm-fx6.dtb \
imx6q-cubox-i.dtb \
@@ -893,7 +893,7 @@ dtb-$(CONFIG_MX6ULL) += \
imx6ulz-14x14-evk.dtb
dtb-$(CONFIG_ARCH_MX6) += \
- imx6-apalis.dtb \
+ imx6q-apalis-eval.dtb \
imx6-colibri.dtb
dtb-$(CONFIG_O4_IMX_NANO) += \
diff --git a/arch/arm/dts/imx6-apalis-u-boot.dtsi
b/arch/arm/dts/imx6-apalis-u-boot.dtsi
deleted file mode 100644
index 95e7e022b9a..000
--- a/arch/arm/dts/imx6-apalis-u-boot.dtsi
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-/*
- * Copyright 2020 Foundries.IO
- */
-
-#include "imx6qdl-u-boot.dtsi"
-
- {
- status = "okay";
- u-boot,dm-spl;
-};
diff --git a/arch/arm/dts/imx6-apalis.dts b/arch/arm/dts/imx6-apalis.dts
deleted file mode 100644
index 72f7439aed2..000
--- a/arch/arm/dts/imx6-apalis.dts
+++ /dev/null
@@ -1,752 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-/*
- * Copyright 2019 Toradex AG
- */
-
-/dts-v1/;
-#include
-#include "imx6q.dtsi"
-
-/ {
- model = "Toradex Apalis iMX6Q/D";
- compatible = "toradex,apalis_imx6q", "fsl,imx6q";
-
- /* Will be filled by the bootloader */
- memory@1000 {
- device_type = "memory";
- reg = <0x1000 0>;
- };
-
- aliases {
- mmc0 =
- mmc1 =
- mmc2 =
- usb0 = /* required for ums */
- ethernet0 =
- };
-
- chosen {
- stdout-path =
- };
-
- reg_module_3v3: regulator-module-3v3 {
- compatible = "regulator-fixed";
- regulator-name = "+V3.3";
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- regulator-always-on;
- };
-
- reg_usb_otg_vbus: regulator-usb-otg-vbus {
- compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <_regulator_usbotg_pwr>;
- regulator-name = "usb_otg_vbus";
- regulator-min-microvolt = <500>;
- regulator-max-microvolt = <500>;
- gpio = < 22 GPIO_ACTIVE_HIGH>; /* USBO1_EN */
- enable-active-high;
- };
-
- /* on-module USB hub */
- reg_usb_host_vbus_hub: regulator-usb-host-vbus-hub {
- compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <_regulator_usbhub_pwr>;
- regulator-name = "usb_host_vbus_hub";
- regulator-min-microvolt = <500>;
- regulator-max-microvolt = <500>;
- gpio = < 28 GPIO_ACTIVE_HIGH>;
- startup-delay-us = <2000>;
- enable-active-high;
- };
-
- reg_usb_host_vbus: regulator-usb-host-vbus {
- compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <_regulator_usbh_pwr>;
- regulator-name = "usb_host_vbus";
- regulator-min-microvolt = <500>;
- regulator-max-microvolt = <500>;
- gpio = < 0 GPIO_ACTIVE_HIGH>; /* USBH_EN */
- enable-active-high;
- vin-supply = <_usb_host_vbus_hub>;
- };
-};
-
-/* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
- {
- clock-frequency = <10>;
- pinctrl-names = "default";
- pinctrl-0 = <_i2c1>;
-
