From 31966f8362999b2c61ae158722f6b7673b6a8a60 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Thu, 11 Feb 2021 21:20:04 +0100
Subject: arm64: dts: imx8mm-verdin: refactor dahlia and development board

Make dahlia dtsi the master and the Development Board dtsi overwriting
the differences to Dahlia. This unifies with how it is done for the
Verdin iMX8M Plus.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi   | 110 ++++++++++++++++++---
 1 file changed, 99 insertions(+), 11 deletions(-)

(limited to 'arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi')

diff --git a/arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi
index 78bec5e3c94b..fcd92fef48c6 100755
--- a/arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi
@@ -3,18 +3,106 @@
  * Copyright 2020 Toradex
  */
 
-#include "imx8mm-verdin-dev.dtsi"
+/* Verdin SPI_1 */
+&ecspi2 {
+	status = "okay";
 
-&gpio_expander_21 {
-	status = "disabled";
+	spidev20: spidev@0 {
+		compatible = "toradex,evalspi";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+		status = "okay";
+	};
 };
 
-&sound_card {
-		simple-audio-card,routing =
-			"Headphone Jack", "HPOUTL",
-			"Headphone Jack", "HPOUTR",
-			"IN2L", "Line In Jack",
-			"IN2R", "Line In Jack",
-			"Headphone Jack", "MICBIAS",
-			"IN1L", "Headphone Jack";
+/* EEPROM on display adapter boards */
+&eeprom_display_adapter {
+	status = "okay";
+};
+
+/* EEPROM on Verdin Development board */
+&eeprom_carrier_board {
+	status = "okay";
+};
+
+&fec1 {
+	status = "okay";
+};
+
+/* Verdin QSPI_1 */
+&flexspi {
+	status = "okay";
+};
+
+/* Current measurement into module VCC */
+&hwmon {
+	status = "okay";
+};
+
+&i2c3 {
+	status = "okay";
+};
+
+&i2c4 {
+	status = "okay";
+};
+
+/* Verdin PCIE_1 */
+&pcie0 {
+	status = "okay";
+};
+
+/* Verdin PWM_3_DSI */
+&pwm1 {
+	status = "okay";
+};
+
+/* Verdin PWM_1 */
+&pwm2 {
+	status = "okay";
+};
+
+/* Verdin PWM_2 */
+&pwm3 {
+	status = "okay";
+};
+
+/* VERDIN I2S_1 */
+&sai2 {
+	status = "okay";
+};
+
+/* Verdin UART_3 */
+&uart1 {
+	status = "okay";
+};
+
+/* Verdin UART_1 */
+&uart2 {
+	status = "okay";
+};
+
+/* Verdin UART_2 */
+&uart3 {
+	status = "okay";
+};
+
+/* Verdin USB_1 */
+&usbotg1 {
+	status = "okay";
+};
+
+/* Verdin USB_2 */
+&usbotg2 {
+	status = "okay";
+};
+
+/* Verdin SD_1 */
+&usdhc2 {
+	status = "okay";
+};
+
+/* Audio Codec */
+&wm8904_1a {
+	status = "okay";
 };
-- 
cgit v1.2.3