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: 45195 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2289109wrn; Wed, 18 Jan 2023 03:44:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXuUH9JMPAINZUDHRmBzMzqX2nX5ZxS+TweTrfXsAjNFYPIrMVAxCqxyoNmPQSldpW1JAjHF X-Received: by 2002:a05:6a20:d2c6:b0:b8:5ab4:279c with SMTP id ir6-20020a056a20d2c600b000b85ab4279cmr6602493pzb.30.1674042286033; Wed, 18 Jan 2023 03:44:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674042286; cv=none; d=google.com; s=arc-20160816; b=AqGYNwndSsjUoeZSxtYQfo7ZWPhld0CWOBhsnSYeMu9FEvpWaNxmM5dzhgfvTKgAgX IM3Qt+eKy1cmbG5qZKi6mXEY9iMyylk4JVHptuyTumHZh1+P5wq1yQasvDWBjXRCOV9x Kuqo3TllD4cEyaAPGcXMoZHRhX5IoMzloWnDZXQxh0NXIZarPynIN3igrxHs9DQMnatH roURVZsF7tzwJqpalfXgmiTwv9SuC6p3o+TvKsRIrq7+LWS+1giLZRr9hcYqI79r0eK1 MtNBXNwn4nWUkW6N3QuVQsAFIK4EFV9RNzmiaPGKWYGsSNK0dLYAIRIg6174nfVHgJ5S nG9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tsBWE7FIixVXFPnFa8x5AFJM4GBkBKu1QagNDp6FKHw=; b=RN1mpYenPtq1oxaBv7kpVe7k6R6S4OM/vPuhEyc4vYCIwlHd1U2ApzKvTU0hyLbTnf NlPKDcqIe2PNQtJvICIYOJzNPPCPemvgJFlsdbexjxkNzmtscBDgOmnFBWueJIjrbvyE 4N8k1vjEtD2JgY3oFhUM52Fz9ARca1tOI/nH/t8XpZJvINlk2NcsKLuUUFheobqaDWRa XDPDqYovr4RGbSG3lGBmMMPJye2Sb4lb8hmcv1nPS8ZEhS92flJqgosxYHMzF1Ak2Y6K mvHhhOeqF5pgg0drClPUjXD709JcDA3FDmvJk3W5NpaSzGKGE9vvTLw1zmQVHJIJjCje H0NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pschenker.ch header.s=20220412 header.b=H18AHuXv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=pschenker.ch Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 21-20020a630215000000b004aeae83e5b0si34485688pgc.55.2023.01.18.03.44.34; Wed, 18 Jan 2023 03:44:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pschenker.ch header.s=20220412 header.b=H18AHuXv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=pschenker.ch Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230176AbjARLg6 (ORCPT + 99 others); Wed, 18 Jan 2023 06:36:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229971AbjARLef (ORCPT ); Wed, 18 Jan 2023 06:34:35 -0500 X-Greylist: delayed 161474 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 18 Jan 2023 02:53:20 PST Received: from smtp-1908.mail.infomaniak.ch (smtp-1908.mail.infomaniak.ch [185.125.25.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7BA74ED03 for ; Wed, 18 Jan 2023 02:53:17 -0800 (PST) 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-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755360563798403780?= X-GMAIL-MSGID: =?utf-8?q?1755360563798403780?= 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"; };