From patchwork Tue May 22 14:52:42 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: 10418833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EEF466054D for ; Tue, 22 May 2018 14:54:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF1FD28D7B for ; Tue, 22 May 2018 14:54:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D384128D7A; Tue, 22 May 2018 14:54:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2E0428DAA for ; Tue, 22 May 2018 14:53:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751415AbeEVOx1 (ORCPT ); Tue, 22 May 2018 10:53:27 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:39972 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751342AbeEVOxY (ORCPT ); Tue, 22 May 2018 10:53:24 -0400 Received: by mail-wm0-f66.google.com with SMTP id j5-v6so522012wme.5 for ; Tue, 22 May 2018 07:53:23 -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=zQedFqdWKosarK3EAU9NBJ1Z6CrFguyJO5a8vN1G6F8=; b=KNYmMfgcJ6fcB5Uk6FPBYHT9ZD20oSzQyvnpNZUa71A9p3kw+4HjC6eUa+m9okuHV+ 5zVaXKCg4M6wb3Uhd9sCpf5gAqY9MofWpghdKbMGTjW0nhA+u/px/lqN8wsYtIfY4Hbo 2SGPS5gcust6j/+un+D89QU72y4kwncWgRFXI= 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=zQedFqdWKosarK3EAU9NBJ1Z6CrFguyJO5a8vN1G6F8=; b=JM7SaAHEThd0B7VNkxT4uhQ8UoZGmaZjs05UyNs7ROBH5E/1xzu/unXOncReprSfcy bTuywetoL5zXuAPk3YxE+lmAatq/EzjxYof0/noz68EAegaV5+YsRP4JoEJsU0z5EOhW 1VwCrwIeCGFPWt8kpawCRWe3Eb2kweTwPVFnI9wMaXGTB3/E4aaNESsiLH9FWfrI1CmE NFqKAu7vv/4dL2FBojxgDGNIDnu/KyZL+9OIgEeqbVhCx094H9QB1dwxzXEzH5HB3+l7 H027j6yinX2RCp+PGNsWYJsQGcfWve8MmD5bYlTpwzTqxeHK8HBfpI3y1nWWoHoOBY8p FJzg== X-Gm-Message-State: ALKqPwfBb3NC96M/85P3eePA0BaV0jXz2HXWFc+/s+mmf3CY5iqws8Ch W4T2DpUuEJdlg3kgWSuEc7Dnxg== X-Google-Smtp-Source: AB8JxZrQnl4YTo7nZXO6+nfNppOzq5fuJ0OdsGmESs+py3xgkMh4EwZYOBsam1kO4CKLeNy8wXMt9Q== X-Received: by 2002:a1c:904b:: with SMTP id s72-v6mr1445202wmd.85.1527000802850; Tue, 22 May 2018 07:53:22 -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 75-v6sm76878wmw.37.2018.05.22.07.53.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 May 2018 07:53:22 -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 v6 10/13] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections Date: Tue, 22 May 2018 15:52:42 +0100 Message-Id: <20180522145245.3143-11-rui.silva@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522145245.3143-1-rui.silva@linaro.org> References: <20180522145245.3143-1-rui.silva@linaro.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(+) 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 0b0b85438869..4fce2f46c766 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,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 {