From patchwork Mon Feb 4 12:00:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Miguel Silva X-Patchwork-Id: 157394 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3827755jaa; Mon, 4 Feb 2019 04:01:10 -0800 (PST) X-Google-Smtp-Source: AHgI3IaaqUVVvKIqopKFeqI554frrIB45tCUkEal308FLysGmE6YSHtbKrF3Bg5MiP94A3tMIHX5 X-Received: by 2002:a17:902:1e8:: with SMTP id b95mr1481838plb.325.1549281670479; Mon, 04 Feb 2019 04:01:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549281670; cv=none; d=google.com; s=arc-20160816; b=VX38yDQfXR9X3JGuJnyztd+XOqp0LKpXTCBy0eCkgi4M8vO3c6H4rQwgvWhaxPQhzU IS0JJ9wsdTYTZh3Kc6+NWPQNzDTTWYrPOEKO5EbSz/G/pGAnpcyFuPALWjPfTlFf/bcS 7Cm7oGwun/Ro0v04tviqN/01b1LV1sPdWDaIGmHoAjDZwnpwM118QmAn6g29iJraDaE3 9M4S4F0dOF7mZyzIup4jGdwk8Bs+Qu+wXfkKJ5A1UY99c+pyPtTXlDQHg/Sl10KRX+j/ 8yeyXsDh0MT7VfURFzlDCGIdcrWFVAu8EYNAz6BSZei1NWUFXVTXS4T/ETf9d4AhKVHk jE+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=l1CtKO6V+4HtmzEfS2pTeqx8xeoh5M0LOaS1U2hjAuU=; b=w7/xRFqjW1RgMqmo/QVFOwfkjh6BwdxSTy5lq/XnHINRFuT3CVvzEyZq+gaq/rQTiZ GcH0nIbroT46YueS7U1LFTzy1mJn5R+2x7n1qw4zWvevSWTnHCoPFyhK6Y+rlkoTIbIY Emb8yj5Zp2/q4AQNqsZ8XYdNaK1Cso5h5SQ8yBOXcaagBY3/de9JCDkyoi31tBA44kK9 REF/9ESQ7DXIDWRgvSGpu+Uekjtd+RT3vATii5xbZx/bIofBX5ZX1/ArfG7QSgtxfxq5 YVoUKrk3gg3Uz0oazExr1XBA46J5mEGt0gprlaRpBYx30cMxaYnT4zc3b08ns8rBbEjf TduQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GDrk57HZ; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d9si15213387pgb.105.2019.02.04.04.01.10; Mon, 04 Feb 2019 04:01:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GDrk57HZ; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729266AbfBDMBJ (ORCPT + 7 others); Mon, 4 Feb 2019 07:01:09 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:55396 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729257AbfBDMBI (ORCPT ); Mon, 4 Feb 2019 07:01:08 -0500 Received: by mail-wm1-f68.google.com with SMTP id y139so12800045wmc.5 for ; Mon, 04 Feb 2019 04:01:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l1CtKO6V+4HtmzEfS2pTeqx8xeoh5M0LOaS1U2hjAuU=; b=GDrk57HZkBgApjP2nAacQuecHYAlM5O2pxORHQ2JQFafXoX8j62Q5bil98AjxQ5J7U f+K/3ze2BX91I91hrxI8OFDn9sgamELREUKREbzQJASHTqiPMHdCGhC/GU4Q4vUVOJlz aoLNdFOJ87Oi1uW+kiCseMZozHYrBAv2MGnRQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l1CtKO6V+4HtmzEfS2pTeqx8xeoh5M0LOaS1U2hjAuU=; b=PkWVozF3icWJsRIyfXVhDQR17/uHqUBsHcTtjJA/F2Yor0ZIKBCENXjZpyysgEiLRr rrgw6Jsze9cSjrZz21yiODrz5xPKJA4HQwrCja/jJnhBxLzHoNraD+QMWU9Db/DKgNRW 3o+0qiuPsc5vPQeJBmk2NMirR48nv2A+RKV3QGmO+yaPTntdFOC85+4KJWRWriVYXrG0 shpYL6UDkqEsbHVFqtJNTB1GYzUhsSVc3LZivSfU6/SGG3pKnG+e//9ktdn2ZNlGFjK7 wFPP0PP5z6j6R2csDe2K5ibdxG5LnxGXXZvkIDBsCNzf5mXQ8NcWrKty0gYSbN458YKM HlgA== X-Gm-Message-State: AHQUAubp43Kj1N4uCy7h/qRgBCfu5J45HngyZKC9yZKz7o0qmawJolBx rx/ZYw9DbmpP0yuRmckOqX8/3UYFU5U= X-Received: by 2002:a1c:2787:: with SMTP id n129mr13524350wmn.128.1549281666797; Mon, 04 Feb 2019 04:01:06 -0800 (PST) Received: from arch-late.local (a109-49-46-234.cpe.netcabo.pt. [109.49.46.234]) by smtp.gmail.com with ESMTPSA id s8sm15404543wrn.44.2019.02.04.04.01.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 04:01:06 -0800 (PST) From: Rui Miguel Silva To: sakari.ailus@linux.intel.com, Steve Longerbeam , Hans Verkuil , Philipp Zabel Cc: linux-media@vger.kernel.org, devel@driverdev.osuosl.org, devicetree@vger.kernel.org, Greg Kroah-Hartman , Rui Miguel Silva Subject: [PATCH v12 08/13] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections Date: Mon, 4 Feb 2019 12:00:34 +0000 Message-Id: <20190204120039.1198-9-rui.silva@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204120039.1198-1-rui.silva@linaro.org> References: <20190204120039.1198-1-rui.silva@linaro.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This patch adds the device tree nodes for csi, video multiplexer and mipi-csi besides the graph connecting the necessary endpoints to make the media capture entities to work in imx7 Warp board. Signed-off-by: Rui Miguel Silva --- arch/arm/boot/dts/imx7s-warp.dts | 51 ++++++++++++++++++++++++++++++++ arch/arm/boot/dts/imx7s.dtsi | 27 +++++++++++++++++ 2 files changed, 78 insertions(+) -- 2.20.1 diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts index 23431faecaf4..358bcae7ebaf 100644 --- a/arch/arm/boot/dts/imx7s-warp.dts +++ b/arch/arm/boot/dts/imx7s-warp.dts @@ -277,6 +277,57 @@ status = "okay"; }; +&gpr { + csi_mux { + compatible = "video-mux"; + mux-controls = <&mux 0>; + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + + csi_mux_from_mipi_vc0: endpoint { + remote-endpoint = <&mipi_vc0_to_csi_mux>; + }; + }; + + port@2 { + reg = <2>; + + csi_mux_to_csi: endpoint { + remote-endpoint = <&csi_from_csi_mux>; + }; + }; + }; +}; + +&csi { + status = "okay"; + + port { + csi_from_csi_mux: endpoint { + remote-endpoint = <&csi_mux_to_csi>; + }; + }; +}; + +&mipi_csi { + clock-frequency = <166000000>; + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + fsl,csis-hs-settle = <3>; + + port@1 { + reg = <1>; + + mipi_vc0_to_csi_mux: endpoint { + remote-endpoint = <&csi_mux_from_mipi_vc0>; + }; + }; +}; + &wdog1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wdog>; diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 792efcd2caa1..01962f85cab6 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -8,6 +8,7 @@ #include #include #include +#include #include "imx7d-pinfunc.h" / { @@ -709,6 +710,17 @@ status = "disabled"; }; + csi: csi@30710000 { + compatible = "fsl,imx7-csi"; + reg = <0x30710000 0x10000>; + interrupts = ; + clocks = <&clks IMX7D_CLK_DUMMY>, + <&clks IMX7D_CSI_MCLK_ROOT_CLK>, + <&clks IMX7D_CLK_DUMMY>; + clock-names = "axi", "mclk", "dcic"; + status = "disabled"; + }; + lcdif: lcdif@30730000 { compatible = "fsl,imx7d-lcdif", "fsl,imx28-lcdif"; reg = <0x30730000 0x10000>; @@ -718,6 +730,21 @@ clock-names = "pix", "axi"; status = "disabled"; }; + + mipi_csi: mipi-csi@30750000 { + compatible = "fsl,imx7-mipi-csi2"; + reg = <0x30750000 0x10000>; + interrupts = ; + clocks = <&clks IMX7D_IPG_ROOT_CLK>, + <&clks IMX7D_MIPI_CSI_ROOT_CLK>, + <&clks IMX7D_MIPI_DPHY_ROOT_CLK>; + clock-names = "pclk", "wrap", "phy"; + power-domains = <&pgc_mipi_phy>; + phy-supply = <®_1p0d>; + resets = <&src IMX7_RESET_MIPI_PHY_MRST>; + reset-names = "mrst"; + status = "disabled"; + }; }; aips3: aips-bus@30800000 {