diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0826-media-i2c-imx290-set-bus_type-before-calling-v4l2_fw.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0826-media-i2c-imx290-set-bus_type-before-calling-v4l2_fw.patch | 137 |
1 files changed, 0 insertions, 137 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0826-media-i2c-imx290-set-bus_type-before-calling-v4l2_fw.patch b/target/linux/bcm27xx/patches-5.4/950-0826-media-i2c-imx290-set-bus_type-before-calling-v4l2_fw.patch deleted file mode 100644 index 5180ee60e7..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0826-media-i2c-imx290-set-bus_type-before-calling-v4l2_fw.patch +++ /dev/null @@ -1,137 +0,0 @@ -From e5b34fd95be9c59fe55e4755ba84aa05efaaaf62 Mon Sep 17 00:00:00 2001 -From: Andrey Konovalov <andrey.konovalov@linaro.org> -Date: Fri, 12 Jun 2020 15:53:55 +0200 -Subject: [PATCH] media: i2c: imx290: set bus_type before calling - v4l2_fwnode_endpoint_alloc_parse() - -Commit a270675875829b6d46eb9e38960fd6019555ebb8 upstream. - -The bus_type field of v4l2_fwnode_endpoint structure passed as the argument -to v4l2_fwnode_endpoint_alloc_parse() function must be initiaized. -Set it to V4L2_MBUS_CSI2_DPHY, and check for -ENXIO which is returned -when the requested media bus type doesn't match the fwnode. - -Also remove v4l2_fwnode_endpoint field from struct imx290 as it is only -needed in the probe function: use the local variable for this purpose. - -Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org> -Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> -Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> ---- - drivers/media/i2c/imx290.c | 38 +++++++++++++++++++------------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - ---- a/drivers/media/i2c/imx290.c -+++ b/drivers/media/i2c/imx290.c -@@ -70,7 +70,6 @@ struct imx290 { - u8 bpp; - - struct v4l2_subdev sd; -- struct v4l2_fwnode_endpoint ep; - struct media_pad pad; - struct v4l2_mbus_framefmt current_format; - const struct imx290_mode *current_mode; -@@ -914,17 +913,18 @@ static const struct media_entity_operati - * of MIPI data lanes are mentioned in the device tree, or the value of the - * first missing frequency otherwise. - */ --static s64 imx290_check_link_freqs(const struct imx290 *imx290) -+static s64 imx290_check_link_freqs(const struct imx290 *imx290, -+ const struct v4l2_fwnode_endpoint *ep) - { - int i, j; - const s64 *freqs = imx290_link_freqs_ptr(imx290); - int freqs_count = imx290_link_freqs_num(imx290); - - for (i = 0; i < freqs_count; i++) { -- for (j = 0; j < imx290->ep.nr_of_link_frequencies; j++) -- if (freqs[i] == imx290->ep.link_frequencies[j]) -+ for (j = 0; j < ep->nr_of_link_frequencies; j++) -+ if (freqs[i] == ep->link_frequencies[j]) - break; -- if (j == imx290->ep.nr_of_link_frequencies) -+ if (j == ep->nr_of_link_frequencies) - return freqs[i]; - } - return 0; -@@ -934,6 +934,10 @@ static int imx290_probe(struct i2c_clien - { - struct device *dev = &client->dev; - struct fwnode_handle *endpoint; -+ /* Only CSI2 is supported for now: */ -+ struct v4l2_fwnode_endpoint ep = { -+ .bus_type = V4L2_MBUS_CSI2_DPHY -+ }; - struct imx290 *imx290; - u32 xclk_freq; - s64 fq; -@@ -956,15 +960,18 @@ static int imx290_probe(struct i2c_clien - return -EINVAL; - } - -- ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &imx290->ep); -+ ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &ep); - fwnode_handle_put(endpoint); -- if (ret) { -+ if (ret == -ENXIO) { -+ dev_err(dev, "Unsupported bus type, should be CSI2\n"); -+ goto free_err; -+ } else if (ret) { - dev_err(dev, "Parsing endpoint node failed\n"); - goto free_err; - } - - /* Get number of data lanes */ -- imx290->nlanes = imx290->ep.bus.mipi_csi2.num_data_lanes; -+ imx290->nlanes = ep.bus.mipi_csi2.num_data_lanes; - if (imx290->nlanes != 2 && imx290->nlanes != 4) { - dev_err(dev, "Invalid data lanes: %d\n", imx290->nlanes); - ret = -EINVAL; -@@ -973,27 +980,20 @@ static int imx290_probe(struct i2c_clien - - dev_dbg(dev, "Using %u data lanes\n", imx290->nlanes); - -- if (!imx290->ep.nr_of_link_frequencies) { -+ if (!ep.nr_of_link_frequencies) { - dev_err(dev, "link-frequency property not found in DT\n"); - ret = -EINVAL; - goto free_err; - } - - /* Check that link frequences for all the modes are in device tree */ -- fq = imx290_check_link_freqs(imx290); -+ fq = imx290_check_link_freqs(imx290, &ep); - if (fq) { - dev_err(dev, "Link frequency of %lld is not supported\n", fq); - ret = -EINVAL; - goto free_err; - } - -- /* Only CSI2 is supported for now */ -- if (imx290->ep.bus_type != V4L2_MBUS_CSI2_DPHY) { -- dev_err(dev, "Unsupported bus type, should be CSI2\n"); -- ret = -EINVAL; -- goto free_err; -- } -- - /* get system clock (xclk) */ - imx290->xclk = devm_clk_get(dev, "xclk"); - if (IS_ERR(imx290->xclk)) { -@@ -1108,7 +1108,7 @@ static int imx290_probe(struct i2c_clien - pm_runtime_enable(dev); - pm_runtime_idle(dev); - -- v4l2_fwnode_endpoint_free(&imx290->ep); -+ v4l2_fwnode_endpoint_free(&ep); - - return 0; - -@@ -1118,7 +1118,7 @@ free_ctrl: - v4l2_ctrl_handler_free(&imx290->ctrls); - mutex_destroy(&imx290->lock); - free_err: -- v4l2_fwnode_endpoint_free(&imx290->ep); -+ v4l2_fwnode_endpoint_free(&ep); - - return ret; - } |