From patchwork Mon Apr 23 13:47:46 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: 134010 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1021546lji; Mon, 23 Apr 2018 06:49:11 -0700 (PDT) X-Google-Smtp-Source: AIpwx491NgCzZRQCW4gC56ZnOON5ydi5cbpMnIMr2HbCCC1yT+sj2lssPr57sFZ6Hnq2XJFlsiqu X-Received: by 10.99.61.202 with SMTP id k193mr16956216pga.435.1524491351746; Mon, 23 Apr 2018 06:49:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524491351; cv=none; d=google.com; s=arc-20160816; b=IWSokd3ePSjbPWb0b7t2kpmYQvWJScHd4hqro40sU7+MzyiqgkTvw7PcsCrgBePK8R diYujwnaxXlhLDYM4bFHMJ3xfUd7nb1qhwu7m3Zq59qVLm/DV0DePXUj5XULCdKW1+KO Cv1oZynRz3lWVWsN8TziIO6nfIJP4nMzT+9eWC2qsvciNj4dUZUzqRSIE9ViR4p3QLjW 8c4lk/YzYRJShykGqMeYTwZ9ImmrEnoCoHZdHwrHjZ/N8RrAQKmkagZ4lCy+QD4DrjdJ tBbiq/n4JkZ+pJdHsrTGjRw4+0lKbz34+NJA7I6r3S5oTdRUNWVwFhDOAI70mkgE9c1O /h/A== 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=QsSiLLzWDyHcIOFkTA+jva2lEbVFWCo88zpFro834KM=; b=dEIAK6kNPAVwsAg13WGcyRTw5Jcj3afjEYiGLIi9kkTqynPj3/HaloFqXjpGRNLOj5 MJ8XwnyFNWNwQ5J4H3renAxcxOa0ErvznlGSOd6pk4ql5urKRrDWa92S3piu93UGtXHZ 51gkpJclBArUhgkzPPOq0UKtN8KFzyMv/Uk8WSmv+BG6NOVUcrCdpa/cX7p6XGsRI8Qm gKqZfcNxQz1ZbLxVP/Yl5txVdoFdXikUGK16CzO25hFz0C2YYXFSP6LLEjwX9Cn9ZwoJ IgmmXNRntpYbL8bKLVWdzR8iQ/7M6Gg/1nOOtvF47fbcY/2v4rhzJlraxsXaIx9rOrvH C1Zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=CC7bkH0K; 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 u7si9006758pgv.251.2018.04.23.06.49.11; Mon, 23 Apr 2018 06:49:11 -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=CC7bkH0K; 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 S1755372AbeDWNtJ (ORCPT + 6 others); Mon, 23 Apr 2018 09:49:09 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:39781 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755398AbeDWNtB (ORCPT ); Mon, 23 Apr 2018 09:49:01 -0400 Received: by mail-wr0-f196.google.com with SMTP id q3-v6so31490683wrj.6 for ; Mon, 23 Apr 2018 06:49:00 -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=PnAcr5DXt5Bt0k0aev9IWMmSisS8fGlQPYQOfb8W/oE=; b=CC7bkH0KeucHuDHt0nowPoi60+R0kWnpgKKQQkgvve17pFk1rYbk25QDtLwFP2bD8r acFgxUcZkQ1CkkMz1UMhiMjJd5ukvjV2FBpvam8iHV82d365Nm0PumBSEAG/IzjQGRE7 uCE7RxBEmrGD/hAxVzZMUIMjtM1jJeHChrPtc= 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=PnAcr5DXt5Bt0k0aev9IWMmSisS8fGlQPYQOfb8W/oE=; b=P2Nr59DGas9+cAoOBT846bIppn3P1snOr4V+kwAD24fNEM7nP+J3NY+fpVo0BX1qRD 8nitzpHR+5J++71i7ZOsbnrl5UmQqTpGI/oK3ApdZJs99HugDBVtI++DUAGtwIL721W7 P+nMan9EgV60J8xPd7rZQsx47gTmg6tTCwZuXgmg/6diD8H43esPJWBRrzkPTt+hQPQG iY3SAfjGtDB4srReje57U2cpw8OkWLRgb2Z3OGGoVnwVVVlEwcRdHHj+rnmglU0uIh55 4PuUeDFhMCrLZUTbvpbzZH1rS3KiAtNGQai/h5uWtR7MIcZgaAOQDn6SladmN92PRiMh Ro0w== X-Gm-Message-State: ALQs6tBM7OMI1qMLuhr95Vk/U930+sj1VzTvZhr0rZ3/K+jQKKwf4Nab X9/nls3ofxitRMzh3j04HlTgDA== X-Received: by 2002:adf:c590:: with SMTP id m16-v6mr17346580wrg.220.1524491340324; Mon, 23 Apr 2018 06:49:00 -0700 (PDT) Received: from localhost.localdomain ([2001:8a0:6606:9100:b159:5390:182d:7dce]) by smtp.gmail.com with ESMTPSA id n14-v6sm14680319wrj.16.2018.04.23.06.48.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 06:48:59 -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 , Rui Miguel Silva Subject: [PATCH v2 11/15] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections Date: Mon, 23 Apr 2018 14:47:46 +0100 Message-Id: <20180423134750.30403-12-rui.silva@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180423134750.30403-1-rui.silva@linaro.org> References: <20180423134750.30403-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 | 80 ++++++++++++++++++++++++++++++++ arch/arm/boot/dts/imx7s.dtsi | 27 +++++++++++ 2 files changed, 107 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..91d06adf7c24 100644 --- a/arch/arm/boot/dts/imx7s-warp.dts +++ b/arch/arm/boot/dts/imx7s-warp.dts @@ -310,6 +310,79 @@ status = "okay"; }; +&gpr { + csi_mux { + compatible = "video-mux"; + mux-controls = <&mux 0>; + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + csi_mux_from_parallel_sensor: endpoint { + }; + }; + + 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"; + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + csi_from_csi_mux: endpoint { + remote-endpoint = <&csi_mux_to_csi>; + }; + }; +}; + +&mipi_csi { + clock-frequency = <166000000>; + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + mipi_from_sensor: endpoint { + remote-endpoint = <&ov2680_to_mipi>; + data-lanes = <1>; + csis-hs-settle = <3>; + csis-clk-settle = <0>; + csis-wclk; + }; + }; + + 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>; @@ -357,6 +430,13 @@ >; }; + pinctrl_mipi_csi: mipi_csi { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO03__GPIO1_IO3 0x14 + MX7D_PAD_ENET1_RGMII_TD0__GPIO7_IO6 0x14 + >; + }; + pinctrl_sai1: sai1grp { fsl,pins = < MX7D_PAD_SAI1_RX_DATA__SAI1_RX_DATA0 0x1f diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 3027d6a62021..6b49b73053f9 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" / { @@ -753,6 +754,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>; @@ -762,6 +774,21 @@ clock-names = "pix", "axi"; status = "disabled"; }; + + mipi_csi: mipi-csi@30750000 { + compatible = "fsl,imx7-mipi-csi2"; + reg = <0x30750000 0x10000>; + interrupts = ; + clocks = <&clks IMX7D_MIPI_CSI_ROOT_CLK>, + <&clks IMX7D_MIPI_DPHY_ROOT_CLK>; + clock-names = "mipi", "phy"; + power-domains = <&pgc_mipi_phy>; + phy-supply = <®_1p0d>; + resets = <&src IMX7_RESET_MIPI_PHY_MRST>; + reset-names = "mrst"; + bus-width = <4>; + status = "disabled"; + }; }; aips3: aips-bus@30800000 {