From patchwork Wed Feb 6 15:13:23 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: 157637 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6525268jaa; Wed, 6 Feb 2019 07:13:59 -0800 (PST) X-Google-Smtp-Source: AHgI3IaXHp5FKK3PQNDLw9H7uuD2KNxlBeHa2/2C8Mhggsv+yK975ZaZ+6BrtzWIutiePS7Y2prB X-Received: by 2002:a17:902:e612:: with SMTP id cm18mr7494025plb.172.1549466039008; Wed, 06 Feb 2019 07:13:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549466039; cv=none; d=google.com; s=arc-20160816; b=MlyCUSm+Shh9QavyAUnvfIejOXpj8B3rNS6I0rrKbxBXARxI7YR/HkkBtNpkG7AN3v F/6D3rbPdrsa6RSHDjxMtT3TEVH5NOn0zugOaijMk4S24nkiOwph9GSzF6AHSV3xkzyN WdvOskS6X7tkg9GnJyW3DRdGQCPmh2uc10g6UBkSBz35phvo+F22wpxNHqHhu8+YsbN7 D4AonaWDppgBYsLP3BNxLz6/283PQ/QU0ABC3zFqkCkRc/IaQkDuJSZN5lvfaLV0ZkZ7 1kgbZ4UHbpINxWXrBH2nRIVzLNAGdPRLO5B6Kob0TH5TmI9HBrxUPnpSxqr6ln51nSjJ A1gQ== 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=Nva8IJ9u3tTwQs0yoFqrCAEYBr9Z5jSaP7mHudPBxxkTQY3AnnshahUb0cMm5wUPUR 7ft8XYmhw/M2rv0BZOX3pCtQElE2NqSG0VLqn6zw5M/wUuDYtzUPABPzQmhBcRx0kq1b mgw7jmjAFgKVUVnZkxaGCLd/FGrhc/wxjo+xGpEn6wwzUFZTT8dHqMKToBRKUJwpKS7p 5KGmrJ7K27ZmX3THyk0RoxWVLr8R9lMkCgAomknVVCXxvEwVPOEaN+lujWgPOBLcEFAq m2ppJHu4I2T4ejlDvCBAUyTcU6ph7a5npIGQrppFvEn7DniDEZETttFzbQZkk7DP89cy qPag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QSmDddwU; 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 e4si6111576pgk.127.2019.02.06.07.13.58; Wed, 06 Feb 2019 07:13:59 -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=QSmDddwU; 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 S1730099AbfBFPN6 (ORCPT + 7 others); Wed, 6 Feb 2019 10:13:58 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:54098 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731154AbfBFPN6 (ORCPT ); Wed, 6 Feb 2019 10:13:58 -0500 Received: by mail-wm1-f67.google.com with SMTP id d15so2861542wmb.3 for ; Wed, 06 Feb 2019 07:13:56 -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=QSmDddwUoXwPmQm3I+lZXV66WqYgFYZ10ahloTQ7M9l0fFGRljGU9DvocPQ8MXP9ov 6uOVW+rQxmLghK7MYYGOvOhXmnUWAcjijUp00VSSPjxRVr+ndrJ53EhozuhB7dYpxVD4 xkTr1f1IEDx3+wsy8CtpPiOBmxsj0JfApBktrWFgu07kxV8UbUFz8fSNHZg9nnC+WR3Z u8MFu5amn3xxKahGyQpSM4d9N+WzEob9hmDwsSxHZR+bb/myHKq0Qlr0E6Vu9sPvJ5vA s7ahPE8MQ8DlYq6VLjSPpCV5AzzvFLOgf+uJ9MBOYyxLapxS6RSD61GfIo50i5M1AhJz RsOg== 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=qrtK0znEifshE4571RBDGyv2KWbtbBs0ZofGoMycoCP/wKeSmY8xy+cFuNZt95bXXA RtLJk+218uCHU9jta2ovIJhm8Bqk1scGsmw5c5N8GS47ntTtvf52KQ6bEQG1dcoswfHb DekFtRH7TbXhBApp/xSHlCmllWj3wDEjnBAQ/LhaikRydXokXFSBJHuugM+4ADmJDuRc W5iuYYxwKXUBtP6gojV5H90LzTBZFNJrFuKren4MxYS5MD+lEvNU+vyGslyIPL4Lh1y2 8YLT5OCUiyhmSda2C2f54rKLovwONdUCTJyyYulhxCgx42yaiwHkjcln6K1aSTy5XuWT IyDQ== X-Gm-Message-State: AHQUAuZTXoirQi3xJDIenIBqmte64Pjsj8SPn+DQxBwe8UvQJXBGojzJ yVQs9aetH5vxniTqChJ7NlSg8g== X-Received: by 2002:a1c:c44c:: with SMTP id u73mr3716740wmf.45.1549466036008; Wed, 06 Feb 2019 07:13:56 -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 f22sm11207836wmj.26.2019.02.06.07.13.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Feb 2019 07:13:55 -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 v14 08/13] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections Date: Wed, 6 Feb 2019 15:13:23 +0000 Message-Id: <20190206151328.21629-9-rui.silva@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190206151328.21629-1-rui.silva@linaro.org> References: <20190206151328.21629-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 {