From patchwork Mon Apr 23 13:47:36 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: 133999 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1020738lji; Mon, 23 Apr 2018 06:48:21 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+Fbslp7scLlvCsiSQSmFipMKV0hI4YLyEWbTJSJPJVrGuBdPlkSKhM7KDBtvEqkbGsfOdS X-Received: by 2002:a17:902:b28:: with SMTP id 37-v6mr20824774plq.207.1524491301657; Mon, 23 Apr 2018 06:48:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524491301; cv=none; d=google.com; s=arc-20160816; b=g5aejQhamGY2u6xrLAGHYym6M2YI2ADD1ylAhNHULVGPuK6qQNQfXbGboCaq2VkUNz OTVPp6NvCg29n8RifRnkIb0ELMK9PhFnrnU8HYfmd1Au/op7norSPBEL4RerKUi8Gutn eUxfyjMJ5XXYs/XFcN4FRFN05iOV5/M3urmzpidSreKrKTPoB55AgbIHK2+hOoFtLgXY Blv2BSTz3r5sk7RE1EiXF/F/OTWZo5nciYMiUpgAvZBSwdjH8kSxOQamRF8Px30DSGqn IIDwnlmqATNBV8PR96YtIoLyxb1LFgWJciPQcCAR2XYvLLrjxiM9kfMEnZy7jZxHQjK0 k7Rw== 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=h1KJ888bIufMR3qzucyMjy432MzzCLph2hbsWG/Oe1s=; b=gYHuTgddImNEyd5RVTcilnjV5hwoQJ6DhyIRHjJSyb3jLeRbMOfTsPb+DQL2tV1k/8 2pOZ3OkfzenzTMImJcy/aniLWaVuKx/k+3jVXuR26XfGgHKVkwjZuFmBDcqhjBRLXPrY ED8Xnqn4Dfj6k0aeo+QX7qyYKC4wLIH9vlYQwcEwJYW9NKaU9qzhkQdq/N6y3rENjFXB 2bY03I0uSNlkXtcS+a0UTvXLUwYLAB83sSpNb1+4NsVuU5rxfj+CMUoEmoewEEOIrV9Q SVd97RK0WOAeCB9HGJ7kvoqZH6ury/HymdkUF0VzvVTbCSiahXMtyAROUOJQYfebWsnl KeEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=QECVWUfd; 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 l33-v6si11556910pld.512.2018.04.23.06.48.21; Mon, 23 Apr 2018 06:48:21 -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=QECVWUfd; 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 S1755271AbeDWNsU (ORCPT + 6 others); Mon, 23 Apr 2018 09:48:20 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:44419 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755015AbeDWNsS (ORCPT ); Mon, 23 Apr 2018 09:48:18 -0400 Received: by mail-wr0-f195.google.com with SMTP id o15-v6so41476131wro.11 for ; Mon, 23 Apr 2018 06:48:18 -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=DfXCwLr9mOq3wp8mybJGL/qSHG1VGjllf7P08B/qaYM=; b=QECVWUfdCQdHAwlk7Ymw2xwhMhgG/K6XHmIA59i2aElgqtXcPs3uckt85EX44Oix0d QkfbD+t5+4TguJi4dLAUgG/ilizncSs5LBRTaSo6kUSw1zajAOghPnWQ3XoEnsk19UHN PXZ63Z9cucIVOBgsYfJpqnPZR2RKPDcnFHI3o= 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=DfXCwLr9mOq3wp8mybJGL/qSHG1VGjllf7P08B/qaYM=; b=H3GMQLYUTOPoqJLghXjus+uHlERfL5vxLkVU0FSdG6iUVp85W+JeBE5CWZlKyFGyIM keGJzLItRiVEw5FdnUm+0CU7YjpVDlF5KCygPF5l3pMCiJZy96bTHmmiRwFl0OMT2wHW rWv4cCJ6liAfyhJCWhxoFGtQ4a4+BXqFeExd4F2GzdF3rzhj26o0IyxZA37CTj9XhhzN eZF7goLyTNVKoAm8ZtrpxA5rg/Sy48VktGckjLzuRwcONCipn33i66v89Bl9Fi6VJQ8r 27ZL2FG5Fr5dzzAaYmF+8rUhD9GuqT6+0+6VE8Gx2Oay72auh23WSD5waR5jruZhCqE/ JBOQ== X-Gm-Message-State: ALQs6tDwU57t5iA7eRj8NvziYYC8Ns+4YhxpN3bCBnww6XG/8TSLn47+ lluCvv8uCuib9KxLw5ZYiFZBWw== X-Received: by 10.28.112.3 with SMTP id l3mr10289839wmc.90.1524491297691; Mon, 23 Apr 2018 06:48:17 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 06:48:16 -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 01/15] media: staging/imx: add support to media dev for no IPU systems Date: Mon, 23 Apr 2018 14:47:36 +0100 Message-Id: <20180423134750.30403-2-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 Some i.MX SoC do not have IPU, like the i.MX7, add to the the media device infrastructure support to be used in this type of systems that do not have internal subdevices besides the CSI. Signed-off-by: Rui Miguel Silva --- drivers/staging/media/imx/imx-media-dev.c | 18 +++++++++++++----- .../staging/media/imx/imx-media-internal-sd.c | 3 +++ drivers/staging/media/imx/imx-media.h | 3 +++ 3 files changed, 19 insertions(+), 5 deletions(-) -- 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/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c index f67ec8e27093..c0f277adeebe 100644 --- a/drivers/staging/media/imx/imx-media-dev.c +++ b/drivers/staging/media/imx/imx-media-dev.c @@ -92,6 +92,9 @@ static int imx_media_get_ipu(struct imx_media_dev *imxmd, struct ipu_soc *ipu; int ipu_id; + if (!imxmd->ipu_present) + return 0; + ipu = dev_get_drvdata(csi_sd->dev->parent); if (!ipu) { v4l2_err(&imxmd->v4l2_dev, @@ -481,16 +484,21 @@ static int imx_media_probe(struct platform_device *pdev) goto notifier_cleanup; } - ret = imx_media_add_internal_subdevs(imxmd); - if (ret) { - v4l2_err(&imxmd->v4l2_dev, - "add_internal_subdevs failed with %d\n", ret); - goto notifier_cleanup; + imxmd->ipu_present = true; + + if (imxmd->ipu_present) { + ret = imx_media_add_internal_subdevs(imxmd); + if (ret) { + v4l2_err(&imxmd->v4l2_dev, + "add_internal_subdevs failed with %d\n", ret); + goto notifier_cleanup; + } } /* no subdevs? just bail */ if (imxmd->notifier.num_subdevs == 0) { ret = -ENODEV; + v4l2_err(&imxmd->v4l2_dev, "no subdevs\n"); goto notifier_cleanup; } diff --git a/drivers/staging/media/imx/imx-media-internal-sd.c b/drivers/staging/media/imx/imx-media-internal-sd.c index 0fdc45dbfb76..2bcdc232369a 100644 --- a/drivers/staging/media/imx/imx-media-internal-sd.c +++ b/drivers/staging/media/imx/imx-media-internal-sd.c @@ -238,6 +238,9 @@ int imx_media_create_internal_links(struct imx_media_dev *imxmd, struct media_pad *pad; int i, j, ret; + if (!imxmd->ipu_present) + return 0; + intsd = find_intsd_by_grp_id(sd->grp_id); if (!intsd) return -ENODEV; diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h index 44532cd5b812..d40538ecf176 100644 --- a/drivers/staging/media/imx/imx-media.h +++ b/drivers/staging/media/imx/imx-media.h @@ -147,6 +147,9 @@ struct imx_media_dev { /* for async subdev registration */ struct v4l2_async_notifier notifier; + + /* indicator to if the system has IPU */ + bool ipu_present; }; enum codespace_sel { From patchwork Mon Apr 23 13:47:38 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: 134001 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1021092lji; Mon, 23 Apr 2018 06:48:42 -0700 (PDT) X-Google-Smtp-Source: AIpwx48cngmkzwNCcrsGM9vSRziq7kP5T9NZBTeJPA91FcYeZYSbKnFe0Jhbvpoyi32VS3iC8lRP X-Received: by 10.99.53.132 with SMTP id c126mr11082543pga.37.1524491322186; Mon, 23 Apr 2018 06:48:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524491322; cv=none; d=google.com; s=arc-20160816; b=POZ3O0TrTKsRHMaZKMomiCjFOqegRbTIu6wS5yGnT8l1lXdn4fdN2tPGnSbBHnEFBi b8Lq0nVG6inQdc2YLfyvJlWBiBOQaS5tLd1yFKJfgT8tbwRkMvEiTxaaYQx2NmEk+pn8 QqmJWXEQ33hfOLF9k4vG72CO/eWkca4SEh829l6/fenSaQ0eP4U0qaxOaXZMPRlCKAZ/ udTDt3SlDhYNrdQi9Fk7yT6iXNdCeAkbaBlvut3Utn/mj5MsBmTAQ/5ob6bFw//mhLgv KhmDedLtA/T9pxrpZ/olgm9yLkFdPitNhCPCHaHY5xkBpyEcddl6R6+vo3FV7cNIub+1 R3yg== 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=TXDw2nnqUaBW9r3Uq+lfdaVsT2/jSowNLh0CS/jQ66g=; b=hO0BA6mZG1Shl7nlgggDapgneHpYVDXrPQDAsYdaQ9Pw1p11JaLNEHMRrphMLWvl9O kfY/VwBcRjODwR6z4b4QRdXUi14J1LY38JZcZQbFU9y2h3NcG12xjsP92ASNL+5kQPu9 P2WdLYrt3Hy3MqCR/wSud4h9NZIOXC9yPrPo2QhcbE5rK5eR+nOBcrnwCBpD/EyzSXDP rowbMQtfzFYaiQQY6wsx0Wb93DRE8z6j4TpsPJ7NRGFmMdkNjxhes+o7jeTpH2IOcNSU EgkpiQZi2cuyfjIhwz79zylrA6GndRX/J7KvrGOVxIUnWaaESSBgrHUPl11fY1aP2STr TbNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=VpHgKwrK; 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.48.41; Mon, 23 Apr 2018 06:48:42 -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=VpHgKwrK; 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 S1755344AbeDWNsk (ORCPT + 6 others); Mon, 23 Apr 2018 09:48:40 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:41710 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755365AbeDWNse (ORCPT ); Mon, 23 Apr 2018 09:48:34 -0400 Received: by mail-wr0-f193.google.com with SMTP id g21-v6so14017490wrb.8 for ; Mon, 23 Apr 2018 06:48:34 -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=e7fq/pXcqkAya0t0UemfMY7ez5V2Vxgqm4z/yF/TrNQ=; b=VpHgKwrKPwKsxa7clw16J4w80bGqjO8pZiTXztdVJxlXF0LKENyOq6dO1ly09QwxtR gpIBuaKvazlkSt9pbL2bMTO2d1D+sVHnDN/ZfPyKfjp8kiws98EAh5TP5vKgLOMtRzWz 8ahRqlJMNmF/Ys6jp8yA1BWtTwemEH6wJPTFc= 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=e7fq/pXcqkAya0t0UemfMY7ez5V2Vxgqm4z/yF/TrNQ=; b=PFS5Zk6EJjcy2Vv2IIha2Ex6iATx0ilx9HoIQmsvT7TUTp9h4IIYoO3TwGqUHB6bYq iT9vNhLVXLfiDvCgGer73/utZArxCRmRa/IvHckr73lRbW+I/890eMnfzt9dZ5+gQdya 6D2POF3plwUhAmz+HYdRilRx4HBKjZ6XPTZewkFuwggRChCjxsunGfPe+xssmO1Zm/Yv 8ax+Dsvd2GM7gytkcIzCQANOB0uHG8RCbpmiYyxj8Zn18XKEYSMtJDgtWSmsB3fv/oz4 AOu+zHPDlv7enBMPUZdj2BBzwWcm2KsHcR5QLmIYJY4DPI77zQsTRUGw59jTztyM6otc /TrQ== X-Gm-Message-State: ALQs6tBGM5tMIbTWelOyhx9K0rTIQ8N9tG8djKs8ic0jPVwIRx+FVIcn 5PQXaDNgextC906MM7Z+LydqHQ== X-Received: by 10.28.126.141 with SMTP id z135mr9862116wmc.6.1524491313519; Mon, 23 Apr 2018 06:48:33 -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.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 06:48:32 -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 , linux-clk@vger.kernel.org Subject: [PATCH v2 03/15] clk: imx7d: fix mipi dphy div parent Date: Mon, 23 Apr 2018 14:47:38 +0100 Message-Id: <20180423134750.30403-4-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 Fix the mipi dphy root divider to mipi_dphy_pre_div, this would remove a orphan clock and set the correct parent. before: cat clk_orphan_summary enable prepare protect clock count count count rate accuracy phase ---------------------------------------------------------------------------------------- mipi_dphy_post_div 1 1 0 0 0 0 mipi_dphy_root_clk 1 1 0 0 0 0 cat clk_dump | grep mipi_dphy mipi_dphy_post_div 1 1 0 0 0 0 mipi_dphy_root_clk 1 1 0 0 0 0 after: cat clk_dump | grep mipi_dphy mipi_dphy_src 1 1 0 24000000 0 0 mipi_dphy_cg 1 1 0 24000000 0 0 mipi_dphy_pre_div 1 1 0 24000000 0 0 mipi_dphy_post_div 1 1 0 24000000 0 0 mipi_dphy_root_clk 1 1 0 24000000 0 0 Cc: linux-clk@vger.kernel.org Signed-off-by: Rui Miguel Silva Signed-off-by: Rui Miguel Silva --- drivers/clk/imx/clk-imx7d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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 Acked-by: Dong Aisheng diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c index 975a20d3cc94..f7f4db2e6fa6 100644 --- a/drivers/clk/imx/clk-imx7d.c +++ b/drivers/clk/imx/clk-imx7d.c @@ -729,7 +729,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_LCDIF_PIXEL_ROOT_DIV] = imx_clk_divider2("lcdif_pixel_post_div", "lcdif_pixel_pre_div", base + 0xa300, 0, 6); clks[IMX7D_MIPI_DSI_ROOT_DIV] = imx_clk_divider2("mipi_dsi_post_div", "mipi_dsi_pre_div", base + 0xa380, 0, 6); clks[IMX7D_MIPI_CSI_ROOT_DIV] = imx_clk_divider2("mipi_csi_post_div", "mipi_csi_pre_div", base + 0xa400, 0, 6); - clks[IMX7D_MIPI_DPHY_ROOT_DIV] = imx_clk_divider2("mipi_dphy_post_div", "mipi_csi_dphy_div", base + 0xa480, 0, 6); + clks[IMX7D_MIPI_DPHY_ROOT_DIV] = imx_clk_divider2("mipi_dphy_post_div", "mipi_dphy_pre_div", base + 0xa480, 0, 6); clks[IMX7D_SAI1_ROOT_DIV] = imx_clk_divider2("sai1_post_div", "sai1_pre_div", base + 0xa500, 0, 6); clks[IMX7D_SAI2_ROOT_DIV] = imx_clk_divider2("sai2_post_div", "sai2_pre_div", base + 0xa580, 0, 6); clks[IMX7D_SAI3_ROOT_DIV] = imx_clk_divider2("sai3_post_div", "sai3_pre_div", base + 0xa600, 0, 6); From patchwork Mon Apr 23 13:47:39 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: 134002 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1021169lji; Mon, 23 Apr 2018 06:48:48 -0700 (PDT) X-Google-Smtp-Source: AIpwx48oXvK0IK9FnEkMLLvewVGdGB/ffMBtDnefs3LgPO2x75XIEGV+GfByMilv5XV3qGXfnCys X-Received: by 2002:a17:902:4301:: with SMTP id i1-v6mr13232572pld.280.1524491328150; Mon, 23 Apr 2018 06:48:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524491328; cv=none; d=google.com; s=arc-20160816; b=Lf44PE0Ge7MuDJJcA5r4YFPhHBFS7JffEoMmpzU6VQol++Pi9mgt9eESXvd3e05cNt HuN3KJcexKTXR5itU7KIXtZv9zGhV4JA0+Nn86oGGNlp4vTS/iBOWr8xVerg6szKwAAP pKA1EMmDiboqtDuZSo8om4vwdJYq2pZjuSGEl9+hy+uHfHPeokFjnG+ukRtK63j3qO4q EQc1T16Ok0D0tg3ni3ZRkxhoRQYkc2l9uG1A8e6a2/nSnPz4MwntzrU5MRarmzyRJH4/ t4CF8NudQe/CZz437xspUuvNh3FL7UrsK2fMrOp4d2yzGl6sEQMYBlg4X09mbDjW8Sx1 mX8g== 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=SA4ktksb6pQA0uE8tryeJ81D2L75wjPv3FovsPf0Kg0=; b=KgKx2fYn2OpI7QsXET6fYKfLpysYRbYy0y/0loMDM+tsuMkGsjXQGpY/0LNeiJ2X65 sSo259gIyTg+n9Le1YOmoZU0DDHFAFEOQxR5FPfjVFfe9pL2Bb1XARrIHjR1nHKjcwnr c7cEtIjouavYaidFCyZmEWdSOOrnwbUbFsSFMkEHH/GMxSNX3GJ47edSX24U7+Erd/EH Ue150T3Tn+sBcGLXEvfxuf+rLlw94EYc52x6tr/0YBtPkBQoOWn0vl+aBNhzTZj+V9L4 7WerbO6v/AYjcQfDZONIS3Jm/6h0/W8jBwPUvbo4INFWum1OJwc91j/JOJaogSNbf1B5 luaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kmhwJnKI; 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.48.47; Mon, 23 Apr 2018 06:48:48 -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=kmhwJnKI; 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 S1755359AbeDWNsr (ORCPT + 6 others); Mon, 23 Apr 2018 09:48:47 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:45699 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755378AbeDWNsi (ORCPT ); Mon, 23 Apr 2018 09:48:38 -0400 Received: by mail-wr0-f196.google.com with SMTP id p5-v6so13701897wre.12 for ; Mon, 23 Apr 2018 06:48:38 -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=gK9A9pFQIcbAfxyJUjOYF3SIALHP3sV8LqVLGbeds3M=; b=kmhwJnKIlIDeagxfxPmy9kOh0T0V7znDWU9pQ2tRTT8/1tLgpOg866BP03BnS5L8fa dp4TnZyqCKyGjjdidzgObLgzVXW3DHsq/W+9p3lmk3s8OfZb/IXzegOE5jjRJbSLNkXz g+U48Mz+qPJ98fv7wIMxYyufVRKczC1ByNC9I= 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=gK9A9pFQIcbAfxyJUjOYF3SIALHP3sV8LqVLGbeds3M=; b=dZsVMvPMG3+y1ApAyMk7htbe6Vw+JeueOjfNX7frnLYUC03S0wq+/bWyw15bOWLg0u hYcxQ6DgYiPa8BVN8/EKfqSxl+VvcAkCpu2pRRp7Di71W0/0HhQla4wDjctZ43sM7hdj iPBmb9/Jb8RJgklxPKSQaxe5daeN/Q/qkn3EVyPklqhWfDpcbH5kFDIuK1ZkmLR5sE6H EuFKlnYIeswDNmVdIXPDxChiE+W5FBaQSZP0HWgq1tBpG7tsVE9EfACimxBFwbMaEI3V nY14dkc30C2yzKmpxkUrmBzJNxJwfIjKg9H7GtTcYO1GH2U+tdZEa5qSzCQSelOST+xK bxLg== X-Gm-Message-State: ALQs6tCHB7jaYyR99xz3okMryQArZ5LjpUC86qezkRMr5V6RQaNpfbLK +CgkCKJGJUDR7Hc7LhkCss/U5g== X-Received: by 2002:adf:9d0d:: with SMTP id k13-v6mr17772897wre.179.1524491317788; Mon, 23 Apr 2018 06:48:37 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 06:48:37 -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 , linux-clk@vger.kernel.org Subject: [PATCH v2 04/15] clk: imx7d: reset parent for mipi csi root Date: Mon, 23 Apr 2018 14:47:39 +0100 Message-Id: <20180423134750.30403-5-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 To guarantee that we do not get Overflow in image FIFO the outer bandwidth has to be faster than inputer bandwidth. For that it must be possible to set a faster frequency clock. So set new parent to sys_pfd3 clock for the mipi csi block. Cc: linux-clk@vger.kernel.org Signed-off-by: Rui Miguel Silva --- drivers/clk/imx/clk-imx7d.c | 3 +++ 1 file changed, 3 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 Acked-by: Shawn Guo diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c index f7f4db2e6fa6..9a1a18ceb132 100644 --- a/drivers/clk/imx/clk-imx7d.c +++ b/drivers/clk/imx/clk-imx7d.c @@ -891,6 +891,9 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clk_set_parent(clks[IMX7D_PLL_AUDIO_MAIN_BYPASS], clks[IMX7D_PLL_AUDIO_MAIN]); clk_set_parent(clks[IMX7D_PLL_VIDEO_MAIN_BYPASS], clks[IMX7D_PLL_VIDEO_MAIN]); + clk_set_parent(clks[IMX7D_MIPI_CSI_ROOT_SRC], + clks[IMX7D_PLL_SYS_PFD3_CLK]); + /* use old gpt clk setting, gpt1 root clk must be twice as gpt counter freq */ clk_set_parent(clks[IMX7D_GPT1_ROOT_SRC], clks[IMX7D_OSC_24M_CLK]); From patchwork Mon Apr 23 13:47:41 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: 134003 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1021204lji; Mon, 23 Apr 2018 06:48:50 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+kJwXth5ilqzvGznZK5qMRmTtqSsZ8gNGNtj6ZoB9aGZwhDVZnRSI9AgOI/XD+XKN2+3HS X-Received: by 10.99.186.5 with SMTP id k5mr17089915pgf.39.1524491329892; Mon, 23 Apr 2018 06:48:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524491329; cv=none; d=google.com; s=arc-20160816; b=nWcuSZRD388l5MpcCdpLYfnylBNwHFNDxDtjeErxyuZoSINPmtkX34sEEkVfYqW0iA WeNUndaduw6Suvq5o93GDvIFrLM5H9BmOd01rZQdibhhMy5/e+VxKQl+c0ueIo2A3u59 Ipt7SHbfQieaXtgCMpCnqSlIqDEFR5HuwNQ5z1jkZ1gfbAgx8jV1CoXJtgrs1zFWnpVA 715aBeGiIXIYMpkmQhtwvwIcMIyExFL9vgHQJSLWn23zuKz9HMoAjIlF10pVT3M6ZjVz lP/sIaJX+zC23SOAVXWUGupcHKE+oTaD9g5JYuL6zpvA/X0cQ2MN//vlEoq+JnAXYF4g W9aw== 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=wu8jKqLLfVvK3yG0d/10hftm298kW1QrKORcWI1FM9E=; b=olVvaGu+EKNYHTctUk6plICOmVNcEjE4RKZwffe2PhnyM3gskD9JF5SEBa+2pv6/+9 i8GPy6FUAxuGiI2LrQku2uWwV0IyKnJPlvbc3oSX5jgDnWf+tLr1XGaT9Ruwd6whrQ5z Ig97cMBroAng5t/Zl6BhiB8qDi0d55tOEhFDk/R+P40Z5wlnqBXJB9pDQfoAPlKFT3Lb YkmrO1KcV0CCZKbzxiggEgjYRpc79N3JJZu7l16VWdRxxE9vjboW5mBJrqLsLrBS6ayP PgTU9lLISk1CCiFrhhS2eUcS58TkfJPlIE0TT0XWc0kbT+96fV4icI6W4Cjx8s0qxXAN YdFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=II5XaFrL; 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.48.49; Mon, 23 Apr 2018 06:48:49 -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=II5XaFrL; 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 S1755249AbeDWNsr (ORCPT + 6 others); Mon, 23 Apr 2018 09:48:47 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:33004 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755391AbeDWNsq (ORCPT ); Mon, 23 Apr 2018 09:48:46 -0400 Received: by mail-wr0-f196.google.com with SMTP id z73-v6so41509868wrb.0 for ; Mon, 23 Apr 2018 06:48: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=4dvNJVABXFmu4LPVr/27O/VOJdlL05D07zMNk5h7/KA=; b=II5XaFrL7CNBO7SnoOmsGRQA7Z0BWB6yu5spiXKjD6iyQEJ/24DC3GU/EmxYbLOZSM bFcw4aA19+ym+WfbtKphl437Jp3DYlnFI3GA94kW5weY87yz5wgb0g33znge/GgU8Zor lmA9inNV0qjOSPf5trIFYlKkx0KowfqSaNjuc= 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=4dvNJVABXFmu4LPVr/27O/VOJdlL05D07zMNk5h7/KA=; b=OqDKwgqEIlUsm+rJS/l1IpZbMkpSxgsEkwSvTprNr86JoDd46gc65SmE7wAis7b5A4 5Vf5Mvl87P9OE2fc2Cnp4hwhKCnt7dUyTLI1IiJdBAy7CxssYGrjCzhw+HFdX0bfrsef AvTcg+1w+xcIZuxCRMeQc+4QsP3QW2WhixiOTwr6AC4nKoHEVpm4duLFdOZTrafw3GYp WotphQVK9zhWvq+8C1KMt5mfAbyYxDxGOi4/B5pRx5uCofAOPPdnqwEK/wxqY2eiZE2/ 6PlawMUYPgDncYjtF+0zcEPqbxnY3bpsoYBRcShmpf8Bq/S1sMBjwREtmqCRsdoFjRBz cWlg== X-Gm-Message-State: ALQs6tAPDswDuzr5BY0BT4GHcNm64VIwxN2WPlcvzUMY3OW9NKBZq2Mt 9/3kJh8NKruDC/G/GpQCrKvM/Q== X-Received: by 2002:adf:8ea5:: with SMTP id q34-v6mr16025295wrb.245.1524491325156; Mon, 23 Apr 2018 06:48:45 -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.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 06:48: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 , Rui Miguel Silva Subject: [PATCH v2 06/15] media: staging/imx: add imx7 capture subsystem Date: Mon, 23 Apr 2018 14:47:41 +0100 Message-Id: <20180423134750.30403-7-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 Add imx7 capture subsystem to imx-media core to allow the use some of the existing modules for i.MX5/6 with i.MX7 SoC. Since i.MX7 does not have an IPU unset the ipu_present flag to differentiate some runtime behaviors. Signed-off-by: Rui Miguel Silva --- drivers/staging/media/imx/imx-media-dev.c | 4 ++++ 1 file changed, 4 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/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c index c0f277adeebe..be68235c4caa 100644 --- a/drivers/staging/media/imx/imx-media-dev.c +++ b/drivers/staging/media/imx/imx-media-dev.c @@ -486,6 +486,9 @@ static int imx_media_probe(struct platform_device *pdev) imxmd->ipu_present = true; + if (of_device_is_compatible(node, "fsl,imx7-capture-subsystem")) + imxmd->ipu_present = false; + if (imxmd->ipu_present) { ret = imx_media_add_internal_subdevs(imxmd); if (ret) { @@ -543,6 +546,7 @@ static int imx_media_remove(struct platform_device *pdev) static const struct of_device_id imx_media_dt_ids[] = { { .compatible = "fsl,imx-capture-subsystem" }, + { .compatible = "fsl,imx7-capture-subsystem" }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, imx_media_dt_ids); From patchwork Mon Apr 23 13:47: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: 134005 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1021340lji; Mon, 23 Apr 2018 06:48:57 -0700 (PDT) X-Google-Smtp-Source: AIpwx4//dImzmFPD2UFDG4NPjTlBqMH3hrd26A/aP8IZ2Q3GyIjpjSUsElBLkg94M8aGOEFlVQZB X-Received: by 2002:a17:902:d20b:: with SMTP id t11-v6mr20747448ply.381.1524491337820; Mon, 23 Apr 2018 06:48:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524491337; cv=none; d=google.com; s=arc-20160816; b=Yjus08I4GKsygTVt+P92PdR/lovFbSOTtaq9II78fON/4EhytdhIJpPOIzWxCvoXbq kF0Q/aW1oLgkmfEp//By7cNUh7QfLK+Xi3Jm7FkMndes86qiOIktYRwRxyHKDhf/oYkH /iIXUelaHI2GMp+x7wlFIA+07zoKeHviiMuDMa8fVGy7J4vZasG/aoIjOztmnTFi2RYi FlsdlvqXPo0rP/6vv68Arqe/KwvuknZQx0TMTpwOEu73PhxDdUS1gubkBno1EJwYHcQW 9f40Noei41/bT7X/cY+0J5HcBsydSYe8iaTljyKsOUiPfcmuQ2wjMDZmzqLeHjKAy0JZ oCcw== 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=wPyu3heAvVDvohwOt0GuYOSAGsubJnwvhZCZekGEaYI=; b=VA1PR4YB7nMTAtX2f0x3PYNGXWer9IBMLTXzDpwqdzxgrgjBsjUpTpj4FJckH6u6tC PTtKwJlGFYLsbN2TIzvG0tqdWJ0SORvtvDsgICsdNtxpqqR0gksfiniEuDA1WUYVI9sb gwapP6lpZgrFL49R+p+p7gtwAqTNKaWbHCHus19L2JwfzPdXxf4V21PcV13vwVcwtfDK WZSUXZXD1tlZU3CpO9Inj7fduep7IZPVJFHpy7m+Cn4OF49DCeepkdHR6ovPeVbPLJLa 9QUpSjyH4TFk6wesIHzGHw+Q0jVHvSsiZKn2KK8vvJXPbVLfTwVbZluAj9DVz6oehm1n oYvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=F8YDuFwK; 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.48.57; Mon, 23 Apr 2018 06:48:57 -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=F8YDuFwK; 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 S1755401AbeDWNs4 (ORCPT + 6 others); Mon, 23 Apr 2018 09:48:56 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34615 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755378AbeDWNst (ORCPT ); Mon, 23 Apr 2018 09:48:49 -0400 Received: by mail-wr0-f196.google.com with SMTP id p18-v6so22305622wrm.1 for ; Mon, 23 Apr 2018 06:48:49 -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=iYeH3velqK4JMtXvVYuTWojZ5yd9g77mW6Ku0eB1P38=; b=F8YDuFwKg1eGwiMwIUiX55kTOGvKLRAjtu1ivmR2PtA6DsLE+ATfTwb6f01sdaCsKa oO9cb00/uAWdOaUoHxRxVv8DDRPLY1TO9Hf/sw1Jnw5bZJ3ZWnZtGKJFQZryw1sWjzOJ WOsNwIBabT58AheGccROjiTxhw5dZCuRDQdTo= 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=iYeH3velqK4JMtXvVYuTWojZ5yd9g77mW6Ku0eB1P38=; b=tHN0ocymBP8Sdwh4o64+iCqdEW8R3etVid26H3+JM4cjqB+XgQsk9RKch6JtiI616E ru+aFGOkpoG993D4rgJsAzM8N4p8hnMr76c5HsFC8WsP5ajipt6mB4199E/k7GAI8KqC GH9yVnScoGQlw3nKMhC91hZ16ELSDS1I9f8KcSQ7fG/LdD0EfwQAjBF0VZ9etxsONVbs Mel31YVWYUvubIfQ8vM1CoUIwvbGEUHWY3AZ0h3sAElh6rH2eB58U/KhWVdpIXhC2jsH ttD3+MHGg04PVSB6xswL634KiG+ICyZ61yfU076z0wcx/upOEu/Z6Yusr8v2h7mTMAMk RvEw== X-Gm-Message-State: ALQs6tDYsjJ/BG30rXl2ROmEtW4jXSTrCMRfGYDMqhG60iESfoH5B1sL JEMT4j8EGbR9bojD+xRjSmbOlg== X-Received: by 2002:adf:8827:: with SMTP id d36-v6mr17278143wrd.41.1524491328486; Mon, 23 Apr 2018 06:48:48 -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.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 06:48:47 -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 07/15] ARM: dts: increase default cma size to 40MB Date: Mon, 23 Apr 2018 14:47:42 +0100 Message-Id: <20180423134750.30403-8-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 To support camera in i.MX7 the cma heap is used to allocate frame buffers. The default size of CMA is 16MB which is not enough for higher resolutions (ex: 1600x1200). So, increase the default CMA size to 40MB. Signed-off-by: Rui Miguel Silva --- arch/arm/boot/dts/imx7s.dtsi | 14 ++++++++++++++ 1 file changed, 14 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.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 4d42335c0dee..142ea709d296 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -182,6 +182,20 @@ ; }; + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + /* global autoconfigured region for contiguous allocations */ + linux,cma { + compatible = "shared-dma-pool"; + reusable; + size = <0x2800000>; + linux,cma-default; + }; + }; + soc { #address-cells = <1>; #size-cells = <1>; From patchwork Mon Apr 23 13:47:43 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: 134006 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1021413lji; Mon, 23 Apr 2018 06:49:02 -0700 (PDT) X-Google-Smtp-Source: AIpwx48wMBEzOb05XR8MH3xFD9VMDvKBElsu12/RQqg00/FppmN3qFfO6ePlFDb0R/OW3iYcPawx X-Received: by 2002:a17:902:76c7:: with SMTP id j7-v6mr20902461plt.108.1524491341883; Mon, 23 Apr 2018 06:49:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524491341; cv=none; d=google.com; s=arc-20160816; b=IREhj/lOywhPSo3bei3Bmu05vug/+KtTkVEhdbnhp/L9xVb+KmZKuC1wJlEW1VIOlt dtbURUSz0BxTpBOhnxdZ6DoKjOddOlCkGsSsBKwcCjBH5UpzSpr+LqPTdIerDg3Vrgf6 BudWIef5lJwmMJxRRwMRGN7jOU6fZP8Ey/W1/LLIk8sqIB8Puzs5atoKfifCjqwhP/BM KYSg+oWLt5/dsF8mXRLfzzOVkHggSIuCDnluMHEfh+QouRiwobxHetdwJEpP03wQQlBS /LkknG5JC68m/x+QAlbcxljl/Ygfl3jiPH/72ZP8fzAPW3iCIr4Pi+xiVmmDBOW2P0zU zFeA== 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=sQauwhWoowFsXEJ6ngn8m09dd3u8QMhsbyv/DzFePtM=; b=um0TGF1q/jmgyHybB3xT5nLK9Sj5BZohPWXz4v3jy55J27AsbHpZK0U4X4kb31efHt DRBO/xqW98Q49Kcfl/RlCNiTYYIrBw+yseFTqYpsHdgiiXNRZEROmtwDoYkeRq5iLsHl Hhwf/g8ljFw/w6YoNdHly3xbTMgjcVwR1Dh3jfXkj077bwZMDoBEyTBK7H66PK+No033 BB5EFbZGz6PvrGXyT5HKwcIL7Y1yZ+YQVVbhibSNxhInWAbmuXWr8tLIpAmt96z0gyW+ zLuLcRmVEKdqZkITzTWTchEqMfdP2IMvLwkAG8ou8sh5SwL22d6E55zFdhreWh9Vo/9F jrqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WZqtAwMU; 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.01; Mon, 23 Apr 2018 06:49:01 -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=WZqtAwMU; 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 S1755404AbeDWNs5 (ORCPT + 6 others); Mon, 23 Apr 2018 09:48:57 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:44592 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755372AbeDWNsx (ORCPT ); Mon, 23 Apr 2018 09:48:53 -0400 Received: by mail-wr0-f196.google.com with SMTP id o15-v6so41481637wro.11 for ; Mon, 23 Apr 2018 06:48:52 -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=1F+4IyAw0MdrYyLQnQYcRWIcFqp2OVMLHF9ubgEztHM=; b=WZqtAwMUjT4sdhx1Q9o5xLBWFoWnw2MWBsqbsJ0/PyB7fdw0mcQsAOOiaPTAcJs9T9 yBfdXn0W/IMynXBbgoRrRrKNcnRRXld2bpeeIO73+SlDp5xKkIuRdN5BzmljluRmSL60 K1z1KqfC7LNBGBTOxYaXFh+8qQNItup6dOWjg= 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=1F+4IyAw0MdrYyLQnQYcRWIcFqp2OVMLHF9ubgEztHM=; b=DLh25lEKLHYB2hbDDga+vbHEaYk6EEqmaE3Rj84kQDqHxG9V8YAuzgqFApI1QXLHJ0 VoKJYuNNFUTqDXiYMPpyRv23unXMqoxwq4GeW/pSu1SluvFaMwvEiQgVl5d4eQw9gc/Z ecg9APEizn7ZLQrZGszTqfI84yH9LdMWcyPSCNeERBdTg0RJhMzGEwvVzUc4EpQonow2 4nVHWk0z3DNuPOjaSFiSw23RZ3asqiuNFpq0IGPJt88SoRGt2XUEK7gnLcoGB3RjZCv5 8UFaEvatfYI0O5joNnJYpoBIdDZRCuY9/1SMiQKKky2Y2lZIbrAwrD25VlLDsn8u+xwR uPqA== X-Gm-Message-State: ALQs6tCJbiwYWU9hZKx7N0foClkle3p/ydKOtAaNL45viNfRVDNrAhQn u6nnNUsnlaRVNlPPtm+fyL73nQ== X-Received: by 10.28.168.77 with SMTP id r74mr10006872wme.114.1524491331731; Mon, 23 Apr 2018 06:48:51 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 06:48:50 -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 08/15] media: dt-bindings: add bindings for i.MX7 media driver Date: Mon, 23 Apr 2018 14:47:43 +0100 Message-Id: <20180423134750.30403-9-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 Add bindings documentation for i.MX7 media drivers. Signed-off-by: Rui Miguel Silva --- .../devicetree/bindings/media/imx7.txt | 158 ++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/imx7.txt -- 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/Documentation/devicetree/bindings/media/imx7.txt b/Documentation/devicetree/bindings/media/imx7.txt new file mode 100644 index 000000000000..7e058ea25102 --- /dev/null +++ b/Documentation/devicetree/bindings/media/imx7.txt @@ -0,0 +1,158 @@ +Freescale i.MX7 Media Video Device +================================== + +Video Media Controller node +--------------------------- + +This is the media controller node for video capture support. It is a +virtual device that lists the camera serial interface nodes that the +media device will control. + +Required properties: +- compatible : "fsl,imx7-capture-subsystem"; +- ports : Should contain a list of phandles pointing to camera + sensor interface port of CSI + +example: + +capture-subsystem { + compatible = "fsl,imx7-capture-subsystem"; + ports = <&csi>; +}; + + +mipi_csi2 node +-------------- + +This is the device node for the MIPI CSI-2 receiver core in i.MX7 SoC. It is +compatible with previous version of Samsung D-phy. + +Required properties: + +- compatible : "fsl,imx7-mipi-csi2"; +- reg : base address and length of the register set for the device; +- interrupts : should contain MIPI CSIS interrupt; +- clocks : list of clock specifiers, see + Documentation/devicetree/bindings/clock/clock-bindings.txt for details; +- clock-names : must contain "mipi" and "phy" entries, matching entries in the + clock property; +- power-domains : a phandle to the power domain, see + Documentation/devicetree/bindings/power/power_domain.txt for details. +- reset-names : should include following entry "mrst"; +- resets : a list of phandle, should contain reset entry of + reset-names; +- phy-supply : from the generic phy bindings, a phandle to a regulator that + provides power to VBUS; +- bus-width : maximum number of data lanes supported (SoC specific); + +Optional properties: + +- clock-frequency : The IP's main (system bus) clock frequency in Hz, default + value when this property is not specified is 166 MHz; + +port node +--------- + +- reg : (required) can take the values 0 or 1, where 0 is the + related sink port and port 1 should be the source one; + +endpoint node +------------- + +- data-lanes : (required) an array specifying active physical MIPI-CSI2 + data input lanes and their mapping to logical lanes; the + array's content is unused, only its length is meaningful; + +- csis-hs-settle : (optional) differential receiver (HS-RX) settle time; +- csis-clk-settle : (optional) D-PHY control register; +- csis-wclk : CSI-2 wrapper clock selection. If this property is present + external clock from CMU will be used, or the bus clock if + if it's not specified. + +example: + + mipi_csi: mipi-csi@30750000 { + clock-frequency = <166000000>; + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + 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"; + + 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>; + }; + }; + }; + + +csi node +-------- + +This is device node for the CMOS Sensor Interface (CSI) which enables the chip +to connect directly to external CMOS image sensors. + +Required properties: + +- compatible : "fsl,imx7-csi"; +- reg : base address and length of the register set for the device; +- interrupts : should contain CSI interrupt; +- clocks : list of clock specifiers, see + Documentation/devicetree/bindings/clock/clock-bindings.txt for details; +- clock-names : must contain "axi", "mclk" and "dcic" entries, matching + entries in the clock property; + +port node +--------- + +- reg : (required) should be 0 for the sink port; + +example: + + csi: csi@30710000 { + #address-cells = <1>; + #size-cells = <0>; + + 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@0 { + reg = <0>; + + csi_from_csi_mux: endpoint { + remote-endpoint = <&csi_mux_to_csi>; + }; + }; + }; From patchwork Mon Apr 23 13:47:44 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: 134007 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1021430lji; Mon, 23 Apr 2018 06:49:02 -0700 (PDT) X-Google-Smtp-Source: AIpwx49rDL5w+ZrOmr9GWfHoChmCAqDaqLz0U1qjdzfFec++HeRLjw0FLOLzJmQncPnoRZ0ZQVlE X-Received: by 10.101.70.72 with SMTP id k8mr15051284pgr.47.1524491342720; Mon, 23 Apr 2018 06:49:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524491342; cv=none; d=google.com; s=arc-20160816; b=wcpAvDCyYtCJ2qeosq25b3tlF5uf6w6rQbH6SfvwvQUJyW67WanSdm4cADXn6wf0IM HqHmzhIk5CCwSZj320HsjCpJpdCdOdVAEs4W07AqLXHjLwmHH2PeBNRSeE8sR+nhhrpp U6WVt9J/T8erA7/UGY1dwL1RQs12hTM9+Q+StCy7VP7Gn5nmqfLeb5gUQ1e4bsrCNi+P dFowJOD8eqtN5lVFxiv7WK5IoSjbSXDcNX9iv+wREcX2utraGBp5KVhXklzdXtDNI9Iy J7c12iuPy8cd3n1PYKCoJIK5tsEOnorIammvgZxvQI7JIHDh/j78p2ODLQ4M3/ocSnou vBFQ== 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=E+1odcX7WASAlC2BnMrOsn32ideOFZ1K4IHHeTux5WI=; b=Z4csEcwIdBZviiYua/j0DDbLt+RgWrC4MHNbQ78fI/6l6VS0MM/qIVj9Lyv5SFtQee fXyPY9wT+KL8qI8mmiovQRDhnTt2vsIzVFbuLU5pB5w6OartPw+hTlZAMa5kkMIbcalt 1NbnsWU9DclU+TbjAhUm8EtC+eTQd8GAe/ShXateocgL4hNx2glIPHuywkoIQ8MLMIJX IXsApAE+6i0VV7WUfjNBXQvm3HZ98ghel4wT5qA6uji1hIxUqTHC2EaQ10x8o6mH10wn Hbn2kLGGdGNabcYzvdlN70YktOwy4tmUuA2/Ur5iF+ebsf5IBWa5NM3zCUN4yJaRyrXh adcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=aBUnvOs6; 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.02; Mon, 23 Apr 2018 06:49:02 -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=aBUnvOs6; 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 S1755126AbeDWNtA (ORCPT + 6 others); Mon, 23 Apr 2018 09:49:00 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:45779 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755371AbeDWNsz (ORCPT ); Mon, 23 Apr 2018 09:48:55 -0400 Received: by mail-wr0-f194.google.com with SMTP id p5-v6so13704517wre.12 for ; Mon, 23 Apr 2018 06:48:55 -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=OEt0xlEacP/3Wq23BkPMp22Uuxu67D8c9piS3omUFA0=; b=aBUnvOs63xpo1EnTAzqxSt3L5e3a0Iq9IAS3a0muUfnWsxSYGVpuVJE/evgfHY7mhs 8Ih7QMiGfY3znnyka8jrvyMROmtS2gX+zmj+BKPIq7sEvQmKafZZZiLtmedUjUOqORK+ ElR9YrNICsXuZdakXDkgF0R1n4PnMog95jFhA= 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=OEt0xlEacP/3Wq23BkPMp22Uuxu67D8c9piS3omUFA0=; b=ejw66Ju3jPrSSYgCVPdiRZuZ9kr6yrJ2yV4t0cm8Awd7ONNEhr8g9yrcqP6xfU9iwJ CUQ6dSa8xY5t67YbAzi2oFd5/B5UlS6572MljTMdVRhlKh7qMNLkcO+6VRp+9ku9SMYd jcswI3v5CsCssoOLRD9VSEuh871aUFmybS42MWwhffSEMLsU5JdY7Pjo5KgUbL8aTbhr mGV5F4V53+Feo8M/HAPGj7sG3pUb/fPr6k6PuQnjP5DhCQe7WAV0s6SgzK7Qy1aHYdWI DcG+/pxlvItnXw95hnUZsF7D18BgSFH6IlXUND1ChRVZ6jYawPw0kaYhDr765Ls+WvIM ldDA== X-Gm-Message-State: ALQs6tBI87LktMtw8NVJg6huJtomKrb1C4E/xy4NpqCAk27guAOBquHb rusB9BWGpDbK+j0cAmcO+h7/OQ== X-Received: by 10.28.138.13 with SMTP id m13mr10402397wmd.66.1524491334435; Mon, 23 Apr 2018 06:48:54 -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.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 06:48:53 -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 09/15] ARM: dts: imx7s: add mipi phy power domain Date: Mon, 23 Apr 2018 14:47:44 +0100 Message-Id: <20180423134750.30403-10-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 Add power domain index 0 related with mipi-phy to imx7s. Signed-off-by: Rui Miguel Silva --- arch/arm/boot/dts/imx7s.dtsi | 6 ++++++ 1 file changed, 6 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.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 142ea709d296..d913c3f9c284 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -650,6 +650,12 @@ #address-cells = <1>; #size-cells = <0>; + pgc_mipi_phy: pgc-power-domain@0 { + #power-domain-cells = <0>; + reg = <0>; + power-supply = <®_1p0d>; + }; + pgc_pcie_phy: pgc-power-domain@1 { #power-domain-cells = <0>; reg = <1>; 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 { From patchwork Mon Apr 23 13:47:47 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: 134009 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1021536lji; Mon, 23 Apr 2018 06:49:11 -0700 (PDT) X-Google-Smtp-Source: AIpwx49qUNnvp9vqx7u0A0QamEeMM+brPaHZcVCA2snsO8MrBZQrndjjOmtvBhqk5XzuZryhpWxZ X-Received: by 10.101.69.1 with SMTP id n1mr16765714pgq.175.1524491350984; Mon, 23 Apr 2018 06:49:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524491350; cv=none; d=google.com; s=arc-20160816; b=jQKdB45wg2rZn5DjjC+0+RsZ+9C6pWHI5ptGjr9ZRLSmhveHfISDoz/46HwxYr4r0H XT4riiai45pij+WTLRIJFyVAr/+1tS9nHXdSFlrs8RPiH52bDbixtViMiBbUO1EEzdst 1BGv8RFUiSLK8OJSr0l29LV2JNh5DcQrLf4Fp+LcMwjzMSCbycoN7vtnBRzW4uESdJWT aDfypzSV34PAsgoyxhhVX+V2AnwidyBJYll9Ia0UhiSkFIizm7ZgG/Xm55pzsQjjaokI F/+H6RZEGaHwtR+gPU+HJmwWvpZT9pYhN7r3Mk0zpNqNy+1FbR974mM8ysDSy/abZjXM 315w== 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=EDUJoJurkUIAxswLyvCwOcjqpj7fPIb63eRvHjjtdLk=; b=rTVcHBiQ/ktBsmd+ckzajXjeX+2zlnwFWcRqXfYOQHMtiXDII7Rn4iXOKgHqUF55JJ +0Gq7gw/bFKM8157ESmzKee7bGnKNhBMqxA8kBtHUDksrGHOmUR1dt24kTagFDAomYbF g/9hGZ2Gn0NZvVjitNK9xG9282hGply9x33JoLc7EQ9+RT170wecyyftOsRA0dItvDf5 AclLAwYzMq58o4H+uluHoL2Zt/daiwC4OkTZcBSJVdSeCjFXK10Yk/i0nEJmoBo5dAb5 /3HhtMnQ0geIRNkKHKjqK5hiQSnfopPktY4xRIxBaU206L2faZcPd3Qbx+gAaVKohm27 ECzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=cAwCgLkl; 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.10; Mon, 23 Apr 2018 06:49:10 -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=cAwCgLkl; 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 S1755417AbeDWNtH (ORCPT + 6 others); Mon, 23 Apr 2018 09:49:07 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34691 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755410AbeDWNtE (ORCPT ); Mon, 23 Apr 2018 09:49:04 -0400 Received: by mail-wr0-f196.google.com with SMTP id p18-v6so22307979wrm.1 for ; Mon, 23 Apr 2018 06:49:03 -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=KBTrgqD+3e+qE5mEOObEOY1QSgt/YloL5yxmAaFB1lM=; b=cAwCgLkl5aTXr2cfQSRExGLseRnoPFnOip7iorjyWbuJy8ExQKqnyqy7wu5rRdtndQ OOjlA/IupFUPs00ERL5VZHfKVA9hBh/0mZlModmXzX7u49lnxGVL9O2wbqvRIce1EsAc Wf3oNn3jdYCo1Sk7W3aQd/bNr1vVIrhEXU29k= 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=KBTrgqD+3e+qE5mEOObEOY1QSgt/YloL5yxmAaFB1lM=; b=A+Ybs2HNVKPppdWB+gWD9CcPSP0Bn+5QggJj+xUjSTPPghZQHhcDZMr9EB8Vx46AfY cqbeN7qFOfRvL3+R77Y+dykNvOq8iGZ6o9vRrUEiik3rtvnob5uotu0MU+aaP+81xrGv eU0RiHRWzRAZuWNs20iBQ4BgCA4nCmoH6K14AqS8iYXvP5SyEV6ksSRi4sJdK49n+NA4 ZiFwcPOrxa0uyE9tLocV2sVzN4kuQjFXlaufUIeI0A/BfRV7RHvwBuymNZFSsGpsaI8p nGb4xkT2b+Hg2UDO6+60JEHKze+QnLQ4jsQrRHX9V42RSohkhttf4EvtENYQKQjHFSpb zH3Q== X-Gm-Message-State: ALQs6tDzHEI9OY3Io98DFAM+/lPQvc0CXz0RruK4WtHMZ5566NRkDhFI 21laMWjQL2YmNJJNkPz9o4jc8A== X-Received: by 10.28.210.193 with SMTP id j184mr7097286wmg.14.1524491342968; Mon, 23 Apr 2018 06:49:02 -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.49.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 06:49:02 -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 12/15] ARM: dts: imx7s: add capture subsystem Date: Mon, 23 Apr 2018 14:47:47 +0100 Message-Id: <20180423134750.30403-13-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 Add media capture subsystem device to i.MX7 definitions. Signed-off-by: Rui Miguel Silva --- arch/arm/boot/dts/imx7s.dtsi | 5 +++++ 1 file changed, 5 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.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 6b49b73053f9..333d9fe6b989 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -1189,4 +1189,9 @@ assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_500M_CLK>; }; }; + + capture-subsystem { + compatible = "fsl,imx7-capture-subsystem"; + ports = <&csi>; + }; }; From patchwork Mon Apr 23 13:47:48 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: 134012 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1021662lji; Mon, 23 Apr 2018 06:49:18 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+Ru9peO6PREQCJIkaITpcHDoCf/HJt21Ouaj4kn6pfbRxHuFO6P6Ez2FXBBO7OOysKReot X-Received: by 2002:a17:902:76c7:: with SMTP id j7-v6mr20903238plt.108.1524491358600; Mon, 23 Apr 2018 06:49:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524491358; cv=none; d=google.com; s=arc-20160816; b=WkSp6dXOs8xnYU9BZJoTM1OOBMpjp24+1ttKwhhZ508PPLKyXJ0BP5v1tbIQg6AljN yCjoOkAlM6XUtGP/oJg/VyT+9KaRLgcpkCQD0UnlrqnACXlRmRwE3wmEHY1shGnFQ2TP fy6KWJXojhCdE4s5idpXApfsBf930rjLP21jqMnLjBbJ3nPmZnvLz3n7+76/5m8DSu59 QISGBlO14GHomACpimoPw7rrB0Gr0Ksk7woXoS5DpIFeV1y+m30QOduSXkolwAK4Xkvt YGZg0xbsLRIS7HZjsxdqZJ1/z9WGV+ot3WHcIqm+I9CGPYCiKeY6kmp/Z9L0PPkxh5qK W+gw== 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=XUfjekUjjg8Mw5d2BBPsd8ic7nILkAFRCbPefK0IeI4=; b=TAkfR8L5/bMRJh9oXqEXKbF70oYJM2SWyOpNDjlsWhtObdLp+d4fydtVb7ncep4RhR hj/VnoZiwf8OXynk4jC463QrdVT0Hp4faUPbvgHJWQVAQRrux6WUP1nmhwV0M7kcmXUF hIaIawHbjOUzEX6Fk1zudHg+1b6yeb506bsgOiCGrsqfa9mmnGy4gUJZ31jHPfs5/5/Q Hq72UyGpUagba3DtWiTjx62mnr7/XD6th28Uc9PlnX80WFUiSmIxNo8z3xOwurkQnF1S rC8fyYW1+SjUKKnMJSaM58u2alUv5YEqfA50qCeJhSJY9G76rna4Ezt3gBt3Z0tO73et WpCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=FoUOx9BW; 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.18; Mon, 23 Apr 2018 06:49:18 -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=FoUOx9BW; 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 S1755410AbeDWNtQ (ORCPT + 6 others); Mon, 23 Apr 2018 09:49:16 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:33112 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755238AbeDWNtG (ORCPT ); Mon, 23 Apr 2018 09:49:06 -0400 Received: by mail-wr0-f194.google.com with SMTP id z73-v6so41513158wrb.0 for ; Mon, 23 Apr 2018 06:49:06 -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=gFuAczjEbuyD2DWqd38zh9V+txYi5hMX/K+kdtL3EQY=; b=FoUOx9BWQ6MxgJdhCW2rxWdLLej9eJUUgjfZ0n0ibeBAdYkOB6Rxs1RzpBrQLNOHOn hSPJSZBcednUScFzSwFYJLQxPo+2OQr+ITMBz9oW0cNadqtctnlPxQqJMLyu45d5m38z 8IxcZy769OTQkx636nTmSFZMD64AC3p/OjI+A= 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=gFuAczjEbuyD2DWqd38zh9V+txYi5hMX/K+kdtL3EQY=; b=RTALVXB7OeE3hT72i6gPJNOM94yclc5LtHB7lnXiiD81qKJh+KQoJirV0xp80kWcb1 7tl6TivUW1Ju3mmcWZPBA7/pVXAhnCgJYo3F2LugWO8FSkoXrryALzup66U8WIs+QU/j klTMHRGywnDyyheyHtPDmrr+tR7bH996r8L7vtVRfQNpanzAtjprDZGGZKqffZlM3Ose 2x0UtVd+FJoNSZmUzh+miKwJsJK+/Jvd78l4NpKiaRIh6l8vTBZLJOxJ9pystJ6B/opS aYCx3aoXx8t51VVCxZfRHfgwVG/514Rr80ZFCg1dKNiUVoq5zZ31kLsJUFeZb0LjbuEI 2PwQ== X-Gm-Message-State: ALQs6tC4zNuWkGgDaZiI1hKz7XPS354FpOGva9iqKnB/BymFfxZt4Dyy 3izMQ4sCZGw7G+bnH1I0VkKf0w== X-Received: by 10.28.112.3 with SMTP id l3mr10291960wmc.90.1524491345487; Mon, 23 Apr 2018 06:49:05 -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.49.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 06:49:04 -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 13/15] ARM: dts: imx7s-warp: add ov2680 sensor node Date: Mon, 23 Apr 2018 14:47:48 +0100 Message-Id: <20180423134750.30403-14-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 Warp7 comes with a Omnivision OV2680 sensor, add the node here to make complete the camera data path for this system. Signed-off-by: Rui Miguel Silva --- arch/arm/boot/dts/imx7s-warp.dts | 16 ++++++++++++++++ 1 file changed, 16 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 91d06adf7c24..d80e9af768b9 100644 --- a/arch/arm/boot/dts/imx7s-warp.dts +++ b/arch/arm/boot/dts/imx7s-warp.dts @@ -218,6 +218,22 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; status = "okay"; + + ov2680: camera@36 { + compatible = "ovti,ov2680"; + reg = <0x36>; + clocks = <&osc>; + clock-names = "xvclk"; + powerdown-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; + + port { + ov2680_to_mipi: endpoint { + remote-endpoint = <&mipi_from_sensor>; + clock-lanes = <0>; + data-lanes = <1>; + }; + }; + }; }; &i2c4 { From patchwork Mon Apr 23 13:47:49 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: 134011 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1021619lji; Mon, 23 Apr 2018 06:49:16 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/09YU/jCK0REAdDWFHIuQNcsEbBnV2dEedDoduvvvcYdqlPOQh/cT7IdlLoeLnxXzFqtDf X-Received: by 10.99.185.74 with SMTP id v10mr17174713pgo.372.1524491355967; Mon, 23 Apr 2018 06:49:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524491355; cv=none; d=google.com; s=arc-20160816; b=s/pk4iY0qqoVPUGMIv/q62982WbBpfyJ2sSCEoFqsodbfmA59VJ+uTR6SIboI246xi 45kgMw5euawgtKIUbc1mC53WZgifpis6icQ3A1+8A/6i70V0wyYJ4nJIdPIslrffHsxR Om+gifV0g8toXG7joY9vH6KSJD7jH/AS0ZN/QDfX9VDxKxXVXtHQLGIsQcvlD4HisDvC buNuPjC5YHwmnn+3CkmurgC+RIEJeKWY80J2n3d9XToeIZrFs78s5mR5gKKuavf4Lsbk qZmmIGn0COWB6mcA4Aw5imQIXVmUPC/euWLVG01Pj/JeonteV1cMv7AF9sYsl2ZW8Pw5 jgEg== 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=IZlL1izQ1PXTsYfR1ata6cZ5afDafsRaFs14jeyhV1I=; b=vBDTQMgT7gNZw4y9vjkRfMCO+VI/hlzYOipsZLmQwlHET+y7TOi1h0fRFeXKvw+rVX drafo1SQ5tauClSu+WXscNbczuOhq0x178VtbKMF9ZxhUQmPgqRfzm20zxErqg2KVw1L Tdhyy8ztSm6g67Hf0RLI8D58PN6JToXiKctSBpRrvMtDt5/eMFDj/5VRfAsdi+8SyVqR w02BglMDpT7RNseON7dpvqhp9p2r6vvqy89BNdsfdrnFxTqiLhN+KCgUpXytjE8Hk3L9 Zv/n5mmrRg2ihbfeLdUUgNgqfr39fu4jiZ7qUbDVzTSBwpNu7G/CywoAHwCmHml9o8Y+ PaFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=gFADQCSa; 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.15; Mon, 23 Apr 2018 06:49:15 -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=gFADQCSa; 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 S1755275AbeDWNtO (ORCPT + 6 others); Mon, 23 Apr 2018 09:49:14 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:43439 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755277AbeDWNtJ (ORCPT ); Mon, 23 Apr 2018 09:49:09 -0400 Received: by mail-wr0-f194.google.com with SMTP id v15-v6so23391575wrm.10 for ; Mon, 23 Apr 2018 06:49:09 -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=xqDB+wJgdnken53wSy9TUWUI1dKxrBpe4AGVjuPv7bo=; b=gFADQCSaajG2OjSjAtF/MqmN2KnhtYmO4MQlNi5Tz+DXzT82q+ly5V+jVTjr/3U13L +FlUCX+S65qd3+iXWul/NWCl8OewoDGO7z+PO23xjjRdXGI+jvxxuBL9hU8yHbPMRBQN OFYlb8MbPyUldNqvXZDC1lp1xfwS0LN3UXeyE= 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=xqDB+wJgdnken53wSy9TUWUI1dKxrBpe4AGVjuPv7bo=; b=McdIU5yjNSC7j2P91cDhVogDC9mRYGVW1I4EUUnJ/nIj7wmR/DXwiUiw3qotT5VUT/ oVpk/0fJUNaV1CLnZDN/52u31HDpO4KeOOwfR67RhwzFclas/uhlhY0VVSPATvK/wThR 0j0oE6eywT1JtGtCZ1RgBDOx/Buoqg+7Mm7XckmVnZEVTqEPdhuQSD5w9hCRtHJmKq9d ssyWrXc6VAzP5X7p0n3F273I4mJDdGkRiz3QC09slRCWzOKHaF2Rg/DwWP/swK00+/hh cvdPUGDwLuGqD4pvK7vEA1XGSaUJWvzwt0WF9PhtVGSSrNpJGCyHSLrHi+aBpFPf3VRx gUjA== X-Gm-Message-State: ALQs6tD/iKYplfnnmKgOgSGCaC/C3IP51t+hBJCsYoSBdWSMGmzdOhLf DDs4wafP/NVbPG4rG7ew2UezpQ== X-Received: by 2002:adf:9d0d:: with SMTP id k13-v6mr17774304wre.179.1524491348466; Mon, 23 Apr 2018 06:49:08 -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.49.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 06:49:07 -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 14/15] media: imx7.rst: add documentation for i.MX7 media driver Date: Mon, 23 Apr 2018 14:47:49 +0100 Message-Id: <20180423134750.30403-15-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 Add rst document to describe the i.MX7 media driver and also a working example from the Warp7 board usage with a OV2680 sensor. Signed-off-by: Rui Miguel Silva --- Documentation/media/v4l-drivers/imx7.rst | 157 ++++++++++++++++++++++ Documentation/media/v4l-drivers/index.rst | 1 + 2 files changed, 158 insertions(+) create mode 100644 Documentation/media/v4l-drivers/imx7.rst -- 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/Documentation/media/v4l-drivers/imx7.rst b/Documentation/media/v4l-drivers/imx7.rst new file mode 100644 index 000000000000..64b97b442277 --- /dev/null +++ b/Documentation/media/v4l-drivers/imx7.rst @@ -0,0 +1,157 @@ +i.MX7 Video Capture Driver +========================== + +Introduction +------------ + +The i.MX7 contrary to the i.MX5/6 family does not contain an Image Processing +Unit (IPU), because of that the capabilities to perform operations or +manipulation of the capture frames is less feature rich. + +For image capture the i.MX7 have three units: +- CMOS Sensor Interface (CSI) +- Video Multiplexer +- MIPI CSI-2 Receiver + +:: + |\ + MIPI Camera Input ---> MIPI CSI-2 --- > | \ + | \ + | M | + | U | ------> CSI ---> Capture + | X | + | / + Parallel Camera Input ----------------> | / + |/ + +For additional information, please refer to the latest versions of the i.MX7 +reference manual [#f1]_. + +Entities +-------- + +imx7-mipi-csi2 +-------------- + +This is the MIPI CSI-2 recevier entity. It has one sink pad to receive the pixel +data from MIPI CSI-2 camera sensor. It has one source pad, corresponding to the +virtual channel 0. This module is compliant to previous version of Samsung +D-phy, and support two D-PHY Rx Data lanes. + +csi_mux +------- + +This is the video multiplexer. It has two sink pads to select from either camera +sensors with a parallel interface or from MIPI CSI-2 virtual channel 0. It has +a single source pad that routes to the CSI. + +csi +--- + +The CSI enables the chip to connect directly to external CMOS image sensor. CSI +can interfaces directly with Parallel and MIPI CSI-2 buses. It has 256 x 64 FIFO +to store received image pixel data and embedded DMA controllers to transfer data +from the FIFO through AHB bus. + +This entity has one sink pad that receive from the csi_mux entity and a single +source pad that route video frames directly to memory buffers, this pad is +routed to a capture device node. + +Usage Notes +----------- + +To aid in configuration and for backward compatibility with V4L2 applications +that access controls only from video device nodes, the capture device interfaces +inherit controls from the active entities in the current pipeline, so controls +can be accessed either directly from the subdev or from the active capture +device interface. For example, the sensor controls are available either from the +sensor subdevs or from the active capture device. + +Warp7 with OV2680 +----------------- + +On this platform an OV2680 MIPI CSI-2 module is connected to the internal MIPI +CSI-2 receiver. The following example configures a video capture pipeline with +an output of 800x600, and BGGR 10 bit bayer format: + +.. code-block:: none + # Setup links + media-ctl -l "'ov2680 1-0036':0 -> 'imx7-mipi-csis.0':0[1]" + media-ctl -l "'imx7-mipi-csis.0':1 -> 'csi_mux':1[1]" + media-ctl -l "'csi_mux':2 -> 'csi':0[1]" + media-ctl -l "'csi':1 -> 'csi capture':0[1]" + + # Configure pads for pipeline + media-ctl -V "'ov2680 1-0036':0 [fmt:SBGGR10_1X10/800x600 field:none]" + media-ctl -V "'csi_mux':1 [fmt:SBGGR10_1X10/800x600 field:none]" + media-ctl -V "'csi_mux':2 [fmt:SBGGR10_1X10/800x600 field:none]" + media-ctl -V "'imx7-mipi-csis.0':0 [fmt:SBGGR10_1X10/800x600 field:none]" + media-ctl -V "'csi':0 [fmt:SBGGR10_1X10/800x600 field:none]" + +After this streaming can start, the v4l2-ctl tool can be used to select any of +the resolutions supported by the sensor. + +.. code-block:: none + root@imx7s-warp:~# media-ctl -p + Media controller API version 4.17.0 + + Media device information + ------------------------ + driver imx-media + model imx-media + serial + bus info + hw revision 0x0 + driver version 4.17.0 + + Device topology + - entity 1: csi (2 pads, 2 links) + type V4L2 subdev subtype Unknown flags 0 + device node name /dev/v4l-subdev0 + pad0: Sink + [fmt:SBGGR10_1X10/800x600 field:none] + <- "csi_mux":2 [ENABLED] + pad1: Source + [fmt:SBGGR10_1X10/800x600 field:none] + -> "csi capture":0 [ENABLED] + + - entity 4: csi capture (1 pad, 1 link) + type Node subtype V4L flags 0 + device node name /dev/video0 + pad0: Sink + <- "csi":1 [ENABLED] + + - entity 10: csi_mux (3 pads, 2 links) + type V4L2 subdev subtype Unknown flags 0 + device node name /dev/v4l-subdev1 + pad0: Sink + [fmt:unknown/0x0] + pad1: Sink + [fmt:unknown/800x600 field:none] + <- "imx7-mipi-csis.0":1 [ENABLED] + pad2: Source + [fmt:unknown/800x600 field:none] + -> "csi":0 [ENABLED] + + - entity 14: imx7-mipi-csis.0 (2 pads, 2 links) + type V4L2 subdev subtype Unknown flags 0 + device node name /dev/v4l-subdev2 + pad0: Sink + [fmt:SBGGR10_1X10/800x600 field:none] + <- "ov2680 1-0036":0 [ENABLED] + pad1: Source + [fmt:SBGGR10_1X10/800x600 field:none] + -> "csi_mux":1 [ENABLED] + + - entity 17: ov2680 1-0036 (1 pad, 1 link) + type V4L2 subdev subtype Sensor flags 0 + device node name /dev/v4l-subdev3 + pad0: Source + [fmt:SBGGR10_1X10/800x600 field:none] + -> "imx7-mipi-csis.0":0 [ENABLED] + + +References +---------- + +.. [#f1] https://www.nxp.com/docs/en/reference-manual/IMX7SRM.pdf diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst index 679238e786a7..693295bbc53f 100644 --- a/Documentation/media/v4l-drivers/index.rst +++ b/Documentation/media/v4l-drivers/index.rst @@ -44,6 +44,7 @@ For more details see the file COPYING in the source distribution of Linux. davinci-vpbe fimc imx + imx7 ivtv max2175 meye