| Message ID | 20200612135355.30286-1-andrey.konovalov@linaro.org |
|---|---|
| Headers | show |
| Series | Improvements to IMX290 CMOS driver | expand |
On 12 June 2020 7:23:55 PM IST, Andrey Konovalov <andrey.konovalov@linaro.org> wrote: >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> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Wondering if we need to tag fixes for this patch! Thanks, Mani >--- > drivers/media/i2c/imx290.c | 38 +++++++++++++++++++------------------- > 1 file changed, 19 insertions(+), 19 deletions(-) > >diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c >index 02001c1b0dfc..9c97830164e9 100644 >--- 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_operations >imx290_subdev_entity_ops = { >* 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_client *client) > { > 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_client >*client) > 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_client >*client) > > 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_client >*client) > 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 @@ static int imx290_probe(struct i2c_client >*client) > 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; > } -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
This patchset adds improvements to the existing media driver for IMX290 CMOS sensor from Sony. The major changes are adding 2 lane support, configurable link frequency & pixel rate, test pattern generation, and RAW12 mode support. The link frequency & pixel rate combinations depend on various factors like lane count, resolution and image format as per the datasheet. Also fixes for the following issues in the existing driver are included: * the current_format field in the struct imx290 can be used before initialization, * the reset signal to IMX290 isn't handled correctly, * the bus_type field of v4l2_fwnode_endpoint structure passed as the argument to v4l2_fwnode_endpoint_alloc_parse() function is not initiaized. Changes in v5: * Fixed the "Possible unwrapped commit description" issues reported by checkpatch.pl. The "msleep < 20ms can sleep for up to 20ms" warnings are still here, as sleeping for 20ms when the imx290 driver calls msleep(10) is fine Changes in v4: * The review comments from Sakari and Dave are addressed https://lkml.org/lkml/2020/5/24/294 In particular, . HMAX values are included into struct imx290_mode. As the consequence, imx290_modes[] table splitted in two (one for 2-lane configuration, and another for the 4-lane one) . link frequency indexes are kept in struct imx290_mode to avoid using the width field as the key for modes table by imx290_get_link_freq_index(). These are still indexes, not the frequencies themselves: we need a separate tables of the frequencies for the V4L2_CID_LINK_FREQ integer menu control anyway, so the link frequency values should be better kept there (in one place) . imx290_modes_[ptr,num]() and imx290_link_freqs_[ptr,num]() helpers introduced to get rid of repeating lane configuration checks in the code . do_div() is used in imx290_calc_pixel_rate() to fix the build error on 32-bit systems . the check for the link frequencies listed in the device tree is reworked to handle multiple frequencies (vs removing the check entirely in v3) . imx290_enum_frame_size() is not changed since v3: all (of the 2) modes are supported for all the media codes. So the available modes / frame sizes have no dependency on the media code. The fse->code check in imx290_enum_frame_size() just guards against the codes not supported by the driver at all * removed calling imx290_set_data_lanes() from imx290_probe(): the probe() calls imx290_power_on() a bit earlier, and imx290_power_on() sets the number of data lanes * FREQ_INDEX_1080P/FREQ_INDEX_720P #define's introduced to make using imx290_link_freq_* tables a bit more error-proof * the values in the imx290_link_freq_*[] tables are devided by 2: the previous ones were equal to the data rates which are twice as the link frequency Changes in v3: * The review comments from Sakari are addressed https://lkml.org/lkml/2019/12/19/705 As a part of those changes: . null ptr checks are added to imx290_set_fmt() so that it can be called early in the probe() function to set the default format, and to initialize imx290->current_mode and imx290->bpp - these last two must be set before imx290_calc_pixel_rate() is called when creating the controls . setting imx290->bpp removed from imx290_write_current_format(). Now this function only writes to the camera sensor registers. The call to imx290_write_current_format() is moved from imx290_set_fmt() back to imx290_start_streaming(): imx290_set_fmt() can be called when the sensor is powered off, and writes to the sensor registers would fail. . in imx290_set_ctrl() in the 12 bpp case the value the BLKLEVEL register is restored to when the test pattern is disabled is made consistent with imx290_12bit_settings[] * The "IMX290 sensor driver fixes" patchset included https://patchwork.kernel.org/cover/11407347/ * Added a patch to set the bus_type field of v4l2_fwnode_endpoint structure before calling v4l2_fwnode_endpoint_alloc_parse() Andrey Konovalov (4): media: i2c: imx290: set the format before VIDIOC_SUBDEV_G_FMT is called media: i2c: imx290: fix the order of the args in SET_RUNTIME_PM_OPS() media: i2c: imx290: fix reset GPIO pin handling media: i2c: imx290: set bus_type before calling v4l2_fwnode_endpoint_alloc_parse() Manivannan Sadhasivam (6): media: i2c: imx290: Add support for 2 data lanes media: i2c: imx290: Add configurable link frequency and pixel rate media: i2c: imx290: Add support for test pattern generation media: i2c: imx290: Add RAW12 mode support media: i2c: imx290: Add support to enumerate all frame sizes media: i2c: imx290: Move the settle time delay out of loop drivers/media/i2c/imx290.c | 404 +++++++++++++++++++++++++++++++------ 1 file changed, 343 insertions(+), 61 deletions(-) -- 2.17.1