From patchwork Thu Mar 28 14:25:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Miguel Silva X-Patchwork-Id: 161313 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp781490jan; Thu, 28 Mar 2019 07:25:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqz5A/+/YP0iMuwGxphfN+hzEB/e+IZq3ABs2D8zfHZUxCLDinaW2hXHD+ePWps63IHJmsnU X-Received: by 2002:a62:6444:: with SMTP id y65mr33402885pfb.56.1553783132631; Thu, 28 Mar 2019 07:25:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553783132; cv=none; d=google.com; s=arc-20160816; b=uugEK9xE1GITuSR/GpDPVTfpkYe2krYcN2roCZpv6Yd8IGRxfZXGuepgVj2aZHoiob EAI6QllKaJtnVfE5b6kf3LOxqrNhbNAPU4XPl6OIunnjFDYwKyFTC89nOLNwUv+ETXsk 5PMEluwSN9Y79Z16zPnA6hFSkuHIuXfC3xPO/GVAOD0kmWXC5tS8+FckuSffCl+WWynm Q2x3RoCLiJLBp3quBuqSDBAAiUdTD2eiy4l9gXAc+kKlczFDieTdcPGlcPMouQUknLOn 7DuB6zQms9VO6Y2TKl85z2GkfDptmEt8xPFDkpjaUiJ6aynXK9sfOe3hjCpCuWgR9d+E iUeg== 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=XYqMtNPpDygEnLGuuczpX/lsgglaeL6Uf3DbIA3AsTU=; b=o9vrP3BiSoNc7n9bNpr99rlu16b+7lbaJlhBMmbmtyw2sga2aTLKxRtzDaARkY/k5s Fje1oV3Af3Ev63HDXPZsufSHJ6AKqyf62JsEdWS+4TwGN6B3HHh/dTwNEhdDFSYAUDav p+fFN71iYZSeiCzLQk9CRAiElhfuQ66kviH484RJ3G4r0k7PpsrHXqvD0aggyUxmsJ+P VmjT9wOwnTjeXYklz0552FpUmeTIq6zgyvWaGr5Gyi8jkJkTlVKmNa2I3Q9q3txHuTWm DerGS7uCYZKcpCUNHobcZy+hdTHUaw9hyhOgeiw3GHk3Ft3lFvE7O6Md1XH/HqAl5z3L fDkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fU1J7fva; 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 g6si20730742pgs.236.2019.03.28.07.25.32; Thu, 28 Mar 2019 07:25:32 -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=fU1J7fva; 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 S1726275AbfC1OZc (ORCPT + 7 others); Thu, 28 Mar 2019 10:25:32 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33715 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725875AbfC1OZb (ORCPT ); Thu, 28 Mar 2019 10:25:31 -0400 Received: by mail-wr1-f65.google.com with SMTP id q1so23178704wrp.0 for ; Thu, 28 Mar 2019 07:25:30 -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 :mime-version:content-transfer-encoding; bh=XYqMtNPpDygEnLGuuczpX/lsgglaeL6Uf3DbIA3AsTU=; b=fU1J7fva792mP3axi1M5ga16+6yyxprJshK+hriTedavVmcDp4Ef0RUBP3dfB8kFoM GAsB1WPswzAztg89B7ltsQy4ZeRAKKYZi2Deo7ZxqPYd/NBnpvwvWFQkuKc1xONYR6Ti Zde+dPvlOz5txmfLxKADT23utaHQok/b/XfNY2gbTzRUQZLPtADfhgzkBrQWR4F7+H5P E9OKoSJhX3yLSUgQf9J3NWwiKzDRVKT7m+Ou7B0lu/4aL3yYLJAAxnGqnR9wHc3FVoHN HfdrIMQNsLxQJ8J4wI3AxjWEQa4GDq/EHQnAl0j5dIBa3mxgPHBaKPFqZTF0NMrRonOO azwg== 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=XYqMtNPpDygEnLGuuczpX/lsgglaeL6Uf3DbIA3AsTU=; b=rld8x2sUAl/fgm5twP6RGXgV68aqOUTHTqHVgqM56ZWH/l+7E6mhttXDEMdXfE1qbj G0l9YqsnzlM6l+diEQmb0KDwfnBZpKo7WzJeKaFMePFRVBKqU18tJIVVbJnaDRWlqvUp fK2b7jtvT1ElH7y16W25CXNUYEjU9wF9XT7bd43ph67ieSzXn8a4fuYe6hNKjeEeoaHB 5LECL+P9V3W3MdRbKtq8KpUKwWWEgr+LVK6oxSNfdSBuFiWQP8n2wBw/mU2WdnJGW8c+ lCTXiRAP/60uaH9KifbZ94Z40MK9cQolJhFKjWP4ndUGwwyzvE74dLHsWikCtwWe+UXH I9MQ== X-Gm-Message-State: APjAAAUWPEeD2leAk1H98oP1xyeP87VY+BDuPhPR/Y+ndAViud4tHux+ RXvZZufWh6jOTeUQt5MLo79XZe0c7vA= X-Received: by 2002:a05:6000:12c7:: with SMTP id l7mr25591856wrx.4.1553783130196; Thu, 28 Mar 2019 07:25:30 -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 o10sm24021680wru.54.2019.03.28.07.25.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 07:25:29 -0700 (PDT) From: Rui Miguel Silva To: Shawn Guo , Rob Herring , Fabio Estevam Cc: Laurent Pinchart , devicetree@vger.kernel.org, Rui Miguel Silva Subject: [PATCH v3 3/5] ARM: dts: imx7s: Add video mux, csi and mipi_csi Date: Thu, 28 Mar 2019 14:25:14 +0000 Message-Id: <20190328142516.30372-4-rui.silva@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190328142516.30372-1-rui.silva@linaro.org> References: <20190328142516.30372-1-rui.silva@linaro.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add device tree nodes for csi, video multiplexer and mipi-csi. Signed-off-by: Rui Miguel Silva --- arch/arm/boot/dts/imx7s.dtsi | 75 ++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) -- 2.21.0 Reviewed-by: Laurent Pinchart diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 792efcd2caa1..3286838105c6 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" / { @@ -506,6 +507,34 @@ #mux-control-cells = <0>; mux-reg-masks = <0x14 0x00000010>; }; + + video_mux: csi-mux { + compatible = "video-mux"; + mux-controls = <&mux 0>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + port@0 { + reg = <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>; + }; + }; + }; }; ocotp: ocotp-ctrl@30350000 { @@ -709,6 +738,23 @@ 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"; + + port { + csi_from_csi_mux: endpoint { + remote-endpoint = <&csi_mux_to_csi>; + }; + }; + }; + lcdif: lcdif@30730000 { compatible = "fsl,imx7d-lcdif", "fsl,imx28-lcdif"; reg = <0x30730000 0x10000>; @@ -718,6 +764,35 @@ clock-names = "pix", "axi"; status = "disabled"; }; + + mipi_csi: mipi-csi@30750000 { + compatible = "fsl,imx7-mipi-csi2"; + reg = <0x30750000 0x10000>; + #address-cells = <1>; + #size-cells = <0>; + 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"; + + port@0 { + reg = <0>; + }; + + port@1 { + reg = <1>; + + mipi_vc0_to_csi_mux: endpoint { + remote-endpoint = <&csi_mux_from_mipi_vc0>; + }; + }; + }; }; aips3: aips-bus@30800000 {