devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Akinobu Mita <akinobu.mita@gmail.com>
To: linux-media@vger.kernel.org, devicetree@vger.kernel.org
Cc: Akinobu Mita <akinobu.mita@gmail.com>,
	Jacopo Mondi <jacopo+renesas@jmondi.org>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Hans Verkuil <hans.verkuil@cisco.com>,
	Sakari Ailus <sakari.ailus@linux.intel.com>,
	Mauro Carvalho Chehab <mchehab@s-opensource.com>
Subject: [PATCH v2 04/10] media: ov772x: add media controller support
Date: Mon, 16 Apr 2018 11:51:45 +0900	[thread overview]
Message-ID: <1523847111-12986-5-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1523847111-12986-1-git-send-email-akinobu.mita@gmail.com>

Create a source pad and set the media controller type to the sensor.

Cc: Jacopo Mondi <jacopo+renesas@jmondi.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
---
* v2
- Move video_probe() before the entity initialization and remove the #ifdef
  around the media_entity_cleanup()

 drivers/media/i2c/ov772x.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/media/i2c/ov772x.c b/drivers/media/i2c/ov772x.c
index 188f2f1..0ae2a4f 100644
--- a/drivers/media/i2c/ov772x.c
+++ b/drivers/media/i2c/ov772x.c
@@ -424,6 +424,9 @@ struct ov772x_priv {
 	/* band_filter = COM8[5] ? 256 - BDBASE : 0 */
 	unsigned short                    band_filter;
 	unsigned int			  fps;
+#ifdef CONFIG_MEDIA_CONTROLLER
+	struct media_pad pad;
+#endif
 };
 
 /*
@@ -1318,16 +1321,26 @@ static int ov772x_probe(struct i2c_client *client,
 	if (ret < 0)
 		goto error_gpio_put;
 
+#ifdef CONFIG_MEDIA_CONTROLLER
+	priv->pad.flags = MEDIA_PAD_FL_SOURCE;
+	priv->subdev.entity.function = MEDIA_ENT_F_CAM_SENSOR;
+	ret = media_entity_pads_init(&priv->subdev.entity, 1, &priv->pad);
+	if (ret < 0)
+		goto error_gpio_put;
+#endif
+
 	priv->cfmt = &ov772x_cfmts[0];
 	priv->win = &ov772x_win_sizes[0];
 	priv->fps = 15;
 
 	ret = v4l2_async_register_subdev(&priv->subdev);
 	if (ret)
-		goto error_gpio_put;
+		goto error_entity_cleanup;
 
 	return 0;
 
+error_entity_cleanup:
+	media_entity_cleanup(&priv->subdev.entity);
 error_gpio_put:
 	if (priv->pwdn_gpio)
 		gpiod_put(priv->pwdn_gpio);
@@ -1343,6 +1356,7 @@ static int ov772x_remove(struct i2c_client *client)
 {
 	struct ov772x_priv *priv = to_ov772x(i2c_get_clientdata(client));
 
+	media_entity_cleanup(&priv->subdev.entity);
 	clk_put(priv->clk);
 	if (priv->pwdn_gpio)
 		gpiod_put(priv->pwdn_gpio);
-- 
2.7.4


  parent reply	other threads:[~2018-04-16  2:52 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-16  2:51 [PATCH v2 00/10] media: ov772x: support media controller, device tree probing, etc Akinobu Mita
2018-04-16  2:51 ` [PATCH v2 01/10] media: ov772x: allow i2c controllers without I2C_FUNC_PROTOCOL_MANGLING Akinobu Mita
2018-04-18 10:05   ` jacopo mondi
2018-04-18 10:41     ` Sakari Ailus
2018-04-18 12:12       ` jacopo mondi
2018-04-16  2:51 ` [PATCH v2 02/10] media: ov772x: add checks for register read errors Akinobu Mita
2018-04-18 10:13   ` jacopo mondi
2018-04-16  2:51 ` [PATCH v2 03/10] media: ov772x: create subdevice device node Akinobu Mita
2018-04-16 10:56   ` Sakari Ailus
2018-04-16  2:51 ` Akinobu Mita [this message]
2018-04-18 11:28   ` [PATCH v2 04/10] media: ov772x: add media controller support jacopo mondi
2018-04-18 11:58     ` Sakari Ailus
2018-04-18 12:13       ` jacopo mondi
2018-04-18 13:05         ` Sakari Ailus
2018-04-16  2:51 ` [PATCH v2 05/10] media: ov772x: use generic names for reset and powerdown gpios Akinobu Mita
2018-04-18 11:34   ` jacopo mondi
2018-04-16  2:51 ` [PATCH v2 06/10] media: dt-bindings: ov772x: add device tree binding Akinobu Mita
2018-04-16 21:36   ` Rob Herring
2018-04-18 11:35   ` jacopo mondi
2018-04-16  2:51 ` [PATCH v2 07/10] media: ov772x: support device tree probing Akinobu Mita
2018-04-18 11:48   ` jacopo mondi
2018-04-16  2:51 ` [PATCH v2 08/10] media: ov772x: handle nested s_power() calls Akinobu Mita
2018-04-18 12:41   ` jacopo mondi
2018-04-19 16:21     ` Akinobu Mita
2018-04-16  2:51 ` [PATCH v2 09/10] media: ov772x: reconstruct s_frame_interval() Akinobu Mita
2018-04-16  2:51 ` [PATCH v2 10/10] media: ov772x: avoid accessing registers under power saving mode Akinobu Mita
2018-04-16 10:55   ` Sakari Ailus
2018-04-17 16:52     ` Akinobu Mita
2018-04-18 12:55   ` jacopo mondi
2018-04-18 13:17     ` Sakari Ailus
2018-04-18 13:34       ` jacopo mondi
2018-04-20 16:35     ` Akinobu Mita

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=1523847111-12986-5-git-send-email-akinobu.mita@gmail.com \
    --to=akinobu.mita@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=hans.verkuil@cisco.com \
    --cc=jacopo+renesas@jmondi.org \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@s-opensource.com \
    --cc=sakari.ailus@linux.intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).