From patchwork Tue Mar 26 11:02:25 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: 161202 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp5064863jan; Tue, 26 Mar 2019 04:02:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqy8nOMeDO41IPvJRYHF6fwKcY3DWFfRxe9OAnGbdKEVijWjOr4+JQ/CKgxH2RCY5EjRPAr7 X-Received: by 2002:a63:544f:: with SMTP id e15mr28811148pgm.344.1553598168798; Tue, 26 Mar 2019 04:02:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553598168; cv=none; d=google.com; s=arc-20160816; b=Qx6ZcmUGtkVjboXSR0Hgx/ZFjQlRLZ+nSdGHN3co8b4xJ1oRV9Jio0vpTtKuHqcuxC p63Sj8IlAIZLjCFNDW++YtiiRuYhfYiD9L9COb5d8PHu0C7ZwJ+9VrcYbksX99JledSs KlhjA+DL18HoZuARf9Nur5rSVpqvVx3xp0ea9AaRPUjNM65SAmwwIoJPEvuo8pNR5ogk vvnGzI+lBcbtbF641AOGf7L6kmIiNjVvnCpibygbV7fMPPdPm2ne8odaFo8Qm/I8CluR TCEOzcp3odJ6eN2Oeizw9Rno1m7cXEuTVcFkBZFDKZLQrJrZalwfPEyx6ZLx/v1dAvv8 y+Qg== 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=0mGvQdPfscTi7F2JbwQVnrZKQA1X/Y6ftux3w4EESnw=; b=j4q6UqcMpJCG6oGvqfgtt5VJ0F8oyweKZIkyNJyvV0D2dyei26mD2ikzcep1nzHsaq l3eHzInF17RJVlqfIpqMHDxdwcx059LAUVOFQj6lmpKPxKvTwxWcXC2Hz19MK0BojNfA ciSPZtXT7SXrXiB7zgTbM4olK9jl5W9KUi5wjg4inuAwXwjRhhsh9RcWmbsqRXwySV8v 8kR/kB82vX/o6shJiNgHKGoLV1oVuL54axAqLubY2FFJRQ119JWD4AWvOmKANG68JgWG tK/I2l148CTCUh/g8nttB/cCxd8ZM7RYgn72qXBdkFFuLDVhS42Ue4JVv0Qk9Oz7NyQV LeLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rFclwKyt; 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 m18si5356408pls.18.2019.03.26.04.02.48; Tue, 26 Mar 2019 04:02:48 -0700 (PDT) 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=rFclwKyt; 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 S1726270AbfCZLCs (ORCPT + 7 others); Tue, 26 Mar 2019 07:02:48 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:51941 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726266AbfCZLCs (ORCPT ); Tue, 26 Mar 2019 07:02:48 -0400 Received: by mail-wm1-f65.google.com with SMTP id 4so12114377wmf.1 for ; Tue, 26 Mar 2019 04:02:46 -0700 (PDT) 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=0mGvQdPfscTi7F2JbwQVnrZKQA1X/Y6ftux3w4EESnw=; b=rFclwKyt5jUWUK0EgmqWPfQDwHvAhq1M8LE8MtB6E/2+iM1qfacLo5cgmGHF8lgbW+ QaAI6aKzGcSJMtu979YoplpDyj+Mkn/Rwh4+2czsgrGWMtSZ0U9nFvVpfgeQh8yf4n10 8x4xyUCtz3OfYnIrdqlJ9D5cljcUtVmjtfVpzB22fOM/ys4LoMkqBRE0wxCLMnTNSXuC WNvu1PwvEG9DQOdRFrq6AEtQKQdS6IYg8cb8VnEEODezhidmyCzweJh+fiuQlA6wMjcc RknTI3qCm96TEAa0487ZPfFPWOginTMa+AjI6rfubkKV38JW2Cgm17oE0fGneCxBXUuq fzHQ== 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=0mGvQdPfscTi7F2JbwQVnrZKQA1X/Y6ftux3w4EESnw=; b=c38iN23w6axgOYDjZQEnWs10ENBEDgjp4l3BWgt8Y9JzUMq+ZJpx3MC3JxLSWWv1Uk qs3CYBYCuWCwuJY05KB4gdys2s6JuF7oR+vCOFcg0AlDXr+EwZFBiyAGIwggQd2OesHl TbQ/6/WmzJaLy1bM/Uo9/uFDNbTDTQ/LCzNefyFDDWmtnhNmXR0uigVNxSJYoDeG+tC8 0PsHTmVQgy1I3Gw6ChyTp9Vfzl+yQ+bVZdUq5QPiECBPk0singyv0zOcQjfFKknYVn1B SkUIE1E/cN9WWkEu0FcgZofgd+JDEogxRYFhMGTz3NLlMh2m9rf3CRJjXS2ZLt/QyE7U 4/OQ== X-Gm-Message-State: APjAAAV1lBWE1Rk4xBTkW5pTjEEYSxeDagNCo1LjIzdsjZ/E3FFcekGW jPG0E77lxLruygreh7pRg3BKMg== X-Received: by 2002:a1c:c102:: with SMTP id r2mr14889451wmf.113.1553598166255; Tue, 26 Mar 2019 04:02:46 -0700 (PDT) Received: from arch-late.local (a109-49-46-234.cpe.netcabo.pt. [109.49.46.234]) by smtp.gmail.com with ESMTPSA id q63sm17958010wma.21.2019.03.26.04.02.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 04:02:45 -0700 (PDT) From: Rui Miguel Silva To: Shawn Guo , Rob Herring , Fabio Estevam Cc: Laurent Pinchart , devicetree@vger.kernel.org, Rui Miguel Silva Subject: [PATCH v2 3/5] ARM: dts: imx7s: Add video mux, csi and mipi_csi Date: Tue, 26 Mar 2019 11:02:25 +0000 Message-Id: <20190326110227.7324-4-rui.silva@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190326110227.7324-1-rui.silva@linaro.org> References: <20190326110227.7324-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 Add device tree nodes for csi, video multiplexer and mipi-csi. Signed-off-by: Rui Miguel Silva --- arch/arm/boot/dts/imx7s.dtsi | 70 ++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) -- 2.21.0 diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 792efcd2caa1..a50e5877fc18 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" / { @@ -506,6 +507,29 @@ #mux-control-cells = <0>; mux-reg-masks = <0x14 0x00000010>; }; + + 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>; + }; + }; + }; }; ocotp: ocotp-ctrl@30350000 { @@ -709,6 +733,23 @@ 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"; + + port { + csi_from_csi_mux: endpoint { + remote-endpoint = <&csi_mux_to_csi>; + }; + }; + }; + lcdif: lcdif@30730000 { compatible = "fsl,imx7d-lcdif", "fsl,imx28-lcdif"; reg = <0x30730000 0x10000>; @@ -718,6 +759,35 @@ clock-names = "pix", "axi"; status = "disabled"; }; + + 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>, + <&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"; + + port@0 { + reg = <0>; + }; + + port@1 { + reg = <1>; + + mipi_vc0_to_csi_mux: endpoint { + remote-endpoint = <&csi_mux_from_mipi_vc0>; + }; + }; + }; }; aips3: aips-bus@30800000 {