From patchwork Wed Jan 18 10:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Schenker X-Patchwork-Id: 13106140 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D9804C004D4 for ; Wed, 18 Jan 2023 10:54:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cWIXAto7CrZCEjP2UdhoyXMS9buXFvKM1w6/hKGsKtw=; b=HKscsgpidV6ph4 j8GV4dgrCXYVOUc22t/I/ljy60y8UPGclzdCniyc0pDrfXeg20uZVMhjnsKP7bZSwaztBKV010OeX 1I6T3AorIhnGHaDjFADOb7gzp2EyFlK9ZP+BcpiO8lM2lpDfvp9ryOZbB3y74Ckqu9R/whHXWf458 PjgNDYzlpdDmsdDnHMGB8m3Oz4E6pXsvnFMcyikqlCzC96sjV8EtZUp8Eq1Z/WoeF2rFbiYsRMFu4 K1YtHxCj4dQTC9rz9OWWrEpRFNF1E7DXsA4C+DsMSmLKdkuWrU3WhrO/PHMsl4Q8Ql2gaw/KKMm8W BXVIlPPyXJExTVREt0lw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI64U-000QDN-75; Wed, 18 Jan 2023 10:53:34 +0000 Received: from smtp-bc0e.mail.infomaniak.ch ([2001:1600:4:17::bc0e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI64B-000Q9f-Hm for linux-arm-kernel@lists.infradead.org; Wed, 18 Jan 2023 10:53:18 +0000 Received: from smtp-2-0001.mail.infomaniak.ch (unknown [10.5.36.108]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4NxjKC4t7WzMr8hc; Wed, 18 Jan 2023 11:53:03 +0100 (CET) Received: from unknown by smtp-2-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4NxjKC0fXyzMpxwW; Wed, 18 Jan 2023 11:53:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pschenker.ch; s=20220412; t=1674039183; bh=5xYLCetMGqkTkOYH9Rss/uAtdDJh1Jbj+W770F/N5yk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ysSIVeVcuXaf1ezB4JzMS+SJk/icq+BsbUzU8uknpRDpIygqRgihN6ljhtFm7JGBF GgcqoW6G3p4XZ5dv0XsGjWbkI3vrhmJRUXVVtu2k9wLNugilACw1aGo8h2E9gx7KYm M9Fnk6SFgZJYG2BoZ0ex+jffjoyLSg7JyKVIeQ/0= From: Philippe Schenker To: devicetree@vger.kernel.org Cc: Rob Herring , Philippe Schenker , Emanuele Ghidoli , Fabio Estevam , Francesco Dolcini , Krzysztof Kozlowski , Marcel Ziswiler , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] arm64: dts: imx8mm-verdin-dev: Do not include dahlia dtsi Date: Wed, 18 Jan 2023 11:52:50 +0100 Message-Id: <20230118105251.6035-2-dev@pschenker.ch> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118105251.6035-1-dev@pschenker.ch> References: <20230118105251.6035-1-dev@pschenker.ch> MIME-Version: 1.0 X-Infomaniak-Routing: alpha X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_025315_784703_0BE147B6 X-CRM114-Status: GOOD ( 11.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Philippe Schenker 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: Philippe Schenker --- .../boot/dts/freescale/imx8mm-verdin-dev.dtsi | 96 ++++++++++++++++++- 1 file changed, 94 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi index b2bcd2282170..3c4b8ca125e3 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi @@ -3,8 +3,6 @@ * Copyright 2022 Toradex */ -#include "imx8mm-verdin-dahlia.dtsi" - / { sound_card: sound-card { compatible = "simple-audio-card"; @@ -42,27 +40,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 = <®_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"; }; From patchwork Wed Jan 18 10:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Schenker X-Patchwork-Id: 13106141 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 62CD6C32793 for ; Wed, 18 Jan 2023 10:54:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WV4nz2A2PGEzy9PVJElIkyvQIH3RJGsZg00g6ExCVb8=; b=OlNfipJ9AfQs8f csPXRk4BOvKoNIjEnsOZS4CpGFK4kc9MzdM5CsMyl398bBiZdA3NWvNOwQrb9m6ayl/b5WlMaJMad PU32g8PpUK/xBIuXvD270+8cxrt3Z3GmxqBiD7fIaF3jt/E7oW/7u6TxEXPgRN/A3bvrf/G8cBRLM 6PtEs1U3EwKzvLeXXlHhGPReBLLwgnj1linsU5PJDDcq6v099XP6aorEw5MQIyz6t1q+jstLDC8iJ CPZJfxqMgAdpT7DdrW4GBBjoqjhwH63bXVZEckUMKBnKnZDX9kxmycKGQHY1a1bo/RRAYUuVZ7fZH ettxwKp26TllitLj97jg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI64F-000QBC-1d; Wed, 18 Jan 2023 10:53:19 +0000 Received: from smtp-8faa.mail.infomaniak.ch ([2001:1600:4:17::8faa]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pI64B-000Q9d-4w for linux-arm-kernel@lists.infradead.org; Wed, 18 Jan 2023 10:53:17 +0000 Received: from smtp-2-0001.mail.infomaniak.ch (unknown [10.5.36.108]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4NxjKD2bsVzMqwpL; Wed, 18 Jan 2023 11:53:04 +0100 (CET) Received: from unknown by smtp-2-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4NxjKC5ZJyzMpxwF; Wed, 18 Jan 2023 11:53:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pschenker.ch; s=20220412; t=1674039184; bh=hcUIogi+1GvOXkLX4kG/3DeG1fiKgZ9VOKvFAAQc7Zk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H18AHuXv4XGrfPlI4lk60j03pgjHvFrnJtcLHZLDwxOW14wI9n2I7BGjLQe8mJUN/ WT04aed167/NiyXEvia4j7VCJCOIKOE8VqN+gk3wgWr0zth8ByKgorY+c9cdUahNFo QUZaaCQbi/k4vav7DciS0PQrO0y/xC1kXdnOjFcI= From: Philippe Schenker To: devicetree@vger.kernel.org Cc: Rob Herring , Philippe Schenker , Fabio Estevam , Krzysztof Kozlowski , Laurent Pinchart , Marcel Ziswiler , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: imx8mp-verdin-dev: Do not include dahlia dtsi Date: Wed, 18 Jan 2023 11:52:51 +0100 Message-Id: <20230118105251.6035-3-dev@pschenker.ch> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118105251.6035-1-dev@pschenker.ch> References: <20230118105251.6035-1-dev@pschenker.ch> MIME-Version: 1.0 X-Infomaniak-Routing: alpha X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_025315_620650_4022C3D0 X-CRM114-Status: GOOD ( 12.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Philippe Schenker Follow the change that has been done on imx8mm-verdin-dev.dtsi and remove the include from dahlia to be consistent. Put back all nodes that previously had been included. Signed-off-by: Philippe Schenker Reviewed-by: Laurent Pinchart --- .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 116 +++++++++++++++++- 1 file changed, 114 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi index cefabe65b252..361426c0da0a 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi @@ -3,8 +3,6 @@ * Copyright 2022 Toradex */ -#include "imx8mp-verdin-dahlia.dtsi" - / { /* TODO: Audio Codec */ @@ -21,16 +19,99 @@ reg_eth2phy: regulator-eth2phy { }; }; +&backlight { + power-supply = <®_3p3v>; +}; + +/* Verdin SPI_1 */ +&ecspi1 { + status = "okay"; +}; + +/* EEPROM on display adapter boards */ +&eeprom_display_adapter { + status = "okay"; +}; + +/* EEPROM on Verdin Development board */ +&eeprom_carrier_board { + status = "okay"; +}; + +&eqos { + status = "okay"; +}; + &fec { phy-supply = <®_eth2phy>; status = "okay"; }; +&flexcan1 { + status = "okay"; +}; + +&flexcan2 { + status = "okay"; +}; + +/* Verdin QSPI_1 */ +&flexspi { + status = "okay"; +}; + &gpio_expander_21 { status = "okay"; vcc-supply = <®_1p8v>; }; +/* Current measurement into module VCC */ +&hwmon { + status = "okay"; +}; + +&hwmon_temp { + vs-supply = <®_1p8v>; + status = "okay"; +}; + +/* Verdin I2C_2_DSI */ +&i2c2 { + status = "okay"; +}; + +&i2c3 { + status = "okay"; +}; + +/* Verdin I2C_1 */ +&i2c4 { + status = "okay"; + + /* TODO: Audio Codec */ +}; + +/* TODO: Verdin PCIE_1 */ + +/* Verdin PWM_1 */ +&pwm1 { + status = "okay"; +}; + +/* Verdin PWM_2 */ +&pwm2 { + status = "okay"; +}; + +/* Verdin PWM_3_DSI */ +&pwm3 { + status = "okay"; +}; + +®_usdhc2_vmmc { + vin-supply = <®_3p3v>; +}; + /* TODO: Verdin I2C_1 with Audio Codec */ /* Verdin UART_1, connector X50 through RS485 transceiver */ @@ -38,9 +119,40 @@ &uart1 { linux,rs485-enabled-at-boot-time; rs485-rts-active-low; rs485-rx-during-tx; + status = "okay"; +}; + +/* Verdin UART_2 */ +&uart2 { + status = "okay"; +}; + +/* Verdin UART_3, used as the Linux Console */ +&uart3 { + status = "okay"; +}; + +/* Verdin USB_1 */ +&usb3_0 { + status = "okay"; +}; + +&usb3_phy0 { + status = "okay"; +}; + +/* Verdin USB_2 */ +&usb3_1 { + fsl,permanently-attached; + status = "okay"; +}; + +&usb3_phy1 { + status = "okay"; }; /* Limit frequency on dev board due to long traces and bad signal integrity */ &usdhc2 { max-frequency = <100000000>; + status = "okay"; };