| Message ID | 20190117205837.29003-1-slongerbeam@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] media: imx-csi: Input connections to CSI should be optional | expand |
Hi Steve, On Thu, Jan 17, 2019 at 6:59 PM Steve Longerbeam <slongerbeam@gmail.com> wrote: > > Some imx platforms do not have fwnode connections to all CSI input > ports, and should not be treated as an error. This includes the > imx6q SabreAuto, which has no connections to ipu1_csi1 and ipu2_csi0. > Return -ENOTCONN in imx_csi_parse_endpoint() so that v4l2-fwnode > endpoint parsing will not treat an unconnected CSI input port as > an error. > > Fixes: c893500a16baf ("media: imx: csi: Register a subdev notifier") > > Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> > Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> > Acked-by: Tim Harvey <tharvey@gateworks.com> > Cc: stable@vger.kernel.org Thanks. This fixes the following error messages: [ 3.449564] imx-ipuv3 2400000.ipu: driver could not parse port@1/endpoint@0 (-22) [ 3.457342] imx-ipuv3-csi: probe of imx-ipuv3-csi.1 failed with error -22 [ 3.464498] imx-ipuv3 2800000.ipu: driver could not parse port@0/endpoint@0 (-22) [ 3.472120] imx-ipuv3-csi: probe of imx-ipuv3-csi.4 failed with error -22 Tested-by: Fabio Estevam <festevam@gmail.com>
diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index 555aa45e02e3..e18f58f56dfb 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -1861,7 +1861,7 @@ static int imx_csi_parse_endpoint(struct device *dev, struct v4l2_fwnode_endpoint *vep, struct v4l2_async_subdev *asd) { - return fwnode_device_is_available(asd->match.fwnode) ? 0 : -EINVAL; + return fwnode_device_is_available(asd->match.fwnode) ? 0 : -ENOTCONN; } static int imx_csi_async_register(struct csi_priv *priv)
Some imx platforms do not have fwnode connections to all CSI input ports, and should not be treated as an error. This includes the imx6q SabreAuto, which has no connections to ipu1_csi1 and ipu2_csi0. Return -ENOTCONN in imx_csi_parse_endpoint() so that v4l2-fwnode endpoint parsing will not treat an unconnected CSI input port as an error. Fixes: c893500a16baf ("media: imx: csi: Register a subdev notifier") Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Acked-by: Tim Harvey <tharvey@gateworks.com> Cc: stable@vger.kernel.org --- Changes in v2: - Added some acks and Cc: stable. No functional changes. --- drivers/staging/media/imx/imx-media-csi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)