From patchwork Thu Nov 22 15:18:29 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: 151795 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp877251ljp; Thu, 22 Nov 2018 07:19:13 -0800 (PST) X-Google-Smtp-Source: AFSGD/WyQo1H0kw/TPNe8oRmj9uRGQZ9foFqptJ51Ezm1X4rhaj5k/wKdo5hdwv8Eaj593O1bAzF X-Received: by 2002:a63:396:: with SMTP id 144mr10531902pgd.68.1542899953401; Thu, 22 Nov 2018 07:19:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542899953; cv=none; d=google.com; s=arc-20160816; b=COgeGOXDRapJt1r0oSy3Dyk1joZRGvwgDA34OJWUhB6ConAZYEO4UwqveFkfJ8+Oo7 BQPWdYnd4lm/CWtO8uZNQRAjUHirhwR5hD8YnNvhmITpz+G5rvOFpZ+K9RpyBvQ9J1pl FdsSHtXuYnIgGJESXv7nT1WjCr4GIp1eEmTzciEQZy2qDlok27sf0xLA8cmZN9NcW20A rZYyusyJLSF3PPX3WWo8bQ/K60/Jap/3GPvwjbJOSB/WpIuQxjwAj3UKg+QqOPEXdLpC gT3R/BmFBRBVSyLBW06BuY9JOAE9WbGmSaq3ooKLe3Rr28l7tlGMBinZlWj9jCpOmkFN +gPg== 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=mkaMa4XsIgCXPrhbga8BMHpGLrERSv4s9EuPQM6xBFA=; b=CsLTqFzKNyZ6qcKyYXKOLtWbk9pYaUPiyahGFDbOiFrx6S0xqXjK9QSB8IN/RWH5GA GkX7iEKFgHpJOBmEGKefhEWulzLPhQkpQedK69GK98kHIk0IHZ6iBQZ/ZZJFQ8OdekRd UvqK00zjRXMn2jMT8Lrf2HM5ePKHy1dMWMI8Z42q7RORBu0byDTXj7DT9hRoP1AxQpw9 SPaGYoxPqRSLgofRqCaZl87UXngIsbHyujv5eXN8nziHLXZ6IwW489GWcRL/Stm6Yx47 Oym5eoFT2bn2WkMPOslxT/ZauTRB5p+bGJMfXY2Zm9pFWS6q2wl6JRGw8jwVqnFyvYce aAtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="EPt/fvb1"; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-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 h3si27736717pgl.468.2018.11.22.07.19.13; Thu, 22 Nov 2018 07:19:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-media-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="EPt/fvb1"; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-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 S2437575AbeKWB67 (ORCPT + 4 others); Thu, 22 Nov 2018 20:58:59 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:55907 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437573AbeKWB67 (ORCPT ); Thu, 22 Nov 2018 20:58:59 -0500 Received: by mail-wm1-f66.google.com with SMTP id y139so9262290wmc.5 for ; Thu, 22 Nov 2018 07:19:11 -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=mkaMa4XsIgCXPrhbga8BMHpGLrERSv4s9EuPQM6xBFA=; b=EPt/fvb1tq9QWnE8OMHjKxPcoF8yb53jDjhvP78b4HjJMFENvB7Bqiwv8uyerkhbdl 0jTwp6bWvpJQ/4/3ZH5IDJqcb59mTjsxzizbIUMiMw70mvyHU6JRCohElpvS7LLKsNFv 2u3GtRbmzJKZWrF6ZkDqg32ZzIXr3vyjQPslI= 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=mkaMa4XsIgCXPrhbga8BMHpGLrERSv4s9EuPQM6xBFA=; b=TQNBP9JOo2O3En5BNZlMH1yQd05QoNdSceXAPC3NKBp27suN09LeLsrQvuPECPE9Xc hcdPStlymD4irTwoYJCkCisQk2Db1Vfbj5eMr8Q+QmG3Oi5L/2rVsMTCsBKHgP6uIIt0 iqttsfB/ccru6bE/OFlD7rv3Ps2OmqEJtXR6zJ+1uFDIe8CkTddhwCoS4fHP1cXKvNIA 6YV+n7MgNwReFbT0vO6O7dbnwJB1MKgUpbieAavhoVipAWwpPQ3bG98Ra7FKFoQE2H06 hJAazvufv3073UVlfqvnRI31M5H1rmBmlL2bVqVcRrEG36Xidyu4kj8RX2Nh79HdkjSJ YfXw== X-Gm-Message-State: AGRZ1gIRa2JIfnCXFGibKSdJGd4WfqblbFRPZLUn81LgnIZKCfc4/Wt0 ++KjxT96q88E8M2x8W5F+KYY7Q== X-Received: by 2002:a1c:6e09:: with SMTP id j9mr10510180wmc.105.1542899950406; Thu, 22 Nov 2018 07:19:10 -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 q7-v6sm4642476wmg.27.2018.11.22.07.19.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Nov 2018 07:19:10 -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 v9 08/13] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections Date: Thu, 22 Nov 2018 15:18:29 +0000 Message-Id: <20181122151834.6194-9-rui.silva@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181122151834.6194-1-rui.silva@linaro.org> References: <20181122151834.6194-1-rui.silva@linaro.org> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@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.19.1 diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts index f7ba2c0a24ad..757856a3964b 100644 --- a/arch/arm/boot/dts/imx7s-warp.dts +++ b/arch/arm/boot/dts/imx7s-warp.dts @@ -276,6 +276,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 174635a73fb6..0c495082e2bf 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" / { @@ -711,6 +712,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>; @@ -720,6 +732,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 {