From patchwork Fri Aug 10 14:20:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Miguel Silva X-Patchwork-Id: 143936 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp15991ljj; Fri, 10 Aug 2018 07:21:52 -0700 (PDT) X-Google-Smtp-Source: AA+uWPx2kslfxLUKfL1ayphjdO0+GiT1Wi/CuFXM371WHaseoh7MrvE1SznlzBjfsHLPWtQtThy5 X-Received: by 2002:a63:1015:: with SMTP id f21-v6mr6792134pgl.354.1533910912741; Fri, 10 Aug 2018 07:21:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533910912; cv=none; d=google.com; s=arc-20160816; b=O/s4on+7ucyjjhiUjsQVJmjLzi7yRQj0tYQOLC1OlZtLOFvD72XN0fpcuGt4y/MevL Mj7i78As7Fza9l1F3yEXmNmyZfXTKIPamPv7VRolPkKJj3p/V6xwM8yWaXaPOC3FPkpE z21+QDgmoRKpGWV9aLsrHSBJ8WyI7qjF4BJfZlKmqBqaH+uhucehKmVFhQ8zgV6lRbCL Uz+kyTa7p2xqFvjhvuCtX9xFCb50sy90cgbZMlFUVftxNzSTZtfgzvR6XiVhh5J0uNZx rgRRHdJDCPNFfHpiP/w/1aoFENigZ+6QPspVEQc+fdSrRGeIzP2fsQIld9FI8NfbhVUj +A8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=97KXIcWD8UF3Zu3HGKtVlFIfSGz/KYv5fKFHBa1+xiY=; b=ukz7fa034XV5PRAwCLNL89XvuN/EUinER0T104AmRVouUoEWRCBUxkzz6DLWVlEuT7 m21g9AZiufVq03GwSLISHNyR4U5hz/2unBdiVm02KQ4XKOAKGxEfwB1aM25x8D/Ju1gA Q7hFJ5QgBcJXqqzeJwdmEGLJaMU7WMGBtZ2g/Qa23w6df/OqVDGxxd2WPBhxe6gafZpc Bs/O8iHvLqSE/EulUct5p5T5WMXqgpEshvtFMyhkgGeYlBSD+yLQD2NTZ88YquMV0kCP YudGUPMhAMpzwuVWOMayi6LLibjO/9+oWjG1zoed/PnrPxvt+gfnkZpcu5YG9Way8oun dvHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="anX/PWS8"; 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 91-v6si7981107ply.405.2018.08.10.07.21.52; Fri, 10 Aug 2018 07:21:52 -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="anX/PWS8"; 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 S1728217AbeHJQv6 (ORCPT + 5 others); Fri, 10 Aug 2018 12:51:58 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:37885 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728214AbeHJQv6 (ORCPT ); Fri, 10 Aug 2018 12:51:58 -0400 Received: by mail-wm0-f66.google.com with SMTP id n11-v6so2104799wmc.2 for ; Fri, 10 Aug 2018 07:21:50 -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; bh=97KXIcWD8UF3Zu3HGKtVlFIfSGz/KYv5fKFHBa1+xiY=; b=anX/PWS8JlM7yPIZq3hw1MHIqXIOvjacRbDn3F9x1OCkSqgBUBKsqq2Chz9LbLyRtW nZOnT0fxrtVPw/jPHfLc7cIz0suGJ0ynZJI4nAmZguDILh6ZZF/vumTW/R7mFz/4R591 GWLOhaAcsf5CZg5tRU2NVswO9scWUS7NMsvq8= 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; bh=97KXIcWD8UF3Zu3HGKtVlFIfSGz/KYv5fKFHBa1+xiY=; b=fS+iloTrppEhECD7P2Y9KosdKOor+WGoDWxGNNStS6afqJfvbdDJuylnJXZRbxm1QI 0Ga8YCiJiYVNjGdEy4Gl21WQcyMRdnyUilaNBMG2H6cul5PY+vlZMveB62AVYTujC8MB fPQqmYruFZtL4v5457jwX1Ic5r1Ki10Xz+sd6v2bpGJ5RNKw06X+Ah3HdNgSIoevPVWx 7E9x+dnOjrXtFf81er5UMCuUBOTK0afG9kgFstwVVPXRr86W7J2/w5OAth10n51l4qRl wESc1/WBK4XS8ho3utAXcUiFVK29u2h7YbLjjpcRGyFfjw7b3Kc2VXrsVDmXNpFzec95 SJcw== X-Gm-Message-State: AOUpUlFgpj0hi3G8Qx4IOYtltFP235khvsBwLEoL/4YXhd2rH6dULEPY G85U+dDSNbM+igEfiNHc1vtCXg== X-Received: by 2002:a1c:b709:: with SMTP id h9-v6mr1746739wmf.104.1533910909903; Fri, 10 Aug 2018 07:21:49 -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 b13-v6sm13077578wrn.17.2018.08.10.07.21.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Aug 2018 07:21:49 -0700 (PDT) From: Rui Miguel Silva To: mchehab@kernel.org, sakari.ailus@linux.intel.com, Philipp Zabel , Rob Herring Cc: linux-media@vger.kernel.org, devel@driverdev.osuosl.org, Fabio Estevam , devicetree@vger.kernel.org, Greg Kroah-Hartman , Ryan Harkin , Rui Miguel Silva Subject: [PATCH v7 08/12] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections Date: Fri, 10 Aug 2018 15:20:41 +0100 Message-Id: <20180810142045.27657-9-rui.silva@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180810142045.27657-1-rui.silva@linaro.org> References: <20180810142045.27657-1-rui.silva@linaro.org> 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.18.0 diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts index fa390da636de..8e098b90c525 100644 --- a/arch/arm/boot/dts/imx7s-warp.dts +++ b/arch/arm/boot/dts/imx7s-warp.dts @@ -306,6 +306,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 f6c7afa51dc1..432c69f50a05 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" / { @@ -712,6 +713,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>; @@ -721,6 +733,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 {