From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: niklas.soderlund@ragnatech.se, robh@kernel.org,
hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com,
linux-acpi@vger.kernel.org, mika.westerberg@intel.com,
devicetree@vger.kernel.org, pavel@ucw.cz, sre@kernel.org
Subject: [PATCH v10 23/24] ov13858: Add support for flash and lens devices
Date: Mon, 11 Sep 2017 11:00:07 +0300 [thread overview]
Message-ID: <20170911080008.21208-24-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20170911080008.21208-1-sakari.ailus@linux.intel.com>
Parse async sub-devices by using
v4l2_subdev_fwnode_reference_parse_sensor_common().
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/i2c/ov13858.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/drivers/media/i2c/ov13858.c b/drivers/media/i2c/ov13858.c
index af7af0d14c69..0d60defc7492 100644
--- a/drivers/media/i2c/ov13858.c
+++ b/drivers/media/i2c/ov13858.c
@@ -18,6 +18,7 @@
#include <linux/pm_runtime.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
#define OV13858_REG_VALUE_08BIT 1
#define OV13858_REG_VALUE_16BIT 2
@@ -1028,6 +1029,7 @@ static const struct ov13858_mode supported_modes[] = {
struct ov13858 {
struct v4l2_subdev sd;
struct media_pad pad;
+ struct v4l2_async_notifier notifier;
struct v4l2_ctrl_handler ctrl_handler;
/* V4L2 Controls */
@@ -1715,6 +1717,11 @@ static int ov13858_probe(struct i2c_client *client,
if (!ov13858)
return -ENOMEM;
+ ret = v4l2_fwnode_reference_parse_sensor_common(
+ &client->dev, &ov13858->notifier);
+ if (ret < 0)
+ return ret;
+
/* Initialize subdev */
v4l2_i2c_subdev_init(&ov13858->sd, client, &ov13858_subdev_ops);
@@ -1722,7 +1729,7 @@ static int ov13858_probe(struct i2c_client *client,
ret = ov13858_identify_module(ov13858);
if (ret) {
dev_err(&client->dev, "failed to find sensor: %d\n", ret);
- return ret;
+ goto error_notifier_release;
}
/* Set default mode to max resolution */
@@ -1730,7 +1737,7 @@ static int ov13858_probe(struct i2c_client *client,
ret = ov13858_init_controls(ov13858);
if (ret)
- return ret;
+ goto error_notifier_release;
/* Initialize subdev */
ov13858->sd.internal_ops = &ov13858_internal_ops;
@@ -1746,9 +1753,14 @@ static int ov13858_probe(struct i2c_client *client,
goto error_handler_free;
}
+ ret = v4l2_async_subdev_notifier_register(&ov13858->sd,
+ &ov13858->notifier);
+ if (ret)
+ goto error_media_entity;
+
ret = v4l2_async_register_subdev(&ov13858->sd);
if (ret < 0)
- goto error_media_entity;
+ goto error_notifier_unregister;
/*
* Device is already turned on by i2c-core with ACPI domain PM.
@@ -1761,11 +1773,17 @@ static int ov13858_probe(struct i2c_client *client,
return 0;
+error_notifier_unregister:
+ v4l2_async_notifier_unregister(&ov13858->notifier);
+
error_media_entity:
media_entity_cleanup(&ov13858->sd.entity);
error_handler_free:
ov13858_free_controls(ov13858);
+
+error_notifier_release:
+ v4l2_async_notifier_release(&ov13858->notifier);
dev_err(&client->dev, "%s failed:%d\n", __func__, ret);
return ret;
@@ -1777,6 +1795,8 @@ static int ov13858_remove(struct i2c_client *client)
struct ov13858 *ov13858 = to_ov13858(sd);
v4l2_async_unregister_subdev(sd);
+ v4l2_async_notifier_unregister(&ov13858->notifier);
+ v4l2_async_notifier_release(&ov13858->notifier);
media_entity_cleanup(&sd->entity);
ov13858_free_controls(ov13858);
--
2.11.0
next prev parent reply other threads:[~2017-09-11 8:00 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-11 7:59 [PATCH v10 00/24] Unified fwnode endpoint parser, async sub-device notifier support, N9 flash DTS Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 01/24] v4l: fwnode: Move KernelDoc documentation to the header Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 02/24] v4l: async: Remove re-probing support Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 03/24] v4l: async: Use more intuitive names for internal functions Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 05/24] v4l: fwnode: Support generic parsing of graph endpoints in a device Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 08/24] omap3isp: Fix check for our own sub-devices Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 09/24] omap3isp: Print the name of the entity where no source pads could be found Sakari Ailus
[not found] ` <20170911080008.21208-1-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-11 7:59 ` [PATCH v10 04/24] v4l: async: Add V4L2 async documentation to the documentation build Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 06/24] omap3isp: Use generic parser for parsing fwnode endpoints Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 07/24] rcar-vin: " Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 10/24] v4l: async: Move async subdev notifier operations to a separate structure Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 13/24] v4l: async: Allow async notifier register call succeed with no subdevs Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 14/24] v4l: async: Allow binding notifiers to sub-devices Sakari Ailus
2017-09-11 8:57 ` Hans Verkuil
2017-09-11 9:30 ` Sakari Ailus
2017-09-11 8:00 ` [PATCH v10 17/24] v4l: fwnode: Add a helper function for parsing generic references Sakari Ailus
2017-09-11 9:14 ` Hans Verkuil
2017-09-11 9:59 ` Sakari Ailus
2017-09-11 8:00 ` [PATCH v10 18/24] v4l: fwnode: Add a helper function to obtain device / interger references Sakari Ailus
2017-09-11 9:38 ` Hans Verkuil
2017-09-11 12:28 ` Sakari Ailus
2017-09-11 12:38 ` Hans Verkuil
2017-09-11 13:27 ` Sakari Ailus
2017-09-11 13:34 ` Hans Verkuil
2017-09-11 14:12 ` Sakari Ailus
2017-09-11 8:00 ` [PATCH v10 21/24] smiapp: Add support for flash and lens devices Sakari Ailus
2017-09-11 9:48 ` Hans Verkuil
2017-09-11 7:59 ` [PATCH v10 11/24] v4l: async: Introduce helpers for calling async ops callbacks Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 12/24] v4l: async: Register sub-devices before calling bound callback Sakari Ailus
2017-09-11 7:59 ` [PATCH v10 15/24] dt: bindings: Add a binding for flash LED devices associated to a sensor Sakari Ailus
2017-09-11 8:00 ` [PATCH v10 16/24] dt: bindings: Add lens-focus binding for image sensors Sakari Ailus
2017-09-11 8:00 ` [PATCH v10 19/24] v4l: fwnode: Add convenience function for parsing common external refs Sakari Ailus
2017-09-11 9:47 ` Hans Verkuil
2017-09-11 11:06 ` Sakari Ailus
2017-09-11 11:17 ` Pavel Machek
2017-09-11 14:15 ` Sakari Ailus
2017-09-11 8:00 ` [PATCH v10 20/24] dt: bindings: smiapp: Document lens-focus and flash properties Sakari Ailus
[not found] ` <20170911080008.21208-21-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-11 9:40 ` Hans Verkuil
2017-09-11 11:11 ` Pavel Machek
2017-09-18 21:00 ` Rob Herring
2017-09-18 21:56 ` Sakari Ailus
[not found] ` <ef8edab3-5b55-c298-2a40-72b5e22586ea-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-19 20:00 ` Rob Herring
[not found] ` <CAL_Jsq+YKSDn7Hoq-2wRsGyGRbQvNPEVXrj13bSNCqQpKE2CvQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-09-28 21:02 ` Sakari Ailus
2017-09-11 8:00 ` [PATCH v10 22/24] ov5670: Add support for flash and lens devices Sakari Ailus
[not found] ` <20170911080008.21208-23-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-11 9:49 ` Hans Verkuil
2017-09-11 8:00 ` Sakari Ailus [this message]
2017-09-11 9:49 ` [PATCH v10 23/24] ov13858: " Hans Verkuil
2017-09-11 8:00 ` [PATCH v10 24/24] arm: dts: omap3: N9/N950: Add flash references to the camera Sakari Ailus
[not found] ` <20170911080008.21208-25-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-11 9:50 ` Hans Verkuil
2017-09-11 11:12 ` Pavel Machek
2017-10-03 0:04 ` [PATCH v10 00/24] Unified fwnode endpoint parser, async sub-device notifier support, N9 flash DTS Rafael J. Wysocki
2017-10-04 12:45 ` Sakari Ailus
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=20170911080008.21208-24-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mika.westerberg@intel.com \
--cc=niklas.soderlund@ragnatech.se \
--cc=pavel@ucw.cz \
--cc=robh@kernel.org \
--cc=sre@kernel.org \
/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