From patchwork Thu Jan 24 16:09: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: 156492 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2137343jaa; Thu, 24 Jan 2019 08:09:56 -0800 (PST) X-Google-Smtp-Source: ALg8bN5T9tNL9paAyCvbpBQA2KYla/x6LfYdvoRW5lJwm5i0y37wDjvxS/7OAYIzQFtoPo89FXvj X-Received: by 2002:a17:902:1005:: with SMTP id b5mr7172803pla.310.1548346196579; Thu, 24 Jan 2019 08:09:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548346196; cv=none; d=google.com; s=arc-20160816; b=Tnqu3lidQiW6kvCA+G8arTdakXqW/xGkymbqlqvHTA3xgaV6nQIqF9zPn52P94tmsW b6GRnJ1kUR6j2ea7k22JQovhzKXSB60IIDP1gyFOponAOHZWyGw7lH4TxEMpV9NfvD5D bjcMpAvJGzdzAylPZp34L04wecrswNDbzUI+ebA63US5G1DxrlT6WU2ILMoSeuvOjPs5 D0mw8uv/s9psDamlewBPk8OtR+1rsGnIxLmk00nU1RYnVviz5V7TTVanQnWznYbwy2HG 1Zy72MlANfqR3ocORGQubd/RCc3bIDH4A7zo5yAs+sJNjztVfQ8+mjhaMAdMbyoqXjlb lNKQ== 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=MV5qadQRIehkZY+8EZaDhvDMNbfb71jY3clM7YRV82XZkpHX6cfgdqiQfAaRhftZdY StCSns3HO8ylCxvEVxXi2GzeuHBtnGb7f0bq5xO5ZF/4JIhvlyD19h/JndLNKXpUoxZp RmZuW2UI8RjkPNsRjNxppZLIs8WgFwXpm5L6YDO54/FBgz/nSShshIoE/zc1nFBSS5NV Vu2Nnzg5sDx1ykdgepQFYPo4aytuKLyPU1k2bjYLl5tq3kcpFmZOYbkTTun5lstlYo/A /lwwHv7F7L5Y8gPFMLi5eiAVCs8lZjLXBo+f7tFTC5NaIuk+CEsfQEpYZG3wnJgB3HBD gmbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Cwc/KjZ+"; 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 34si15994576pgt.455.2019.01.24.08.09.56; Thu, 24 Jan 2019 08:09:56 -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="Cwc/KjZ+"; 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 S1728605AbfAXQJz (ORCPT + 7 others); Thu, 24 Jan 2019 11:09:55 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44986 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728040AbfAXQJz (ORCPT ); Thu, 24 Jan 2019 11:09:55 -0500 Received: by mail-wr1-f68.google.com with SMTP id z5so7059353wrt.11 for ; Thu, 24 Jan 2019 08:09:54 -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=Cwc/KjZ+GeaXFQlwgp1zfo23AUnTSv1WdQaNJKadY09GMbbrrUoXwIeHwpyobv3cMY LHNG+GCOwctbd9SW3CTL0ccksWfcZ9K1gqR0nTSCXAQ3Ar1jXnpn/0yTzLTgThFr5Wui RyIp/BZiP+f8f67bsWXqC2SxJcngPnKqH4YGI= 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=JhE465F3sHJNyC/je2ds8INwCnqBZXLb7VoMyjkX8iidiK/Y5+y24b7JxHKqV+Aib/ VSHV7heb5KqEnFb3D6pDvJ39nmBsWhFdZyGvzM5ksgH7TmMZEPnkVcXb4nkcOJXmT9cQ 1SBLieS0Q+WRt17BXZm85uSCpULJYkN7e+N/ryHpBTPJDlkcWMtKU0H/AqIpjUXpi457 MfGb9HmcsFm0LVUZLx3waux4Yk4C81JmSEh0f37mnCo/YFdo00a8dQJpIuXnTmyV4ND0 z2GZCRXRwcdXyfdh5aiYrixrJjPHLxbOAGf5NPnq0IYNKZGG86p+vkD0cOi4KvMk3c7A eT2w== X-Gm-Message-State: AJcUukeOxPz7Abm6z9G/6IKdbAnfoAQ5SNbVBO3kWE/yySyNtm7SNbyv x2uAZnTB7gldEeGcm1ASZzsSGw== X-Received: by 2002:adf:9521:: with SMTP id 30mr7391019wrs.192.1548346193387; Thu, 24 Jan 2019 08:09:53 -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 e16sm179880299wrn.72.2019.01.24.08.09.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jan 2019 08:09:52 -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 v11 08/13] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections Date: Thu, 24 Jan 2019 16:09:23 +0000 Message-Id: <20190124160928.31884-9-rui.silva@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124160928.31884-1-rui.silva@linaro.org> References: <20190124160928.31884-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 {