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.
imx8mm-verdin-wifi-dev.dtb rather than the previous imx8mm-verdin.dtb).
Please further note that the PMIC node name got changed from a pmic
label to pmic@25 which required adjustment in resp. board SPL file
board/toradex/verdin-imx8mm/spl.c.
Signed-off-by: Marcel Ziswiler
---
arch/arm/dts/Makefile |2 +-
arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi |2 +-
arch/arm/dts/imx8mm-verdin-dahlia.dtsi| 150 ++
arch/arm/dts/imx8mm-verdin-dev.dtsi | 67 +
...tsi => imx8mm-verdin-wifi-dev-u-boot.dtsi} | 48 +-
arch/arm/dts/imx8mm-verdin-wifi-dev.dts | 18 +
arch/arm/dts/imx8mm-verdin-wifi.dtsi | 94 ++
arch/arm/dts/imx8mm-verdin.dts| 1031 -
arch/arm/dts/imx8mm-verdin.dtsi | 1295 +
board/toradex/verdin-imx8mm/MAINTAINERS |8 +-
board/toradex/verdin-imx8mm/spl.c |2 +-
configs/verdin-imx8mm_defconfig |2 +-
12 files changed, 1674 insertions(+), 1045 deletions(-)
create mode 100644 arch/arm/dts/imx8mm-verdin-dahlia.dtsi
create mode 100644 arch/arm/dts/imx8mm-verdin-dev.dtsi
rename arch/arm/dts/{imx8mm-verdin-u-boot.dtsi =>
imx8mm-verdin-wifi-dev-u-boot.dtsi} (53%)
create mode 100644 arch/arm/dts/imx8mm-verdin-wifi-dev.dts
create mode 100644 arch/arm/dts/imx8mm-verdin-wifi.dtsi
delete mode 100644 arch/arm/dts/imx8mm-verdin.dts
create mode 100644 arch/arm/dts/imx8mm-verdin.dtsi
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 5f8e9b529b8..64f12419701 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -946,7 +946,7 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
imx8mm-venice-gw7901.dtb \
imx8mm-venice-gw7902.dtb \
imx8mm-venice-gw7903.dtb \
- imx8mm-verdin.dtb \
+ imx8mm-verdin-wifi-dev.dtb \
phycore-imx8mm.dtb \
imx8mn-bsh-smm-s2.dtb \
imx8mn-bsh-smm-s2pro.dtb \
diff --git a/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi
b/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi
index b87cef9bf99..66cc97842c0 100644
--- a/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi
@@ -2,7 +2,7 @@
/*
* Copyright 2021-2022 Marek Vasut
*/
-#include "imx8mm-verdin-u-boot.dtsi"
+#include "imx8mm-verdin-wifi-dev-u-boot.dtsi"
/ {
chosen {
diff --git a/arch/arm/dts/imx8mm-verdin-dahlia.dtsi
b/arch/arm/dts/imx8mm-verdin-dahlia.dtsi
new file mode 100644
index 000..c2a5c2f7b20
--- /dev/null
+++ b/arch/arm/dts/imx8mm-verdin-dahlia.dtsi
@@ -0,0 +1,150 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2022 Toradex
+ */
+
+/ {
+ sound_card: sound-card {
+ compatible = "simple-audio-card";
+ simple-audio-card,bitclock-master = <_master>;
+ simple-audio-card,format = "i2s";
+ simple-audio-card,frame-master = <_master>;
+ simple-audio-card,name = "imx8mm-wm8904";
+ simple-audio-card,routing =
+ "Headphone Jack", "HPOUTL",
+ "Headphone Jack", "HPOUTR",
+ "IN2L", "Line In Jack",
+ "IN2R", "Line In Jack",
+ "Headphone Jack", "MICBIAS",
+ "IN1L", "Headphone Jack";
+ simple-audio-card,widgets =
+ "Microphone", "Headphone Jack",
+ "Headphone", "Headphone Jack",
+ "Line", "Line In Jack";
+
+ dailink_master: simple-audio-card,codec {
+ clocks = < IMX8MM_CLK_SAI2_ROOT>;
+ sound-dai = <_1a>;
+ };
+
+ simple-audio-card,cpu {
+ sound-dai = <>;
+ };
+ };
+};
+
+/* 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";
+};
+
+/* Verdin QSPI_1 */
+ {
+ status = "okay";
+};
+
+/* Current measurement into module VCC */
+ {
+ status = "okay";
+};
+
+_temp {
+ vs-supply = <_1p8v>;
+ status = "okay";
+};
+
+ {
+ status = "okay";
+};
+
+/* Verdin I2C_1 */
+ {
+ status = "okay";
+
+ /* Audio Codec */
+ wm8904_1a: audio-codec@1a {
+ compatible = "wlf,wm8904";
+ AVDD-supply = <_3p3v>;
+ clocks = < IMX8MM_CLK_SAI2_ROOT>;
+ clock-names = "mclk";
+ CPVDD-supply = <_3p3v>;
+ DBVDD-supply = <_3p3v>;
+
