From: Sebastian Reichel <sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org,
hverkuil-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org,
pavel-+ZI9xUNit7I@public.gmane.org,
linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH v16 09/32] omap3isp: Use generic parser for parsing fwnode endpoints
Date: Fri, 27 Oct 2017 16:46:55 +0200 [thread overview]
Message-ID: <20171027144655.nqjtxbsmjzxkv3f5@earth> (raw)
In-Reply-To: <20171026075342.5760-10-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 9580 bytes --]
Hi,
On Thu, Oct 26, 2017 at 10:53:19AM +0300, Sakari Ailus wrote:
> 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-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> Reviewed-by: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> ---
Reviewed-by: Sebastian Reichel <sebastian.reichel-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>
-- Sebastian
> 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
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2017-10-27 14:46 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 7:53 [PATCH v16 00/32] Unified fwnode endpoint parser, async sub-device notifier support, N9 flash DTS Sakari Ailus
2017-10-26 7:53 ` [PATCH v16 01/32] v4l: async: Remove re-probing support Sakari Ailus
2017-10-26 15:20 ` Niklas Söderlund
2017-10-26 7:53 ` [PATCH v16 02/32] v4l: async: Don't set sd->dev NULL in v4l2_async_cleanup Sakari Ailus
[not found] ` <20171026075342.5760-3-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-26 15:23 ` Niklas Söderlund
2017-10-26 7:53 ` [PATCH v16 03/32] v4l: async: fix unbind error in v4l2_async_notifier_unregister() Sakari Ailus
2017-10-26 7:53 ` [PATCH v16 05/32] v4l: async: Correctly serialise async sub-device unregistration Sakari Ailus
[not found] ` <20171026075342.5760-6-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-26 15:38 ` Niklas Söderlund
2017-10-26 7:53 ` [PATCH v16 07/32] v4l: async: Add V4L2 async documentation to the documentation build Sakari Ailus
2017-10-26 7:53 ` [PATCH v16 08/32] v4l: fwnode: Support generic parsing of graph endpoints in a device Sakari Ailus
2017-10-26 21:35 ` Niklas Söderlund
2017-10-26 7:53 ` [PATCH v16 09/32] omap3isp: Use generic parser for parsing fwnode endpoints Sakari Ailus
[not found] ` <20171026075342.5760-10-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-27 14:46 ` Sebastian Reichel [this message]
2017-10-26 7:53 ` [PATCH v16 10/32] rcar-vin: " Sakari Ailus
2017-10-26 7:53 ` [PATCH v16 11/32] omap3isp: Fix check for our own sub-devices Sakari Ailus
2017-10-27 14:47 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 12/32] omap3isp: Print the name of the entity where no source pads could be found Sakari Ailus
2017-10-27 14:47 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 13/32] v4l: async: Move async subdev notifier operations to a separate structure Sakari Ailus
2017-10-26 21:44 ` Niklas Söderlund
2017-10-27 14:47 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 14/32] v4l: async: Introduce helpers for calling async ops callbacks Sakari Ailus
2017-10-26 21:46 ` Niklas Söderlund
2017-10-27 14:48 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 15/32] v4l: async: Register sub-devices before calling bound callback Sakari Ailus
[not found] ` <20171026075342.5760-16-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-26 21:52 ` Niklas Söderlund
2017-10-27 14:49 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 16/32] v4l: async: Allow async notifier register call succeed with no subdevs Sakari Ailus
[not found] ` <20171026075342.5760-17-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-26 22:00 ` Niklas Söderlund
2017-10-27 14:49 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 17/32] v4l: async: Prepare for async sub-device notifiers Sakari Ailus
2017-10-26 22:10 ` Niklas Söderlund
2017-10-27 8:10 ` Niklas Söderlund
2017-10-27 8:30 ` Sakari Ailus
2017-10-26 7:53 ` [PATCH v16 18/32] v4l: async: Allow binding notifiers to sub-devices Sakari Ailus
2017-10-26 7:53 ` [PATCH v16 19/32] v4l: async: Ensure only unique fwnodes are registered to notifiers Sakari Ailus
2017-10-27 9:52 ` Niklas Söderlund
[not found] ` <20171027095227.GA8854-ofJ5d6taAgIKcZgyrm77+z0dHWC0CY5B@public.gmane.org>
2017-10-27 10:06 ` Sakari Ailus
2017-10-27 10:26 ` Niklas Söderlund
2017-10-26 7:53 ` [PATCH v16 20/32] dt: bindings: Add a binding for flash LED devices associated to a sensor Sakari Ailus
[not found] ` <20171026075342.5760-21-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-29 22:26 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 21/32] dt: bindings: Add lens-focus binding for image sensors Sakari Ailus
2017-10-26 7:53 ` [PATCH v16 22/32] v4l: fwnode: Move KernelDoc documentation to the header Sakari Ailus
2017-10-29 22:28 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 23/32] v4l: fwnode: Add a helper function for parsing generic references Sakari Ailus
2017-10-27 10:30 ` Niklas Söderlund
2017-10-29 22:53 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 24/32] v4l: fwnode: Add a helper function to obtain device / integer references Sakari Ailus
2017-10-26 7:53 ` [PATCH v16 25/32] v4l: fwnode: Add convenience function for parsing common external refs Sakari Ailus
2017-10-26 7:53 ` [PATCH v16 29/32] et8ek8: Add support for flash and lens devices Sakari Ailus
2017-10-29 23:05 ` Sebastian Reichel
2017-11-12 11:27 ` et8ek8: Document " Pavel Machek
2017-11-12 14:25 ` Sebastian Reichel
2017-11-13 17:05 ` Sakari Ailus
[not found] ` <20171026075342.5760-1-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-26 7:53 ` [PATCH v16 04/32] v4l: async: Fix notifier complete callback error handling Sakari Ailus
[not found] ` <20171026075342.5760-5-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-26 15:34 ` Niklas Söderlund
2017-10-27 14:46 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 06/32] v4l: async: Use more intuitive names for internal functions Sakari Ailus
[not found] ` <20171026075342.5760-7-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-26 15:39 ` Niklas Söderlund
2017-10-26 7:53 ` [PATCH v16 26/32] v4l: fwnode: Add a convenience function for registering sensors Sakari Ailus
2017-10-27 13:06 ` Niklas Söderlund
2017-10-29 23:02 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 27/32] dt: bindings: smiapp: Document lens-focus and flash-leds properties Sakari Ailus
2017-10-27 14:38 ` Rob Herring
[not found] ` <20171026075342.5760-28-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-29 23:03 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 28/32] smiapp: Add support for flash and lens devices Sakari Ailus
2017-10-29 23:04 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 30/32] ov5670: " Sakari Ailus
2017-10-29 23:05 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 31/32] ov13858: " Sakari Ailus
[not found] ` <20171026075342.5760-32-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-10-29 23:06 ` Sebastian Reichel
2017-10-26 7:53 ` [PATCH v16 32/32] arm: dts: omap3: N9/N950: Add flash references to the camera Sakari Ailus
2017-10-29 23:08 ` Sebastian Reichel
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=20171027144655.nqjtxbsmjzxkv3f5@earth \
--to=sre-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=hverkuil-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org \
--cc=laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org \
--cc=linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
--cc=niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org \
--cc=pavel-+ZI9xUNit7I@public.gmane.org \
--cc=sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.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).