From patchwork Fri May 18 09:28:03 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: 136267 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp998317lji; Fri, 18 May 2018 02:28:51 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoUxZnGTunmjPQkxEyNHiC6jkDBDnl67L+ZwS7pEK82mbF2kVMELxjzfVA5+Oupi93D6yx+ X-Received: by 2002:a65:62d9:: with SMTP id m25-v6mr6852549pgv.407.1526635731795; Fri, 18 May 2018 02:28:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526635731; cv=none; d=google.com; s=arc-20160816; b=nKy0TWCOTrN+lNGy43oTqATRConRIROTi9ux8FR6Et80n1MSRjoxzzJVUnHQpPxD9+ /mp+aXqOIQcNXPxA41q/oe8f5aUUHUcGjCOOBaErpbRYiuOIwDVy0wRkcVZ+50/Pyke9 SlG7buKnrJKUDesZFQ8EE8dp2qU3foL57bOH+qJ1gUHe6qtEf7Yirp+3yBGI3NP+6jl/ pN1vOMw+V6x+qAmdCmpmlI4i9Sb0fFYXRF2mUak+1bJ/0TAppPKm6x9JJC6KiAtVlbpc VCQx6XT/jT+SYcC/rM7kEjHYNoCGYXEn7IwTCuUw2a+GmNFDSEYZBs/NO0NAtYUpi8D6 XdgQ== 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=daKA2w+H6LWjawLzNhT8Id5K9oJFw8orWIrY8ef/CVc=; b=y8TwcC2WrsVunDvck+ZmEhQ6YV6NCg42bLbInd0fzM2/6SI4xAVc6I9Nzy+Us30bWp YZ+MgTPWafJMrPmSUramPpuJsBBXD0r7xYRT5tPa2rAfOEwwCt0K5+Q1EP9311y5vNx7 1kavb7s78XXn8NAHgNW9eo4FzaL/hA04eN0Ovl7SWHEWAWXXfDwgzVFdTtIzgvfBzdNA y9OCPLfYe6Z1mfUoq8KD/E1pJ/o0JlU3UDEXm4hkrfbd4/hjewdsMlPuKR/I06OoRT4X /rjjd9oJ1on5A5Ew3zAEGDSLRzVN0CXsXdZuQGH9qITH/f4Wka62cOZly4l4cYu4np6O fh7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=eAdCA6Ps; 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=fail (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 33-v6si7053191plk.83.2018.05.18.02.28.51; Fri, 18 May 2018 02:28:51 -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=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=eAdCA6Ps; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753392AbeERJ2s (ORCPT + 5 others); Fri, 18 May 2018 05:28:48 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:38487 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753437AbeERJ2q (ORCPT ); Fri, 18 May 2018 05:28:46 -0400 Received: by mail-wr0-f194.google.com with SMTP id 94-v6so8466488wrf.5 for ; Fri, 18 May 2018 02:28:45 -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=wjxDYbAz4IU4olfozatAjZ8MNt7cy7PprEy/RfcHVFg=; b=eAdCA6Pso7wqxumtRQ2NwmkB06ugW6ITRw4cwihQuOyfNfptSuc7bGAQPAbcV1EVdT 2vJdQ0WURbnoIHjSCO41kX6K4JIHqksvyZJRmx4TVgid78Hvi7Hp1e7ltPaRf9j6D2XK NLK/jRn/okveTvI/pIAdANBfQk3smaMcr0KkQ= 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=wjxDYbAz4IU4olfozatAjZ8MNt7cy7PprEy/RfcHVFg=; b=iFqNpFl2jCgIVRGDTk/oepvst/PAuSAAl+maRDXf8bJsKN/UkT9J+vc4kG9JMflWbW yTwDSMoMtVEH/5o/J2gomO8HM1smW3vHlhJw9uF2wSfxj4L71BCKS0VaWmENH5XdmaFF /uXmExa+kIuPGP3s2j5yLM++SE4sLCovRFWX/DtlTbLrYXovA3hd8l5jet4gcGKfFWg8 lrtcKlvn6Rhrel+U/sRS63I1lNqAsys2RsbcyxoU3LGWF0MEm1ZG3bkBIwX7XBa68nDD PHK93+iIbaxtAog673ijgVvUyPgdaAs95KsUCM/GSPbL5fBcOn+qUCdSMbKekWGK73xG BARg== X-Gm-Message-State: ALKqPweBHkMKglg9FQkOTYFzveKxLgYNG3PR1ES7nwW0K9TRTqG5Y8Sj lZfcXqPROEaWPz8w50IqAFy1cA== X-Received: by 2002:adf:e8c2:: with SMTP id k2-v6mr6454789wrn.182.1526635725071; Fri, 18 May 2018 02:28:45 -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 d125-v6sm6544514wmd.24.2018.05.18.02.28.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 May 2018 02:28:44 -0700 (PDT) From: Rui Miguel Silva To: mchehab@kernel.org, sakari.ailus@linux.intel.com, Steve Longerbeam , Philipp Zabel , Rob Herring Cc: linux-media@vger.kernel.org, devel@driverdev.osuosl.org, Shawn Guo , Fabio Estevam , devicetree@vger.kernel.org, Greg Kroah-Hartman , Ryan Harkin , linux-clk@vger.kernel.org, Rui Miguel Silva Subject: [PATCH v5 09/12] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections Date: Fri, 18 May 2018 10:28:03 +0100 Message-Id: <20180518092806.3829-10-rui.silva@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518092806.3829-1-rui.silva@linaro.org> References: <20180518092806.3829-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. Also add the pin control related with the mipi_csi in that board. Signed-off-by: Rui Miguel Silva --- arch/arm/boot/dts/imx7s-warp.dts | 51 ++++++++++++++++++++++++++++++++ arch/arm/boot/dts/imx7s.dtsi | 28 ++++++++++++++++++ 2 files changed, 79 insertions(+) -- 2.17.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts index 8a30b148534d..cb175ee2fc9d 100644 --- a/arch/arm/boot/dts/imx7s-warp.dts +++ b/arch/arm/boot/dts/imx7s-warp.dts @@ -310,6 +310,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 3590dab529f9..0bae41f2944c 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -46,6 +46,7 @@ #include #include #include +#include #include "imx7d-pinfunc.h" / { @@ -738,6 +739,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>; @@ -747,6 +759,22 @@ 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"; + bus-width = <2>; + status = "disabled"; + }; }; aips3: aips-bus@30800000 {