From: Marcel Ziswiler
Synchronise device tree with linux v5.19-rc5.
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 Verdin Development (carrier) board (e.g.
imx8mp-verdin-wifi-dev.dtb rather than the previous imx8mp-verdin.dtb).
Signed-off-by: Marcel Ziswiler
---
arch/arm/dts/Makefile |2 +-
arch/arm/dts/imx8mp-verdin-dahlia.dtsi| 129 ++
arch/arm/dts/imx8mp-verdin-dev.dtsi | 46 +
...tsi => imx8mp-verdin-wifi-dev-u-boot.dtsi} | 53 +-
arch/arm/dts/imx8mp-verdin-wifi-dev.dts | 18 +
arch/arm/dts/imx8mp-verdin-wifi.dtsi | 82 +
arch/arm/dts/imx8mp-verdin.dts| 639
arch/arm/dts/imx8mp-verdin.dtsi | 1379 +
board/toradex/verdin-imx8mp/MAINTAINERS |8 +-
configs/verdin-imx8mp_defconfig |2 +-
10 files changed, 1709 insertions(+), 649 deletions(-)
create mode 100644 arch/arm/dts/imx8mp-verdin-dahlia.dtsi
create mode 100644 arch/arm/dts/imx8mp-verdin-dev.dtsi
rename arch/arm/dts/{imx8mp-verdin-u-boot.dtsi =>
imx8mp-verdin-wifi-dev-u-boot.dtsi} (66%)
create mode 100644 arch/arm/dts/imx8mp-verdin-wifi-dev.dts
create mode 100644 arch/arm/dts/imx8mp-verdin-wifi.dtsi
delete mode 100644 arch/arm/dts/imx8mp-verdin.dts
create mode 100644 arch/arm/dts/imx8mp-verdin.dtsi
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 64f12419701..aa9f6b1540e 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -966,7 +966,7 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
imx8mp-phyboard-pollux-rdk.dtb \
imx8mp-venice.dtb \
imx8mp-venice-gw74xx.dtb \
- imx8mp-verdin.dtb \
+ imx8mp-verdin-wifi-dev.dtb \
imx8mq-pico-pi.dtb \
imx8mq-kontron-pitx-imx8m.dtb
diff --git a/arch/arm/dts/imx8mp-verdin-dahlia.dtsi
b/arch/arm/dts/imx8mp-verdin-dahlia.dtsi
new file mode 100644
index 000..4b8f86f6308
--- /dev/null
+++ b/arch/arm/dts/imx8mp-verdin-dahlia.dtsi
@@ -0,0 +1,129 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2022 Toradex
+ */
+
+/* TODO: Audio Codec */
+
+ {
+ power-supply = <_3p3v>;
+};
+
+/* Verdin SPI_1 */
+ {
+ status = "okay";
+};
+
+/* EEPROM on display adapter boards */
+_display_adapter {
+ status = "okay";
+};
+
+/* EEPROM on Verdin Development board */
+_carrier_board {
+ status = "okay";
+};
+
+ {
+ status = "okay";
+};
+
+ {
+ status = "okay";
+};
+
+ {
+ status = "okay";
+};
+
+/* Verdin QSPI_1 */
+ {
+ status = "okay";
+};
+
+/* Current measurement into module VCC */
+ {
+ status = "okay";
+};
+
+_temp {
+ vs-supply = <_1p8v>;
+ status = "okay";
+};
+
+/* Verdin I2C_2_DSI */
+ {
+ status = "okay";
+};
+
+ {
+ status = "okay";
+};
+
+/* Verdin I2C_1 */
+ {
+ status = "okay";
+
+ /* TODO: Audio Codec */
+};
+
+/* TODO: Verdin PCIE_1 */
+
+/* Verdin PWM_1 */
+ {
+ status = "okay";
+};
+
+/* Verdin PWM_2 */
+ {
+ status = "okay";
+};
+
+/* Verdin PWM_3_DSI */
+ {
+ status = "okay";
+};
+
+_usdhc2_vmmc {
+ vin-supply = <_3p3v>;
+};
+
+/* TODO: Verdin I2S_1 */
+
+/* Verdin UART_1 */
+ {
+ status = "okay";
+};
+
+/* Verdin UART_2 */
+ {
+ status = "okay";
+};
+
+/* Verdin UART_3, used as the Linux Console */
+ {
+ status = "okay";
+};
+
+/* Verdin USB_1 */
+_0 {
+ status = "okay";
+};
+
+_phy0 {
+ status = "okay";
+};
+
+/* Verdin USB_2 */
+_1 {
+ status = "okay";
+};
+
+_phy1 {
+ status = "okay";
+};
+
+/* Verdin SD_1 */
+ {
+ status = "okay";
+};
diff --git a/arch/arm/dts/imx8mp-verdin-dev.dtsi
b/arch/arm/dts/imx8mp-verdin-dev.dtsi
new file mode 100644
index 000..cefabe65b25
--- /dev/null
+++ b/arch/arm/dts/imx8mp-verdin-dev.dtsi
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2022 Toradex
+ */
+
+#include "imx8mp-verdin-dahlia.dtsi"
+
+/ {
+ /* TODO: Audio Codec */
+
+ reg_eth2phy: regulator-eth2phy {
+ compatible = "regulator-fixed";
+ enable-active-high;
+ gpio = <_expander_21 4 GPIO_ACTIVE_HIGH>; /* ETH_PWR_EN */
+ off-on-delay = <50>;
+ regulator-max-microvolt = <330>;
+ regulator-min-microvolt = <330>;
+ regulator-name = "+V3.3_ETH";
+ startup-delay-us = <20>;
+ vin-supply = <_3p3v>;
+ };
+};
+
+ {
+ phy-supply = <_eth2phy>;
+ status = "okay";
+};
+
+_expander_21 {
+ status = "okay";
+ vcc-supply = <_1p8v>;
+};
+
+/* TODO: Verdin I2C_1 with Audio Codec */
+
+/* Verdin UART_1, connector X50 through RS485 transceiver */
+ {
+ linux,rs485-enabled-at-boot-time;
+ rs485-rts-active-low;
+ rs485-rx-during-tx;
+};
+
+/* Limit frequency on dev
