mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
|
From 2beb8ff8039f3ee8262f05d7f3d91c44826e5df9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andrey Konovalov <andrey.konovalov@linaro.org>
|
||
|
|
Date: Fri, 12 Jun 2020 15:53:46 +0200
|
||
|
|
Subject: [PATCH] media: i2c: imx290: set the format before
|
||
|
|
VIDIOC_SUBDEV_G_FMT is called
|
||
|
|
|
||
|
|
Commit d46cfdc86c30d5ec768924f0b1e2683c8d20b671 upstream.
|
||
|
|
|
||
|
|
With the current driver 'media-ctl -p' issued right after the imx290 driver
|
||
|
|
is loaded prints:
|
||
|
|
pad0: Source
|
||
|
|
[fmt:unknown/0x0]
|
||
|
|
|
||
|
|
The format value of zero is due to the current_format field of the imx290
|
||
|
|
struct not being initialized yet.
|
||
|
|
|
||
|
|
As imx290_entity_init_cfg() calls imx290_set_fmt(), the current_mode field
|
||
|
|
is also initialized, so the line which set current_mode to a default value
|
||
|
|
in driver's probe() function is no longer needed.
|
||
|
|
|
||
|
|
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
|
||
|
|
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@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 | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/media/i2c/imx290.c
|
||
|
|
+++ b/drivers/media/i2c/imx290.c
|
||
|
|
@@ -722,9 +722,6 @@ static int imx290_probe(struct i2c_clien
|
||
|
|
goto free_err;
|
||
|
|
}
|
||
|
|
|
||
|
|
- /* Set default mode to max resolution */
|
||
|
|
- imx290->current_mode = &imx290_modes[0];
|
||
|
|
-
|
||
|
|
/* get system clock (xclk) */
|
||
|
|
imx290->xclk = devm_clk_get(dev, "xclk");
|
||
|
|
if (IS_ERR(imx290->xclk)) {
|
||
|
|
@@ -809,6 +806,9 @@ static int imx290_probe(struct i2c_clien
|
||
|
|
goto free_ctrl;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ /* Initialize the frame format (this also sets imx290->current_mode) */
|
||
|
|
+ imx290_entity_init_cfg(&imx290->sd, NULL);
|
||
|
|
+
|
||
|
|
ret = v4l2_async_register_subdev(&imx290->sd);
|
||
|
|
if (ret < 0) {
|
||
|
|
dev_err(dev, "Could not register v4l2 device\n");
|