media: i2c: ov2659: maintenance series
Subsystems (4)
v5 cover media: i2c: ov2659: maintenance series
This patch series is a collection of patches we have been carrying for a while.
It includes a few sensor register fixes which would cause visual artifacts at lower resolution and also at 720p.
Also on some board the 'powerdown' and /or 'reset' pins are not tied so we need to add support for optional gpios to handle these.
Since these camera are removable on some board we also need the driver to actually fail when there is no hardware present so the driver is actually removed.
Also added a patch to check and propagate errors on s_stream invocation.
Finally, we update the licensing statement to use SPDX licensing.
Changes since v4:
- Changes the s_ctrl "power" access method to use pm runtime API
- Fix an issue with "streaming" vairable left on in error case.
- Added Acked-by from Prabhakar
- Added Reviwed-by from Rob
Changes since v3:
- Addressed review comment from Sakari about s_ctrl i2c access whne powered off
Changes since v2:
- Addressed review comment from Sakari
- Reworked the "media: i2c: ov2659: Add powerdown/reset gpio handling" to use pm_runtime if it is available but not to make it depend on it.
- Cleaned up the gpio related calls to remove the unnecessary NULL check
Changes since v1:
- Addressed review comment from Prabhakar
- Added support for reset-gpios
- Rework the power setting to use pm_runtime instead of s_power as based on discussion with Sakari it would be the prefered method
- Added a patch to reduce the number explicit include files to the minimum necessary instead of the previous kitchen sink approach
Benoit Parrot (8):
media: i2c: ov2659: Fix for image wrap-around in lower resolution
media: i2c: ov2659: Fix sensor detection to actually fail when device
is not present
media: i2c: ov2659: Cleanup include file list
media: i2c: ov2659: fix s_stream return value
media: dt-bindings: ov2659: add powerdown/reset-gpios optional
property
media: i2c: ov2659: Add powerdown/reset gpio handling
media: i2c: ov2659: Fix missing 720p register config
media: i2c: ov2659: Switch to SPDX Licensing
.../devicetree/bindings/media/i2c/ov2659.txt | 9 ++ drivers/media/i2c/Kconfig | 2 +- drivers/media/i2c/ov2659.c | 139 +++++++++++++----- 3 files changed, 112 insertions(+), 38 deletions(-)
Signature · 1 line
2.17.1
PATCH v5 1/8 media: i2c: ov2659: Fix for image wrap-around in lower resolution
Based on recently found sensor configuration examples, it was discovered that when scaling and binning are used for the lower resolutions (i.e. 640x480, 320x240) the read offset has to be increased otherwise the image appears to be wrapped around.
--- drivers/media/i2c/ov2659.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/i2c/ov2659.c +2 -2
@@ -661,7 +661,7 @@ static struct sensor_register ov2659_vga[] = { { REG_TIMING_HORIZ_FORMAT, 0x01 }, { 0x370a, 0x52 }, { REG_VFIFO_READ_START_H, 0x00 }, - { REG_VFIFO_READ_START_L, 0x80 }, + { REG_VFIFO_READ_START_L, 0xa0 }, { REG_ISP_CTRL02, 0x10 }, { REG_NULL, 0x00 }, };
@@ -709,7 +709,7 @@ static struct sensor_register ov2659_qvga[] = { { REG_TIMING_HORIZ_FORMAT, 0x01 }, { 0x370a, 0x52 }, { REG_VFIFO_READ_START_H, 0x00 }, - { REG_VFIFO_READ_START_L, 0x80 }, + { REG_VFIFO_READ_START_L, 0xa0 }, { REG_ISP_CTRL02, 0x10 }, { REG_NULL, 0x00 }, };
Signature · 1 line
2.17.1
PATCH v5 2/8 media: i2c: ov2659: Fix sensor detection to actually fail when device is not present
In reply to Benoit ParrotMake sure that if the expected sensor device id register is not recognized properly the failure is propagated up so devices are not left partially initialized.
--- drivers/media/i2c/ov2659.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/i2c/ov2659.c +3 -2
@@ -1330,11 +1330,12 @@ static int ov2659_detect(struct v4l2_subdev *sd)unsigned short id; id =OV265X_ID (pid, ver); -if (id !=OV2659_ID ) +if (id !=OV2659_ID ) {dev_err (&client->dev,"Sensor detection failed (%04X, %d)\n" , id, ret); -else { + ret = -ENODEV ; + }else {dev_info (&client->dev,"Found OV%04X sensor\n" , id); ret =ov2659_init (sd,0 ); }
Signature · 1 line
2.17.1
PATCH v5 3/8 media: i2c: ov2659: Cleanup include file list
In reply to Benoit ParrotSeveral of include files listed are not explicitly needed. If they are need then they are implicitly included.
Reduce the list of includes to an easier to manage list.
--- drivers/media/i2c/ov2659.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/media/i2c/ov2659.c +0 -14
@@ -22,29 +22,15 @@#include <linux/clk.h> #include <linux/delay.h> -#include <linux/err.h> -#include <linux/init.h> -#include <linux/interrupt.h> -#include <linux/io.h> #include <linux/i2c.h> -#include <linux/kernel.h> -#include <linux/media.h> #include <linux/module.h> -#include <linux/of.h> #include <linux/of_graph.h> -#include <linux/slab.h> -#include <linux/uaccess.h> -#include <linux/videodev2.h> -#include <media/media-entity.h> #include <media/i2c/ov2659.h> -#include <media/v4l2-common.h> #include <media/v4l2-ctrls.h> -#include <media/v4l2-device.h> #include <media/v4l2-event.h> #include <media/v4l2-fwnode.h> #include <media/v4l2-image-sizes.h> -#include <media/v4l2-mediabus.h> #include <media/v4l2-subdev.h> #define DRIVER_NAME "ov2659"
Signature · 1 line
2.17.1
PATCH v5 4/8 media: i2c: ov2659: fix s_stream return value
In reply to Benoit ParrotIn ov2659_s_stream() return value for invoked function should be checked and propagated.
--- drivers/media/i2c/ov2659.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/media/i2c/ov2659.c +9 -5
@@ -1187,11 +1187,15 @@ static int ov2659_s_stream(struct v4l2_subdev *sd, int on) goto unlock; } -ov2659_set_pixel_clock (ov2659); -ov2659_set_frame_size (ov2659); -ov2659_set_format (ov2659); -ov2659_set_streaming (ov2659,1 ); - ov2659->streaming = on; + ret =ov2659_set_pixel_clock (ov2659); +if (!ret) + ret =ov2659_set_frame_size (ov2659); +if (!ret) + ret =ov2659_set_format (ov2659); +if (!ret) { +ov2659_set_streaming (ov2659,1 ); + ov2659->streaming = on; + } unlock:mutex_unlock (&ov2659->lock);
Signature · 1 line
2.17.1
Re: [Patch v5 4/8] media: i2c: ov2659: fix s_stream return value
Quoted 9 lines · Benoit Parrot
In
ov2659_s_stream()return value for invoked function should be checked and propagated.Signed-off-by Benoit Parrot <[email protected]>--- drivers/media/i2c/ov2659.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
Cheers,
--Prabhakar Lad
Quoted 28 lines
drivers/media/i2c/ov2659.c +9
-6@@ -1187,11 +1187,15 @@ static int ov2659_s_stream(struct v4l2_subdev *sd, int on) goto unlock; } -ov2659_set_pixel_clock (ov2659); -ov2659_set_frame_size (ov2659); -ov2659_set_format (ov2659); -ov2659_set_streaming (ov2659,1 ); - ov2659->streaming = on; + ret =ov2659_set_pixel_clock (ov2659); +if (!ret) + ret =ov2659_set_frame_size (ov2659); +if (!ret) + ret =ov2659_set_format (ov2659); +if (!ret) { +ov2659_set_streaming (ov2659,1 ); + ov2659->streaming = on; + } unlock:mutex_unlock (&ov2659->lock); --2.17.1
PATCH v5 5/8 media: dt-bindings: ov2659: add powerdown/reset-gpios optional property
In reply to Benoit ParrotAdd powerdown-gpios and reset-gpios to the list of optional properties for the OV2659 camera sensor.
--- Documentation/devicetree/bindings/media/i2c/ov2659.txt | 9 +++++++++ 1 file changed, 9 insertions(+)
Documentation/devicetree/bindings/media/i2c/ov2659.txt +9 -0
@@ -12,6 +12,12 @@ Required Properties: - clock-names: should be "xvclk". - link-frequencies: target pixel clock frequency. +Optional Properties: +- powerdown-gpios: reference to the GPIO connected to the pwdn pin, if any. + Active high with internal pull down resistor. +- reset-gpios: reference to the GPIO connected to the resetb pin, if any. + Active low with internal pull up resistor. + For further reading on port node refer to Documentation/devicetree/bindings/media/video-interfaces.txt.
@@ -27,6 +33,9 @@ Example: clocks = <&clk_ov2659 0>; clock-names = "xvclk"; + powerdown-gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio6 15 GPIO_ACTIVE_LOW>; + port { ov2659_0: endpoint { remote-endpoint = <&vpfe_ep>;
Signature · 1 line
2.17.1
PATCH v5 6/8 media: i2c: ov2659: Add powerdown/reset gpio handling
In reply to Benoit ParrotOn some board it is possible that the sensor 'powerdown' and or 'reset' pin might be controlled by gpio instead of being tied.
To implement we add pm_runtime support which will handle the power up/down sequence when it is available otherwise the sensor will be powered on at module insertion/probe and powered off at module removal.
Now originally the driver assumed that the sensor would always stay powered and keep its register setting. We cannot assume this anymore, so every time we "power up" we need to re-program the initial registers configuration first. This was previously done only at probe time.
--- drivers/media/i2c/Kconfig | 2 +- drivers/media/i2c/ov2659.c | 86 +++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 3 deletions(-)
drivers/media/i2c/Kconfig +1 -1
@@ -634,7 +634,7 @@ config VIDEO_OV2640 config VIDEO_OV2659 tristate "OmniVision OV2659 sensor support" depends on VIDEO_V4L2 && I2C - depends on MEDIA_CAMERA_SUPPORT + depends on MEDIA_CAMERA_SUPPORT && GPIOLIB select V4L2_FWNODE help This is a Video4Linux2 sensor driver for the OmniVision
drivers/media/i2c/ov2659.c +84 -2
171 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [Patch v5 6/8] media: i2c: ov2659: Add powerdown/reset gpio handling
Quoted 13 lines · Benoit Parrot
On some board it is possible that the sensor 'powerdown' and or 'reset' pin might be controlled by gpio instead of being tied.
To implement we add
pm_runtimesupport which will handle the power up/down sequence when it is available otherwise the sensor will be powered on at module insertion/probe and powered off at module removal.Now originally the driver assumed that the sensor would always stay powered and keep its register setting. We cannot assume this anymore, so every time we "power up" we need to re-program the initial registers configuration first. This was previously done only at probe time.
Quoted 6 lines
Signed-off-by Benoit Parrot <[email protected]>--- drivers/media/i2c/Kconfig | 2 +- drivers/media/i2c/ov2659.c | 86 +++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 3 deletions(-)
Cheers,
--Prabhakar Lad
Quoted 202 lines
drivers/media/i2c/Kconfig +1
-1@@ -634,7 +634,7 @@ config VIDEO_OV2640 config VIDEO_OV2659 tristate "OmniVision OV2659 sensor support" depends on VIDEO_V4L2 && I2C - depends on MEDIA_CAMERA_SUPPORT + depends on MEDIA_CAMERA_SUPPORT && GPIOLIB select V4L2_FWNODE help This is a Video4Linux2 sensor driver for the OmniVisiondrivers/media/i2c/ov2659.c +84
-3@@ -22,9 +22,11 @@#include <linux/clk.h> #include <linux/delay.h> +#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/module.h> #include <linux/of_graph.h> +#include <linux/pm_runtime.h> #include <media/i2c/ov2659.h> #include <media/v4l2-ctrls.h> @@ -218,6 +220,10 @@ struct ov2659 {struct sensor_register *format_ctrl_regs;struct ov2659_pll_ctrl pll;int streaming; +/* used to control the sensor PWDN pin */ +struct gpio_desc *pwdn_gpio; +/* used to control the sensor RESETB pin */ +struct gpio_desc *resetb_gpio; };static const struct sensor_register ov2659_init_regs[] = {@@ -1184,10 +1190,19 @@ static int ov2659_s_stream(struct v4l2_subdev *sd, int on)/* Stop Streaming Sequence */ ov2659_set_streaming (ov2659,0 ); ov2659->streaming = on; +pm_runtime_put (&client->dev); goto unlock; } - ret =ov2659_set_pixel_clock (ov2659); + ret =pm_runtime_get_sync (&client->dev); +if (ret <0 ) { +pm_runtime_put_noidle (&client->dev); + goto unlock; + } + + ret =ov2659_init (sd,0 ); +if (!ret) + ret =ov2659_set_pixel_clock (ov2659);if (!ret) ret =ov2659_set_frame_size (ov2659);if (!ret)@@ -1229,12 +1244,18 @@ static int ov2659_s_ctrl(struct v4l2_ctrl *ctrl) {struct ov2659 *ov2659 = container_of(ctrl->handler, struct ov2659, ctrls); +struct i2c_client *client = ov2659->client; + +/* V4L2 controls values will be applied only when power is already up */ +if (!pm_runtime_get_if_in_use (&client->dev)) +return 0 ;switch (ctrl->id) {case V4L2_CID_TEST_PATTERN :return ov2659_set_test_pattern (ov2659, ctrl->val); } +pm_runtime_put (&client->dev);return 0 ; }@@ -1247,6 +1268,39 @@ static const char * const ov2659_test_pattern_menu[] = { "Vertical Color Bars", }; +static int ov2659_power_off (struct device *dev) +{ +struct i2c_client *client =to_i2c_client (dev); +struct v4l2_subdev *sd =i2c_get_clientdata (client); +struct ov2659 *ov2659 =to_ov2659 (sd); + +dev_dbg (&client->dev,"%s:\n" , __func__); + +gpiod_set_value (ov2659->pwdn_gpio,1 ); + +return 0 ; +} + +static int ov2659_power_on (struct device *dev) +{ +struct i2c_client *client =to_i2c_client (dev); +struct v4l2_subdev *sd =i2c_get_clientdata (client); +struct ov2659 *ov2659 =to_ov2659 (sd); + +dev_dbg (&client->dev,"%s:\n" , __func__); + +gpiod_set_value (ov2659->pwdn_gpio,0 ); + +if (ov2659->resetb_gpio) { +gpiod_set_value (ov2659->resetb_gpio,1 ); +usleep_range (500 ,1000 ); +gpiod_set_value (ov2659->resetb_gpio,0 ); +usleep_range (3000 ,5000 ); + } + +return 0 ; +} +/* ----------------------------------------------------------------------------- * V4L2 subdev internal operations */ @@ -1327,7 +1381,6 @@ static int ov2659_detect(struct v4l2_subdev *sd) ret = -ENODEV ; }else {dev_info (&client->dev,"Found OV%04X sensor\n" , id); - ret =ov2659_init (sd,0 ); } }@@ -1404,6 +1457,18 @@ static int ov2659_probe(struct i2c_client *client) ov2659->xvclk_frequency > 27000000)return -EINVAL ; +/* Optional gpio don't fail if not present */ + ov2659->pwdn_gpio =devm_gpiod_get_optional (&client->dev,"powerdown" , +GPIOD_OUT_LOW ); +if (IS_ERR (ov2659->pwdn_gpio)) +return PTR_ERR (ov2659->pwdn_gpio); + +/* Optional gpio don't fail if not present */ + ov2659->resetb_gpio =devm_gpiod_get_optional (&client->dev,"reset" , +GPIOD_OUT_HIGH ); +if (IS_ERR (ov2659->resetb_gpio)) +return PTR_ERR (ov2659->resetb_gpio); +v4l2_ctrl_handler_init (&ov2659->ctrls,2 ); ov2659->link_frequency = v4l2_ctrl_new_std(&ov2659->ctrls, &ov2659_ctrl_ops,@@ -1449,6 +1514,8 @@ static int ov2659_probe(struct i2c_client *client) ov2659->frame_size = &ov2659_framesizes[2 ]; ov2659->format_ctrl_regs = ov2659_formats[0 ].format_ctrl_regs; +ov2659_power_on (&client->dev); + ret =ov2659_detect (sd);if (ret <0 ) goto error;@@ -1462,10 +1529,15 @@ static int ov2659_probe(struct i2c_client *client)dev_info (&client->dev,"%s sensor driver registered !!\n" , sd->name); +pm_runtime_set_active (&client->dev); +pm_runtime_enable (&client->dev); +pm_runtime_idle (&client->dev); +return 0 ; error:v4l2_ctrl_handler_free (&ov2659->ctrls); +ov2659_power_off (&client->dev);media_entity_cleanup (&sd->entity);mutex_destroy (&ov2659->lock);return ret;@@ -1481,9 +1553,18 @@ static int ov2659_remove(struct i2c_client *client)media_entity_cleanup (&sd->entity);mutex_destroy (&ov2659->lock); +pm_runtime_disable (&client->dev); +if (!pm_runtime_status_suspended (&client->dev)) +ov2659_power_off (&client->dev); +pm_runtime_set_suspended (&client->dev); +return 0 ; } +static const struct dev_pm_ops ov2659_pm_ops = { +SET_RUNTIME_PM_OPS (ov2659_power_off, ov2659_power_on,NULL ) +}; +static const struct i2c_device_id ov2659_id[] = { {"ov2659" ,0 }, {/* sentinel */ },@@ -1501,6 +1582,7 @@ MODULE_DEVICE_TABLE(of, ov2659_of_match);static struct i2c_driver ov2659_i2c_driver = { .driver = { .name =DRIVER_NAME , + .pm = &ov2659_pm_ops, .of_match_table =of_match_ptr (ov2659_of_match), }, .probe_new = ov2659_probe, --2.17.1
PATCH v5 7/8 media: i2c: ov2659: Fix missing 720p register config
In reply to Benoit ParrotThe initial registers sequence is only loaded at probe time. Afterward only the resolution and format specific register are modified. Care must be taken to make sure registers modified by one resolution setting are reverted back when another resolution is programmed.
This was not done properly for the 720p case.
--- drivers/media/i2c/ov2659.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/i2c/ov2659.c +4 -0
@@ -411,10 +411,14 @@ static struct sensor_register ov2659_720p[] = { { REG_TIMING_YINC, 0x11 }, { REG_TIMING_VERT_FORMAT, 0x80 }, { REG_TIMING_HORIZ_FORMAT, 0x00 }, + { 0x370a, 0x12 }, { 0x3a03, 0xe8 }, { 0x3a09, 0x6f }, { 0x3a0b, 0x5d }, { 0x3a15, 0x9a }, + { REG_VFIFO_READ_START_H, 0x00 }, + { REG_VFIFO_READ_START_L, 0x80 }, + { REG_ISP_CTRL02, 0x00 }, { REG_NULL, 0x00 }, };
Signature · 1 line
2.17.1
PATCH v5 8/8 media: i2c: ov2659: Switch to SPDX Licensing
In reply to Benoit ParrotSwitch to SPDX licensing and drop the redundant GPL text.
--- drivers/media/i2c/ov2659.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
drivers/media/i2c/ov2659.c +1 -13
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Omnivision OV2659 CMOS Image Sensor driver *
@@ -5,19 +6,6 @@* * Benoit Parrot <[email protected]> * Lad, Prabhakar <[email protected]> -* -* This program is free software; you may redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; version 2 of the License. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -* SOFTWARE. */ #include <linux/clk.h>
Signature · 1 line
2.17.1