Commit 99d7ad96 authored by Philippe Schenker's avatar Philippe Schenker Committed by Shawn Guo
Browse files

arm64: dts: imx8mm-verdin-dev: Do not include dahlia dtsi 



Inheriting the dahlia devicetree leads to inheriting certain settings
for the audio-codec that are not correct and hence the dt schema check
failing.

Remove that include and put all nodes back that had been included.

Signed-off-by: default avatarPhilippe Schenker <philippe.schenker@toradex.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent a51e4fac

arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi

+94 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
 * Copyright 2022 Toradex

 */



#include "imx8mm-verdin-dahlia.dtsi"



/ {

	sound_card: sound-card {

		compatible = "simple-audio-card";
@@ -41,27 +39,121 @@ simple-audio-card,cpu { 
	};

};



/* Verdin SPI_1 */

&ecspi2 {

	status = "okay";

};



/* 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";

};



&hwmon_temp {

	vs-supply = <&reg_1p8v>;

	status = "okay";

};



&i2c3 {

	status = "okay";

};



&gpio_expander_21 {

	status = "okay";

};



/* Verdin I2C_1 */

&i2c4 {

	status = "okay";



	/* Audio Codec */

	nau8822_1a: audio-codec@1a {

		compatible = "nuvoton,nau8822";

		reg = <0x1a>;

		#sound-dai-cells = <0>;

	};

};



/* Verdin PCIE_1 */

&pcie0 {

	status = "okay";

};



&pcie_phy {

	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, connector X50 through RS485 transceiver */

&uart2 {

	linux,rs485-enabled-at-boot-time;

	rs485-rts-active-low;

	rs485-rx-during-tx;

	status = "okay";

};



/* Verdin UART_2 */

&uart3 {

	status = "okay";

};



/* Verdin USB_1 */

&usbotg1 {

	disable-over-current;

	status = "okay";

};



/* Verdin USB_2 */

&usbotg2 {

	disable-over-current;

	status = "okay";

};



/* Limit frequency on dev board due to long traces and bad signal integrity */

&usdhc2 {

	max-frequency = <100000000>;

	status = "okay";

};