From patchwork Wed Jan 6 15:08:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12001877 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84BF7C433E0 for ; Wed, 6 Jan 2021 15:10:29 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 406CE22BF3 for ; Wed, 6 Jan 2021 15:10:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 406CE22BF3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=2n2Wl1e32G6b6LBldWnagVfHDVx9i1+M4eUX6Kgg/QI=; b=IAfbC5HQw/KXlbzkn7tq6mgk5A IMLKlFImmovA7ciY1km+BquNzPleopD4HVl6Kh41bTxq0GBZhDOr3Oh568Kiemep25F6SqcrQvB02 SUA4v9vXv8oT5+x/vrXQ6YE+XjGlH9refhoX7tTPP9/McvsSBw59kEAl5njkgy+3T4yJVUf112L2G f3EujbiVl+7/0M8gJx32Qm3zAXuO01PrEx1i8WJRT+l1AvPrza4XCxVw893jGWdXHsscctdZtBv4D 6gyVUlJVbANropOZHHXdqc7piRzUfQFK8sWh32ouNhyvVnev0XnqeFD/rwboeCXmcv+JIPs61x5X9 9dbF/S+A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxAR2-0005Xz-EW; Wed, 06 Jan 2021 15:09:16 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxAR0-0005Vt-1K for linux-arm-kernel@lists.infradead.org; Wed, 06 Jan 2021 15:09:15 +0000 Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6CCA5878; Wed, 6 Jan 2021 16:09:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1609945747; bh=c1cYvZRnrt+AyL9EneIsFdjVf9murI3rERm+y/j7hRA=; h=From:To:Cc:Subject:Date:From; b=Ljm0PIYzH2aBQ9ltreQc6V3jE0uv2dA0QfGo+4UADA3//GLcUXbdxLiO1ltI8YQk/ Xb6CCq1z/yuHQj6+TGCwVju/2CsWbBdcwF4RM67iJbWMVZBT8f3EAw3PcBRCJDJrzp zWES+bs5WuCYOVJ0CGTcTQ+MA+T1C+rSpaloNJsw= From: Laurent Pinchart To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: dts: imx6q(dl): Move 'port' nodes under 'ports' for HDMI encoder Date: Wed, 6 Jan 2021 17:08:51 +0200 Message-Id: <20210106150851.8480-1-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210106_100914_218969_979CEA8E X-CRM114-Status: GOOD ( 11.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Philipp Zabel , Fabio Estevam , Sascha Hauer , Rob Herring , NXP Linux Team , Pengutronix Kernel Team , Shawn Guo Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In preparation for the conversion of the DWC HDMI TX device tree bindings to YAML, move the HDMI encoder's 'port' nodes under a 'ports' node. The 'ports' node is optional in the OF graph implementation, but YAML bindings require it. Signed-off-by: Laurent Pinchart --- arch/arm/boot/dts/imx6q.dtsi | 20 +++++++++++--------- arch/arm/boot/dts/imx6qdl.dtsi | 25 ++++++++++++++----------- 2 files changed, 25 insertions(+), 20 deletions(-) This patch is needed to avoid a DT validation warning when converting the DWC HDMI TX bindings to YAML. diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 5277e3903291..8d209c1b3ca7 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -406,19 +406,21 @@ ipu2_csi1_mux_to_ipu2_csi1: endpoint { &hdmi { compatible = "fsl,imx6q-hdmi"; - port@2 { - reg = <2>; + ports { + port@2 { + reg = <2>; - hdmi_mux_2: endpoint { - remote-endpoint = <&ipu2_di0_hdmi>; + hdmi_mux_2: endpoint { + remote-endpoint = <&ipu2_di0_hdmi>; + }; }; - }; - port@3 { - reg = <3>; + port@3 { + reg = <3>; - hdmi_mux_3: endpoint { - remote-endpoint = <&ipu2_di1_hdmi>; + hdmi_mux_3: endpoint { + remote-endpoint = <&ipu2_di1_hdmi>; + }; }; }; }; diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 7a8837cbe21b..64bd7ff8eae3 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -178,8 +178,6 @@ gpmi: nand-controller@112000 { }; hdmi: hdmi@120000 { - #address-cells = <1>; - #size-cells = <0>; reg = <0x00120000 0x9000>; interrupts = <0 115 0x04>; gpr = <&gpr>; @@ -188,19 +186,24 @@ hdmi: hdmi@120000 { clock-names = "iahb", "isfr"; status = "disabled"; - port@0 { - reg = <0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - hdmi_mux_0: endpoint { - remote-endpoint = <&ipu1_di0_hdmi>; + port@0 { + reg = <0>; + + hdmi_mux_0: endpoint { + remote-endpoint = <&ipu1_di0_hdmi>; + }; }; - }; - port@1 { - reg = <1>; + port@1 { + reg = <1>; - hdmi_mux_1: endpoint { - remote-endpoint = <&ipu1_di1_hdmi>; + hdmi_mux_1: endpoint { + remote-endpoint = <&ipu1_di1_hdmi>; + }; }; }; };