From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: niklas.soderlund@ragnatech.se, maxime.ripard@free-electrons.com,
robh@kernel.org, hverkuil@xs4all.nl,
laurent.pinchart@ideasonboard.com, devicetree@vger.kernel.org,
pavel@ucw.cz, sre@kernel.org
Subject: [PATCH v14 06/28] omap3isp: Use generic parser for parsing fwnode endpoints
Date: Tue, 26 Sep 2017 01:25:17 +0300 [thread overview]
Message-ID: <20170925222540.371-7-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20170925222540.371-1-sakari.ailus@linux.intel.com>
Instead of using a custom driver implementation, use
v4l2_async_notifier_parse_fwnode_endpoints() to parse the fwnode endpoints
of the device.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/platform/omap3isp/isp.c | 121 +++++++++++-----------------------
drivers/media/platform/omap3isp/isp.h | 5 +-
2 files changed, 40 insertions(+), 86 deletions(-)
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 1a428fe9f070..97a5206b6ddc 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2001,6 +2001,7 @@ static int isp_remove(struct platform_device *pdev)
__omap3isp_put(isp, false);
media_entity_enum_cleanup(&isp->crashed);
+ v4l2_async_notifier_cleanup(&isp->notifier);
return 0;
}
@@ -2011,44 +2012,41 @@ enum isp_of_phy {
ISP_OF_PHY_CSIPHY2,
};
-static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
- struct isp_async_subdev *isd)
+static int isp_fwnode_parse(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd)
{
+ struct isp_async_subdev *isd =
+ container_of(asd, struct isp_async_subdev, asd);
struct isp_bus_cfg *buscfg = &isd->bus;
- struct v4l2_fwnode_endpoint vep;
- unsigned int i;
- int ret;
bool csi1 = false;
-
- ret = v4l2_fwnode_endpoint_parse(fwnode, &vep);
- if (ret)
- return ret;
+ unsigned int i;
dev_dbg(dev, "parsing endpoint %pOF, interface %u\n",
- to_of_node(fwnode), vep.base.port);
+ to_of_node(vep->base.local_fwnode), vep->base.port);
- switch (vep.base.port) {
+ switch (vep->base.port) {
case ISP_OF_PHY_PARALLEL:
buscfg->interface = ISP_INTERFACE_PARALLEL;
buscfg->bus.parallel.data_lane_shift =
- vep.bus.parallel.data_shift;
+ vep->bus.parallel.data_shift;
buscfg->bus.parallel.clk_pol =
- !!(vep.bus.parallel.flags
+ !!(vep->bus.parallel.flags
& V4L2_MBUS_PCLK_SAMPLE_FALLING);
buscfg->bus.parallel.hs_pol =
- !!(vep.bus.parallel.flags & V4L2_MBUS_VSYNC_ACTIVE_LOW);
+ !!(vep->bus.parallel.flags & V4L2_MBUS_VSYNC_ACTIVE_LOW);
buscfg->bus.parallel.vs_pol =
- !!(vep.bus.parallel.flags & V4L2_MBUS_HSYNC_ACTIVE_LOW);
+ !!(vep->bus.parallel.flags & V4L2_MBUS_HSYNC_ACTIVE_LOW);
buscfg->bus.parallel.fld_pol =
- !!(vep.bus.parallel.flags & V4L2_MBUS_FIELD_EVEN_LOW);
+ !!(vep->bus.parallel.flags & V4L2_MBUS_FIELD_EVEN_LOW);
buscfg->bus.parallel.data_pol =
- !!(vep.bus.parallel.flags & V4L2_MBUS_DATA_ACTIVE_LOW);
- buscfg->bus.parallel.bt656 = vep.bus_type == V4L2_MBUS_BT656;
+ !!(vep->bus.parallel.flags & V4L2_MBUS_DATA_ACTIVE_LOW);
+ buscfg->bus.parallel.bt656 = vep->bus_type == V4L2_MBUS_BT656;
break;
case ISP_OF_PHY_CSIPHY1:
case ISP_OF_PHY_CSIPHY2:
- switch (vep.bus_type) {
+ switch (vep->bus_type) {
case V4L2_MBUS_CCP2:
case V4L2_MBUS_CSI1:
dev_dbg(dev, "CSI-1/CCP-2 configuration\n");
@@ -2060,11 +2058,11 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
break;
default:
dev_err(dev, "unsupported bus type %u\n",
- vep.bus_type);
+ vep->bus_type);
return -EINVAL;
}
- switch (vep.base.port) {
+ switch (vep->base.port) {
case ISP_OF_PHY_CSIPHY1:
if (csi1)
buscfg->interface = ISP_INTERFACE_CCP2B_PHY1;
@@ -2080,47 +2078,47 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
}
if (csi1) {
buscfg->bus.ccp2.lanecfg.clk.pos =
- vep.bus.mipi_csi1.clock_lane;
+ vep->bus.mipi_csi1.clock_lane;
buscfg->bus.ccp2.lanecfg.clk.pol =
- vep.bus.mipi_csi1.lane_polarity[0];
+ vep->bus.mipi_csi1.lane_polarity[0];
dev_dbg(dev, "clock lane polarity %u, pos %u\n",
buscfg->bus.ccp2.lanecfg.clk.pol,
buscfg->bus.ccp2.lanecfg.clk.pos);
buscfg->bus.ccp2.lanecfg.data[0].pos =
- vep.bus.mipi_csi1.data_lane;
+ vep->bus.mipi_csi1.data_lane;
buscfg->bus.ccp2.lanecfg.data[0].pol =
- vep.bus.mipi_csi1.lane_polarity[1];
+ vep->bus.mipi_csi1.lane_polarity[1];
dev_dbg(dev, "data lane polarity %u, pos %u\n",
buscfg->bus.ccp2.lanecfg.data[0].pol,
buscfg->bus.ccp2.lanecfg.data[0].pos);
buscfg->bus.ccp2.strobe_clk_pol =
- vep.bus.mipi_csi1.clock_inv;
- buscfg->bus.ccp2.phy_layer = vep.bus.mipi_csi1.strobe;
+ vep->bus.mipi_csi1.clock_inv;
+ buscfg->bus.ccp2.phy_layer = vep->bus.mipi_csi1.strobe;
buscfg->bus.ccp2.ccp2_mode =
- vep.bus_type == V4L2_MBUS_CCP2;
+ vep->bus_type == V4L2_MBUS_CCP2;
buscfg->bus.ccp2.vp_clk_pol = 1;
buscfg->bus.ccp2.crc = 1;
} else {
buscfg->bus.csi2.lanecfg.clk.pos =
- vep.bus.mipi_csi2.clock_lane;
+ vep->bus.mipi_csi2.clock_lane;
buscfg->bus.csi2.lanecfg.clk.pol =
- vep.bus.mipi_csi2.lane_polarities[0];
+ vep->bus.mipi_csi2.lane_polarities[0];
dev_dbg(dev, "clock lane polarity %u, pos %u\n",
buscfg->bus.csi2.lanecfg.clk.pol,
buscfg->bus.csi2.lanecfg.clk.pos);
buscfg->bus.csi2.num_data_lanes =
- vep.bus.mipi_csi2.num_data_lanes;
+ vep->bus.mipi_csi2.num_data_lanes;
for (i = 0; i < buscfg->bus.csi2.num_data_lanes; i++) {
buscfg->bus.csi2.lanecfg.data[i].pos =
- vep.bus.mipi_csi2.data_lanes[i];
+ vep->bus.mipi_csi2.data_lanes[i];
buscfg->bus.csi2.lanecfg.data[i].pol =
- vep.bus.mipi_csi2.lane_polarities[i + 1];
+ vep->bus.mipi_csi2.lane_polarities[i + 1];
dev_dbg(dev,
"data lane %u polarity %u, pos %u\n", i,
buscfg->bus.csi2.lanecfg.data[i].pol,
@@ -2137,57 +2135,13 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
default:
dev_warn(dev, "%pOF: invalid interface %u\n",
- to_of_node(fwnode), vep.base.port);
+ to_of_node(vep->base.local_fwnode), vep->base.port);
return -EINVAL;
}
return 0;
}
-static int isp_fwnodes_parse(struct device *dev,
- struct v4l2_async_notifier *notifier)
-{
- struct fwnode_handle *fwnode = NULL;
-
- notifier->subdevs = devm_kcalloc(
- dev, ISP_MAX_SUBDEVS, sizeof(*notifier->subdevs), GFP_KERNEL);
- if (!notifier->subdevs)
- return -ENOMEM;
-
- while (notifier->num_subdevs < ISP_MAX_SUBDEVS &&
- (fwnode = fwnode_graph_get_next_endpoint(
- of_fwnode_handle(dev->of_node), fwnode))) {
- struct isp_async_subdev *isd;
-
- isd = devm_kzalloc(dev, sizeof(*isd), GFP_KERNEL);
- if (!isd)
- goto error;
-
- if (isp_fwnode_parse(dev, fwnode, isd)) {
- devm_kfree(dev, isd);
- continue;
- }
-
- notifier->subdevs[notifier->num_subdevs] = &isd->asd;
-
- isd->asd.match.fwnode.fwnode =
- fwnode_graph_get_remote_port_parent(fwnode);
- if (!isd->asd.match.fwnode.fwnode) {
- dev_warn(dev, "bad remote port parent\n");
- goto error;
- }
-
- isd->asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
- notifier->num_subdevs++;
- }
-
- return notifier->num_subdevs;
-
-error:
- fwnode_handle_put(fwnode);
- return -EINVAL;
-}
-
static int isp_subdev_notifier_complete(struct v4l2_async_notifier *async)
{
struct isp_device *isp = container_of(async, struct isp_device,
@@ -2256,15 +2210,17 @@ static int isp_probe(struct platform_device *pdev)
if (ret)
return ret;
- ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
- if (ret < 0)
- return ret;
-
isp->autoidle = autoidle;
mutex_init(&isp->isp_mutex);
spin_lock_init(&isp->stat_lock);
+ ret = v4l2_async_notifier_parse_fwnode_endpoints(
+ &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
+ isp_fwnode_parse);
+ if (ret < 0)
+ goto error;
+
isp->dev = &pdev->dev;
isp->ref_count = 0;
@@ -2406,6 +2362,7 @@ static int isp_probe(struct platform_device *pdev)
isp_xclk_cleanup(isp);
__omap3isp_put(isp, false);
error:
+ v4l2_async_notifier_cleanup(&isp->notifier);
mutex_destroy(&isp->isp_mutex);
return ret;
diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h
index e528df6efc09..8b9043db94b3 100644
--- a/drivers/media/platform/omap3isp/isp.h
+++ b/drivers/media/platform/omap3isp/isp.h
@@ -220,14 +220,11 @@ struct isp_device {
unsigned int sbl_resources;
unsigned int subclk_resources;
-
-#define ISP_MAX_SUBDEVS 8
- struct v4l2_subdev *subdevs[ISP_MAX_SUBDEVS];
};
struct isp_async_subdev {
- struct isp_bus_cfg bus;
struct v4l2_async_subdev asd;
+ struct isp_bus_cfg bus;
};
#define v4l2_subdev_to_bus_cfg(sd) \
--
2.11.0
next prev parent reply other threads:[~2017-09-25 22:25 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-25 22:25 [PATCH v14 00/28] Unified fwnode endpoint parser, async sub-device notifier support, N9 flash DTS Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 02/28] v4l: async: Remove re-probing support Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 03/28] v4l: async: Use more intuitive names for internal functions Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 04/28] v4l: async: Add V4L2 async documentation to the documentation build Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 05/28] v4l: fwnode: Support generic parsing of graph endpoints in a device Sakari Ailus
[not found] ` <20170925222540.371-6-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-26 8:06 ` Hans Verkuil
2017-09-26 8:11 ` Sakari Ailus
2017-09-25 22:25 ` Sakari Ailus [this message]
2017-09-25 22:25 ` [PATCH v14 14/28] v4l: async: Prepare for async sub-device notifiers Sakari Ailus
[not found] ` <20170925222540.371-15-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-26 8:12 ` Hans Verkuil
[not found] ` <ba80e242-a3c2-39af-01cd-6aa54649fb93-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
2017-09-26 8:17 ` Sakari Ailus
2017-09-26 8:20 ` Hans Verkuil
2017-09-25 22:25 ` [PATCH v14 15/28] v4l: async: Allow binding notifiers to sub-devices Sakari Ailus
2017-09-26 8:16 ` Hans Verkuil
[not found] ` <20170925222540.371-16-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-26 8:20 ` Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 17/28] dt: bindings: Add a binding for flash LED devices associated to a sensor Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 19/28] v4l: fwnode: Add a helper function for parsing generic references Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 20/28] v4l: fwnode: Add a helper function to obtain device / integer references Sakari Ailus
[not found] ` <20170925222540.371-21-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-26 8:47 ` Hans Verkuil
[not found] ` <fbd2f71d-aa6d-08ef-1723-132864bde27b-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
2017-09-26 11:30 ` Sakari Ailus
[not found] ` <20170926113029.eh5i4sp6we6lvgow-z7MJbOB4PBP+e+fPlCVrcFDQ4js95KgL@public.gmane.org>
2017-10-09 12:06 ` Hans Verkuil
2017-10-10 11:27 ` Sakari Ailus
2017-10-10 13:07 ` Hans Verkuil
[not found] ` <d8a48273-7a19-0f83-4a4d-8058b7a59e0e-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
2017-10-16 13:02 ` Sakari Ailus
2017-10-17 12:42 ` Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 21/28] v4l: fwnode: Add convenience function for parsing common external refs Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 22/28] v4l: fwnode: Add a convenience function for registering sensors Sakari Ailus
2017-09-26 8:26 ` Hans Verkuil
[not found] ` <ac50fc71-c528-a703-04bb-6abc1fc7c19a-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
2017-09-26 8:29 ` Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 23/28] dt: bindings: smiapp: Document lens-focus and flash-leds properties Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 25/28] et8ek8: Add support for flash and lens devices Sakari Ailus
2017-09-26 8:27 ` Hans Verkuil
2017-09-25 22:25 ` [PATCH v14 27/28] ov13858: " Sakari Ailus
[not found] ` <20170925222540.371-29-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-26 8:27 ` Hans Verkuil
[not found] ` <20170925222540.371-1-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-25 22:25 ` [PATCH v14 01/28] v4l: fwnode: Move KernelDoc documentation to the header Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 07/28] rcar-vin: Use generic parser for parsing fwnode endpoints Sakari Ailus
2017-09-30 13:17 ` Niklas Söderlund
[not found] ` <20170930131709.GP17182-ofJ5d6taAgIKcZgyrm77+z0dHWC0CY5B@public.gmane.org>
2017-10-02 11:58 ` Sakari Ailus
[not found] ` <3f940721-f190-4662-cfda-d99a0d97bf08-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-02 12:14 ` Niklas Söderlund
[not found] ` <20171002121422.GQ17182-ofJ5d6taAgIKcZgyrm77+z0dHWC0CY5B@public.gmane.org>
2017-10-02 12:24 ` Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 08/28] omap3isp: Fix check for our own sub-devices Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 09/28] omap3isp: Print the name of the entity where no source pads could be found Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 10/28] v4l: async: Move async subdev notifier operations to a separate structure Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 11/28] v4l: async: Introduce helpers for calling async ops callbacks Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 12/28] v4l: async: Register sub-devices before calling bound callback Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 13/28] v4l: async: Allow async notifier register call succeed with no subdevs Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 16/28] v4l: async: Ensure only unique fwnodes are registered to notifiers Sakari Ailus
2017-09-26 8:22 ` Hans Verkuil
2017-09-25 22:25 ` [PATCH v14 18/28] dt: bindings: Add lens-focus binding for image sensors Sakari Ailus
2017-09-25 22:25 ` [PATCH v14 22/28] v4l: async: Add a convenience function for registering sensors Sakari Ailus
[not found] ` <20170925222540.371-23-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-26 8:24 ` Hans Verkuil
2017-09-25 22:25 ` [PATCH v14 24/28] smiapp: Add support for flash and lens devices Sakari Ailus
[not found] ` <20170925222540.371-26-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-26 8:26 ` Hans Verkuil
2017-09-25 22:25 ` [PATCH v14 26/28] ov5670: " Sakari Ailus
2017-09-26 8:27 ` Hans Verkuil
2017-09-25 22:25 ` [PATCH v14 28/28] arm: dts: omap3: N9/N950: Add flash references to the camera 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=20170925222540.371-7-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-media@vger.kernel.org \
--cc=maxime.ripard@free-electrons.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;
as well as URLs for NNTP newsgroup(s).