All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rui Miguel Silva <rui.silva@linaro.org>
To: mchehab@kernel.org, sakari.ailus@linux.intel.com,
	Steve Longerbeam <slongerbeam@gmail.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Rob Herring <robh+dt@kernel.org>
Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Ryan Harkin <ryan.harkin@linaro.org>,
	Rui Miguel Silva <rui.silva@linaro.org>,
	Fabio Estevam <fabio.estevam@nxp.com>,
	Shawn Guo <shawnguo@kernel.org>,
	linux-media@vger.kernel.org
Subject: [PATCH v2 06/15] media: staging/imx: add imx7 capture subsystem
Date: Mon, 23 Apr 2018 14:47:41 +0100	[thread overview]
Message-ID: <20180423134750.30403-7-rui.silva@linaro.org> (raw)
In-Reply-To: <20180423134750.30403-1-rui.silva@linaro.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 <rui.silva@linaro.org>
---
 drivers/staging/media/imx/imx-media-dev.c | 4 ++++
 1 file changed, 4 insertions(+)

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);
-- 
2.17.0

WARNING: multiple messages have this Message-ID (diff)
From: Rui Miguel Silva <rui.silva@linaro.org>
To: mchehab@kernel.org, sakari.ailus@linux.intel.com,
	Steve Longerbeam <slongerbeam@gmail.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Rob Herring <robh+dt@kernel.org>
Cc: linux-media@vger.kernel.org, devel@driverdev.osuosl.org,
	Shawn Guo <shawnguo@kernel.org>,
	Fabio Estevam <fabio.estevam@nxp.com>,
	devicetree@vger.kernel.org,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Ryan Harkin <ryan.harkin@linaro.org>,
	Rui Miguel Silva <rui.silva@linaro.org>
Subject: [PATCH v2 06/15] media: staging/imx: add imx7 capture subsystem
Date: Mon, 23 Apr 2018 14:47:41 +0100	[thread overview]
Message-ID: <20180423134750.30403-7-rui.silva@linaro.org> (raw)
In-Reply-To: <20180423134750.30403-1-rui.silva@linaro.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 <rui.silva@linaro.org>
---
 drivers/staging/media/imx/imx-media-dev.c | 4 ++++
 1 file changed, 4 insertions(+)

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);
-- 
2.17.0

  parent reply	other threads:[~2018-04-23 13:47 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-23 13:47 [PATCH v2 00/15] media: staging/imx7: add i.MX7 media driver Rui Miguel Silva
2018-04-23 13:47 ` Rui Miguel Silva
2018-04-23 13:47 ` [PATCH v2 01/15] media: staging/imx: add support to media dev for no IPU systems Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-04-23 13:47 ` [PATCH v2 02/15] media: staging/imx7: add imx7 CSI subdev driver Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-04-23 13:47 ` [PATCH v2 03/15] clk: imx7d: fix mipi dphy div parent Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-05-01 22:11   ` Stephen Boyd
2018-05-01 22:11     ` Stephen Boyd
2018-05-03  1:08   ` Shawn Guo
2018-05-03  1:08     ` Shawn Guo
2018-05-03  1:50     ` A.s. Dong
2018-05-03  1:50       ` A.s. Dong
2018-05-03  1:50       ` A.s. Dong
2018-04-23 13:47 ` [PATCH v2 04/15] clk: imx7d: reset parent for mipi csi root Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-05-03  2:27   ` Shawn Guo
2018-05-03  2:27     ` Shawn Guo
2018-04-23 13:47 ` [PATCH v2 05/15] media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7 Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-04-23 13:47 ` Rui Miguel Silva [this message]
2018-04-23 13:47   ` [PATCH v2 06/15] media: staging/imx: add imx7 capture subsystem Rui Miguel Silva
2018-04-23 15:48   ` Philipp Zabel
2018-04-23 15:48     ` Philipp Zabel
2018-04-24  8:46     ` Rui Miguel Silva
2018-04-24  8:46       ` Rui Miguel Silva
2018-04-23 13:47 ` [PATCH v2 07/15] ARM: dts: increase default cma size to 40MB Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-05-03  2:40   ` Shawn Guo
2018-05-03  2:40     ` Shawn Guo
2018-04-23 13:47 ` [PATCH v2 08/15] media: dt-bindings: add bindings for i.MX7 media driver Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-04-27 19:06   ` Rob Herring
2018-04-27 19:06     ` Rob Herring
2018-05-07 16:28     ` Rui Miguel Silva
2018-05-07 16:28       ` Rui Miguel Silva
2018-04-23 13:47 ` [PATCH v2 09/15] ARM: dts: imx7s: add mipi phy power domain Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-04-23 13:47 ` [PATCH v2 10/15] ARM: dts: imx7s: add multiplexer controls Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-05-03  3:05   ` Shawn Guo
2018-05-03  3:05     ` Shawn Guo
2018-04-23 13:47 ` [PATCH v2 11/15] ARM: dts: imx7: Add video mux, csi and mipi_csi and connections Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-04-23 15:46   ` Philipp Zabel
2018-04-23 15:46     ` Philipp Zabel
2018-04-24  8:50     ` Rui Miguel Silva
2018-04-24  8:50       ` Rui Miguel Silva
2018-04-23 13:47 ` [PATCH v2 12/15] ARM: dts: imx7s: add capture subsystem Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-04-23 13:47 ` [PATCH v2 13/15] ARM: dts: imx7s-warp: add ov2680 sensor node Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-04-23 13:47 ` [PATCH v2 14/15] media: imx7.rst: add documentation for i.MX7 media driver Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva
2018-04-23 13:47 ` [PATCH v2 15/15] media: staging/imx: add i.MX7 entries to TODO file Rui Miguel Silva
2018-04-23 13:47   ` Rui Miguel Silva

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180423134750.30403-7-rui.silva@linaro.org \
    --to=rui.silva@linaro.org \
    --cc=devel@driverdev.osuosl.org \
    --cc=devicetree@vger.kernel.org \
    --cc=fabio.estevam@nxp.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=p.zabel@pengutronix.de \
    --cc=robh+dt@kernel.org \
    --cc=ryan.harkin@linaro.org \
    --cc=sakari.ailus@linux.intel.com \
    --cc=shawnguo@kernel.org \
    --cc=slongerbeam@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.