From patchwork Thu Dec 2 22:19:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12694545 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 1727DC433FE for ; Thu, 2 Dec 2021 22:21:28 +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=zTVsYdezg88Ai6Tx0fRgCL0mrAU37pclyhWumQJ0Fbk=; b=dDeOIKXvCUYm45 wyZR5SNh6eStGac548QLxFnX0Bz6nOyVbjryAle3WFTedvGkgEffm88kKJLjcKJJ50w1fvsfmKxa7 Ans0kPwJ5rOLTsPKYdzrxUMBnvCBNxXiOSGc1dRfXHkNYBgmUoKQVtidqJ5CeRwLu4eNUtuVD4x/A en+A512WGOUAKSjLF1Hj0hAa0wz74uLG9RJ9FZAj6hmoEoN07wYQvvj4Ht8I0AnWmeVNtjMOrHQN5 Bo2k092bdbk0wmD47BUaGT7A5dlV27afZ9Qvh9ZmetVCyyhuJmHppAAq9HsCv/sXoC7lImh5YBcu7 D8bXEREj+KPQ3QeRjLow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1msuQr-00DYFb-ES; Thu, 02 Dec 2021 22:20:01 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1msuQT-00DYCc-TE for linux-arm-kernel@lists.infradead.org; Thu, 02 Dec 2021 22:19:40 +0000 Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id DC57C1203; Thu, 2 Dec 2021 23:19:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1638483576; bh=yXOiUCZXIj4uLGP5ei/9E48gV0y2BPSdyJfFIR2Iq6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NFIe6od0diZNl9Fu1b7/56+gpgBpuwlTBRp0lWNLkLHpTZ4uSCx+EhOJ5iDpGB0mv a2IAK+QnsZLuuCsK9odu5R4VRRZZUX4cClDmv6gnXbZH9YrrukIZU0iLsjnQ2Iz4v2 pfVk0SNOfHAmv2iZjl7BgUYUUgRQLb2VJxKutg6E= From: Laurent Pinchart To: devicetree@vger.kernel.org Cc: Rob Herring , linux-arm-kernel@lists.infradead.org, NXP Linux Team , Fabio Estevam , Pengutronix Kernel Team , Sascha Hauer , Shawn Guo Subject: [PATCH 3/3] ARM: dts: imx7: Group mipi_csi 'port' children in a 'ports' node Date: Fri, 3 Dec 2021 00:19:03 +0200 Message-Id: <20211202221903.21882-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211202221903.21882-1-laurent.pinchart@ideasonboard.com> References: <20211202221903.21882-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211202_141938_113931_D77E8837 X-CRM114-Status: GOOD ( 10.11 ) 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 The nxp,imx7-mipi-csi2.yaml binding requires ports to be grouped in a ports node, as multiple ports are present. Fix imx7s.dtsi and the only board file that references the mipi_csi ports. Signed-off-by: Laurent Pinchart --- arch/arm/boot/dts/imx7s-warp.dts | 13 +++++++------ arch/arm/boot/dts/imx7s.dtsi | 21 ++++++++++++--------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts index 614d252f029f..4f1edef06c92 100644 --- a/arch/arm/boot/dts/imx7s-warp.dts +++ b/arch/arm/boot/dts/imx7s-warp.dts @@ -250,14 +250,15 @@ &mipi_csi { clock-frequency = <166000000>; status = "okay"; - port@0 { - reg = <0>; + ports { + port@0 { + reg = <0>; - mipi_from_sensor: endpoint { - remote-endpoint = <&ov2680_to_mipi>; - data-lanes = <1>; + mipi_from_sensor: endpoint { + remote-endpoint = <&ov2680_to_mipi>; + data-lanes = <1>; + }; }; - }; }; diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 7e6b99ece7e9..52a9aeecdbb2 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -809,8 +809,6 @@ lcdif: lcdif@30730000 { mipi_csi: mipi-csi@30750000 { compatible = "fsl,imx7-mipi-csi2"; reg = <0x30750000 0x10000>; - #address-cells = <1>; - #size-cells = <0>; interrupts = ; clocks = <&clks IMX7D_IPG_ROOT_CLK>, <&clks IMX7D_MIPI_CSI_ROOT_CLK>, @@ -821,15 +819,20 @@ mipi_csi: mipi-csi@30750000 { resets = <&src IMX7_RESET_MIPI_PHY_MRST>; status = "disabled"; - port@0 { - reg = <0>; - }; + ports { + #address-cells = <1>; + #size-cells = <0>; - port@1 { - reg = <1>; + port@0 { + reg = <0>; + }; - mipi_vc0_to_csi_mux: endpoint { - remote-endpoint = <&csi_mux_from_mipi_vc0>; + port@1 { + reg = <1>; + + mipi_vc0_to_csi_mux: endpoint { + remote-endpoint = <&csi_mux_from_mipi_vc0>; + }; }; }; };