media: imx: Various fixes for i.MX5 support
Subsystems (5)
Steve Longerbeam
maintainerv2 cover media: imx: Various fixes for i.MX5 support
Some fixes and improvements to support video capture on i.MX5.
History:
v2:
- Rebased with merge of imx7 capture patches.
Steve Longerbeam (4):
media: imx: csi: Allow unknown nearest upstream entities
media: imx: Clear fwnode link struct for each endpoint iteration
media: imx: Rename functions that add IPU-internal subdevs
media: imx: Don't register IPU subdevs/links if CSI port missing
drivers/staging/media/imx/imx-ic-common.c | 2 +- drivers/staging/media/imx/imx-media-csi.c | 18 ++++- drivers/staging/media/imx/imx-media-dev.c | 11 +-- .../staging/media/imx/imx-media-internal-sd.c | 32 +++----- drivers/staging/media/imx/imx-media-of.c | 73 ++++++++++++------- drivers/staging/media/imx/imx-media-vdic.c | 2 +- drivers/staging/media/imx/imx-media.h | 7 +- drivers/staging/media/imx/imx7-media-csi.c | 2 +- 8 files changed, 80 insertions(+), 67 deletions(-)
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v2 1/4 media: imx: csi: Allow unknown nearest upstream entities
On i.MX6, the nearest upstream entity to the CSI can only be the CSI video muxes or the Synopsys DW MIPI CSI-2 receiver.
However the i.MX53 has no CSI video muxes or a MIPI CSI-2 receiver. So allow for the nearest upstream entity to the CSI to be something other than those.
upstream entity")
--- drivers/staging/media/imx/imx-media-csi.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/staging/media/imx/imx-media-csi.c +14 -4
@@ -154,9 +154,10 @@ static inline bool requires_passthrough(struct v4l2_fwnode_endpoint *ep,/* * Parses the fwnode endpoint from the source pad of the entity * connected to this CSI. This will either be the entity directly -* upstream from the CSI-2 receiver, or directly upstream from the -* video mux. The endpoint is needed to determine the bus type and -* bus config coming into the CSI. +* upstream from the CSI-2 receiver, directly upstream from the +* video mux, or directly upstream from the CSI itself. The endpoint +* is needed to determine the bus type and bus config coming into +* the CSI. */ static int csi_get_upstream_endpoint (struct csi_priv *priv,struct v4l2_fwnode_endpoint *ep)
@@ -172,7 +173,8 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv,if (!priv->src_sd)return -EPIPE ; - src = &priv->src_sd->entity; + sd = priv->src_sd; + src = &sd->entity;if (src->function ==MEDIA_ENT_F_VID_MUX ) {/*
@@ -186,6 +188,14 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv, src = &sd->entity; } +/* +* If the source is neither the video mux nor the CSI-2 receiver, +* get the source pad directly upstream from CSI itself. +*/ +if (src->function !=MEDIA_ENT_F_VID_MUX && + sd->grp_id !=IMX_MEDIA_GRP_ID_CSI2 ) + src = &priv->sd.entity; +/* get source pad of entity directly upstream from src */ pad =imx_media_find_upstream_pad (priv->md, src,0 );if (IS_ERR (pad))
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v2 2/4 media: imx: Clear fwnode link struct for each endpoint iteration
In reply to Steve LongerbeamIn imx_media_create_csi_of_links(), the 'struct v4l2_fwnode_link' must be cleared for each endpoint iteration, otherwise if the remote port has no "reg" property, link.remote_port will not be reset to zero. This was discovered on the i.MX53 SMD board, since the OV5642 connects directly to ipu1_csi0 and has a single source port with no "reg" property.
--- drivers/staging/media/imx/imx-media-of.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/staging/media/imx/imx-media-of.c +9 -6
@@ -145,15 +145,18 @@ int imx_media_create_csi_of_links(struct imx_media_dev *imxmd, struct v4l2_subdev *csi) {struct device_node *csi_np = csi->dev->of_node; -struct fwnode_handle *fwnode, *csi_ep; -struct v4l2_fwnode_link link;struct device_node *ep; -int ret; - - link.local_node =of_fwnode_handle (csi_np); - link.local_port =CSI_SINK_PAD ;for_each_child_of_node (csi_np, ep) { +struct fwnode_handle *fwnode, *csi_ep; +struct v4l2_fwnode_link link; +int ret; + +memset (&link,0 ,sizeof (link)); + + link.local_node =of_fwnode_handle (csi_np); + link.local_port =CSI_SINK_PAD ; + csi_ep =of_fwnode_handle (ep); fwnode =fwnode_graph_get_remote_endpoint (csi_ep);
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v2 3/4 media: imx: Rename functions that add IPU-internal subdevs
In reply to Steve LongerbeamFor the functions that add and remove the internal IPU subdevice descriptors, rename them to make clear they are the subdevs internal to the IPU. Also rename the platform data structure for the internal IPU subdevices. No functional changes.
--- drivers/staging/media/imx/imx-ic-common.c | 2 +- drivers/staging/media/imx/imx-media-dev.c | 8 ++++---- drivers/staging/media/imx/imx-media-internal-sd.c | 12 ++++++------ drivers/staging/media/imx/imx-media-vdic.c | 2 +- drivers/staging/media/imx/imx-media.h | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-)
drivers/staging/media/imx/imx-ic-common.c +1 -1
@@ -26,7 +26,7 @@ static struct imx_ic_ops *ic_ops[IC_NUM_OPS] = {static int imx_ic_probe (struct platform_device *pdev) { -struct imx_media_internal_sd_platformdata *pdata; +struct imx_media_ipu_internal_sd_pdata *pdata;struct imx_ic_priv *priv;int ret;
drivers/staging/media/imx/imx-media-dev.c +4 -4
@@ -477,10 +477,10 @@ static int imx_media_probe(struct platform_device *pdev) goto cleanup; } - ret =imx_media_add_internal_subdevs (imxmd); + ret =imx_media_add_ipu_internal_subdevs (imxmd);if (ret) {v4l2_err (&imxmd->v4l2_dev, -"add_internal_subdevs failed with %d\n" , ret); +"add_ipu_internal_subdevs failed with %d\n" , ret); goto cleanup; }
@@ -491,7 +491,7 @@ static int imx_media_probe(struct platform_device *pdev)return 0 ; del_int: -imx_media_remove_internal_subdevs (imxmd); +imx_media_remove_ipu_internal_subdevs (imxmd); cleanup:v4l2_async_notifier_cleanup (&imxmd->notifier);v4l2_device_unregister (&imxmd->v4l2_dev);
@@ -508,7 +508,7 @@ static int imx_media_remove(struct platform_device *pdev)v4l2_info (&imxmd->v4l2_dev,"Removing imx-media\n" );v4l2_async_notifier_unregister (&imxmd->notifier); -imx_media_remove_internal_subdevs (imxmd); +imx_media_remove_ipu_internal_subdevs (imxmd);v4l2_async_notifier_cleanup (&imxmd->notifier);media_device_unregister (&imxmd->md);v4l2_device_unregister (&imxmd->v4l2_dev);
drivers/staging/media/imx/imx-media-internal-sd.c +6 -6
@@ -1,7 +1,7 @@/* * Media driver for Freescale i.MX5/6 SOC * -* Adds the internal subdevices and the media links between them. +* Adds the IPU internal subdevices and the media links between them. * * Copyright (c) 2016 Mentor Graphics Inc. *
@@ -192,7 +192,7 @@ static struct v4l2_subdev *find_sink(struct imx_media_dev *imxmd,/* * retrieve IPU id from subdev name, note: can't get this from -* struct imx_media_internal_sd_platformdata because if src is +* struct imx_media_ipu_internal_sd_pdata because if src is * a CSI, it has different struct ipu_client_platformdata which * does not contain IPU id. */
@@ -270,7 +270,7 @@ static int add_internal_subdev(struct imx_media_dev *imxmd, const struct internal_subdev *isd, int ipu_id) { -struct imx_media_internal_sd_platformdata pdata; +struct imx_media_ipu_internal_sd_pdata pdata;struct platform_device_info pdevinfo = {};struct platform_device *pdev;
@@ -328,7 +328,7 @@ static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id)return 0 ; } -int imx_media_add_internal_subdevs (struct imx_media_dev *imxmd) +int imx_media_add_ipu_internal_subdevs (struct imx_media_dev *imxmd) {int ret;
@@ -343,11 +343,11 @@ int imx_media_add_internal_subdevs(struct imx_media_dev *imxmd)return 0 ; remove: -imx_media_remove_internal_subdevs (imxmd); +imx_media_remove_ipu_internal_subdevs (imxmd);return ret; } -void imx_media_remove_internal_subdevs (struct imx_media_dev *imxmd) +void imx_media_remove_ipu_internal_subdevs (struct imx_media_dev *imxmd) {struct imx_media_async_subdev *imxasd;struct v4l2_async_subdev *asd;
drivers/staging/media/imx/imx-media-vdic.c +1 -1
@@ -934,7 +934,7 @@ static const struct v4l2_subdev_internal_ops vdic_internal_ops = {static int imx_vdic_probe (struct platform_device *pdev) { -struct imx_media_internal_sd_platformdata *pdata; +struct imx_media_ipu_internal_sd_pdata *pdata;struct vdic_priv *priv;int ret;
drivers/staging/media/imx/imx-media.h +3 -3
@@ -115,7 +115,7 @@ struct imx_media_pad_vdev {struct list_head list; }; -struct imx_media_internal_sd_platformdata { +struct imx_media_ipu_internal_sd_pdata {char sd_name[V4L2_SUBDEV_NAME_SIZE ];u32 grp_id;int ipu_id;
@@ -252,10 +252,10 @@ struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd);void imx_media_fim_free (struct imx_media_fim *fim);/* imx-media-internal-sd.c */ -int imx_media_add_internal_subdevs (struct imx_media_dev *imxmd); +int imx_media_add_ipu_internal_subdevs (struct imx_media_dev *imxmd);int imx_media_create_ipu_internal_links (struct imx_media_dev *imxmd,struct v4l2_subdev *sd); -void imx_media_remove_internal_subdevs (struct imx_media_dev *imxmd); +void imx_media_remove_ipu_internal_subdevs (struct imx_media_dev *imxmd);/* imx-media-of.c */ int imx_media_add_of_subdevs(struct imx_media_dev *dev,
Signature · 1 line
2.17.1
Steve Longerbeam
maintainerPATCH v2 4/4 media: imx: Don't register IPU subdevs/links if CSI port missing
In reply to Steve LongerbeamThe second IPU internal sub-devices were being registered and links to them created even when the second IPU is not present. This is wrong for i.MX6 S/DL and i.MX53 which have only a single IPU.
--- drivers/staging/media/imx/imx-media-dev.c | 7 --- .../staging/media/imx/imx-media-internal-sd.c | 22 ++----- drivers/staging/media/imx/imx-media-of.c | 58 +++++++++++++------ drivers/staging/media/imx/imx-media.h | 3 +- drivers/staging/media/imx/imx7-media-csi.c | 2 +- 5 files changed, 46 insertions(+), 46 deletions(-)
drivers/staging/media/imx/imx-media-dev.c +0 -7
@@ -477,13 +477,6 @@ static int imx_media_probe(struct platform_device *pdev) goto cleanup; } - ret =imx_media_add_ipu_internal_subdevs (imxmd); -if (ret) { -v4l2_err (&imxmd->v4l2_dev, -"add_ipu_internal_subdevs failed with %d\n" , ret); - goto cleanup; - } - ret =imx_media_dev_notifier_register (imxmd);if (ret) goto del_int;
drivers/staging/media/imx/imx-media-internal-sd.c +4 -18
@@ -298,13 +298,14 @@ static int add_internal_subdev(struct imx_media_dev *imxmd, }/* adds the internal subdevs in one ipu */ -static int add_ipu_internal_subdevs (struct imx_media_dev *imxmd,int ipu_id) +int imx_media_add_ipu_internal_subdevs (struct imx_media_dev *imxmd, +int ipu_id) {enum isd_enum i; +int ret;for (i =0 ; i < num_isd; i++) {const struct internal_subdev *isd = &int_subdev[i]; -int ret;/* * the CSIs are represented in the device-tree, so those
@@ -322,25 +323,10 @@ static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id) }if (ret) -return ret; + goto remove; }return 0 ; -} - -int imx_media_add_ipu_internal_subdevs (struct imx_media_dev *imxmd) -{ -int ret; - - ret =add_ipu_internal_subdevs (imxmd,0 ); -if (ret) - goto remove; - - ret =add_ipu_internal_subdevs (imxmd,1 ); -if (ret) - goto remove; - -return 0 ; remove:imx_media_remove_ipu_internal_subdevs (imxmd);
drivers/staging/media/imx/imx-media-of.c +39 -19
87 lines not on this page · raw message
drivers/staging/media/imx/imx-media.h +2 -1
@@ -252,7 +252,8 @@ struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd);void imx_media_fim_free (struct imx_media_fim *fim);/* imx-media-internal-sd.c */ -int imx_media_add_ipu_internal_subdevs (struct imx_media_dev *imxmd); +int imx_media_add_ipu_internal_subdevs (struct imx_media_dev *imxmd, +int ipu_id);int imx_media_create_ipu_internal_links (struct imx_media_dev *imxmd,struct v4l2_subdev *sd);void imx_media_remove_ipu_internal_subdevs (struct imx_media_dev *imxmd);
drivers/staging/media/imx/imx7-media-csi.c +1 -1
@@ -1271,7 +1271,7 @@ static int imx7_csi_probe(struct platform_device *pdev)platform_set_drvdata (pdev, &csi->sd); ret =imx_media_of_add_csi (imxmd, node); -if (ret <0 ) +if (ret <0 && ret != -ENODEV && ret != -EEXIST ) goto cleanup; ret =imx_media_dev_notifier_register (imxmd);
Signature · 1 line
2.17.1