Support OVTI7251 on Microsoft Surface line
v2 cover Support OVTI7251 on Microsoft Surface line
Hello all
This series extends the OV7251 driver so it's functional on the Microsoft Surface line of laptops, where it's used as the IR camera for face login. The camera sensor is connected to a CIO2 device which packs the 10-bit greyscale data into 25 pixels per 32 bytes similar to the IPU3 formats for Bayer data, so I also added a new format to describe that and added it to the ipu3-cio2 driver's list of supported formats.
Series-level changes:
- Added patch 5 removing per-mode frequency settings
Thanks
Dan
Daniel Scally (11):
media: uapi: Add IPU3 packed Y10 format
media: ipu3-cio2: Add support for V4L2_PIX_FMT_IPU3_Y10
media: i2c: Add acpi support to ov7251
media: i2c: Provide ov7251_check_hwcfg()
media: i2c: Remove per-mode frequencies from ov7251
media: i2c: Add ov7251_pll_configure()
media: i2c: Add support for new frequencies to ov7251
media: i2c: Add ov7251_detect_chip()
media: i2c: Add pm_runtime support to ov7251
media: i2c: Remove .s_power() from ov7251
media: ipu3-cio2: Add INT347E to cio2-bridge
.../media/v4l/pixfmt-yuv-luma.rst | 14 +- drivers/media/i2c/ov7251.c | 565 ++++++++++++------ drivers/media/pci/intel/ipu3/cio2-bridge.c | 2 + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 7 +- drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 3 +- 6 files changed, 412 insertions(+), 180 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/11 media: uapi: Add IPU3 packed Y10 format
Some platforms with an Intel IPU3 have an IR sensor producing 10 bit greyscale format data that is transmitted over a CSI-2 bus to a CIO2 device - this packs the data into 32 bytes per 25 pixels. Add an entry to the uAPI header defining that format.
---
Changes in v2:
- Switched away from using the fourcc in the explanatory note for pixfmt-yuv-luma.rst (Nicolas)
.../userspace-api/media/v4l/pixfmt-yuv-luma.rst | 14 +++++++++++++- drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-)
Documentation/userspace-api/media/v4l/pixfmt-yuv-luma.rst +13 -1
@@ -48,6 +48,17 @@ are often referred to as greyscale formats. - ... - ... + * .. _V4L2-PIX-FMT-IPU3-Y10: + + - ``V4L2_PIX_FMT_IPU3_Y10`` + - 'ip3y' + + - Y'\ :sub:`0`\ [7:0] + - Y'\ :sub:`1`\ [5:0] Y'\ :sub:`0`\ [9:8] + - Y'\ :sub:`2`\ [3:0] Y'\ :sub:`1`\ [9:6] + - Y'\ :sub:`3`\ [1:0] Y'\ :sub:`2`\ [9:4] + - Y'\ :sub:`3`\ [9:2] + * .. _V4L2-PIX-FMT-Y10: - ``V4L2_PIX_FMT_Y10``
@@ -133,4 +144,5 @@ are often referred to as greyscale formats. For the Y16 and Y16_BE formats, the actual sampling precision may be lower than 16 bits. For example, 10 bits per pixel uses values in the range 0 to - 1023. + 1023. For the IPU3_Y10 format 25 pixels are packed into 32 bytes, which + leaves the 6 most significant bits of the last byte padded with 0.
drivers/media/v4l2-core/v4l2-ioctl.c +1 -0
@@ -1263,6 +1263,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)case V4L2_PIX_FMT_Y16_BE : descr ="16-bit Greyscale BE" ;break ;case V4L2_PIX_FMT_Y10BPACK : descr ="10-bit Greyscale (Packed)" ;break ;case V4L2_PIX_FMT_Y10P : descr ="10-bit Greyscale (MIPI Packed)" ;break ; +case V4L2_PIX_FMT_IPU3_Y10 : descr ="10-bit greyscale (IPU3 Packed)" ;break ;case V4L2_PIX_FMT_Y8I : descr ="Interleaved 8-bit Greyscale" ;break ;case V4L2_PIX_FMT_Y12I : descr ="Interleaved 12-bit Greyscale" ;break ;case V4L2_PIX_FMT_Z16 : descr ="16-bit Depth" ;break ;
include/uapi/linux/videodev2.h +2 -1
@@ -569,6 +569,7 @@ struct v4l2_pix_format {/* Grey bit-packed formats */ #define V4L2_PIX_FMT_Y10BPACK v4l2_fourcc('Y', '1', '0', 'B')/* 10 Greyscale bit-packed */ #define V4L2_PIX_FMT_Y10P v4l2_fourcc('Y', '1', '0', 'P')/* 10 Greyscale, MIPI RAW10 packed */ +#define V4L2_PIX_FMT_IPU3_Y10 v4l2_fourcc('i', 'p', '3', 'y')/* IPU3 packed 10-bit greyscale */ /* Palette formats */ #define V4L2_PIX_FMT_PAL8 v4l2_fourcc('P', 'A', 'L', '8')/* 8 8-bit palette */
@@ -744,7 +745,7 @@ struct v4l2_pix_format {#define V4L2_PIX_FMT_CNF4 v4l2_fourcc('C', 'N', 'F', '4')/* Intel 4-bit packed depth confidence information */ #define V4L2_PIX_FMT_HI240 v4l2_fourcc('H', 'I', '2', '4')/* BTTV 8-bit dithered RGB */ -/* 10bit raw bayer packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */ +/* 10bit raw packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */ #define V4L2_PIX_FMT_IPU3_SBGGR10 v4l2_fourcc('i', 'p', '3', 'b')/* IPU3 packed 10-bit BGGR bayer */ #define V4L2_PIX_FMT_IPU3_SGBRG10 v4l2_fourcc('i', 'p', '3', 'g')/* IPU3 packed 10-bit GBRG bayer */ #define V4L2_PIX_FMT_IPU3_SGRBG10 v4l2_fourcc('i', 'p', '3', 'G')/* IPU3 packed 10-bit GRBG bayer */
Signature · 1 line
2.25.1
PATCH v2 2/11 media: ipu3-cio2: Add support for V4L2_PIX_FMT_IPU3_Y10
In reply to Daniel ScallyWe have platforms where a camera sensor transmits Y10 data to the CIO2 device - add support for that (packed) format to the ipu3-cio2 driver.
---
Changes in v2:
- None
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +6 -1
@@ -65,7 +65,12 @@ static const struct ipu3_cio2_fmt formats[] = { .fourcc = V4L2_PIX_FMT_IPU3_SRGGB10, .mipicode = 0x2b, .bpp = 10, - }, + }, { + .mbus_code = MEDIA_BUS_FMT_Y10_1X10, + .fourcc = V4L2_PIX_FMT_IPU3_Y10, + .mipicode = 0x2b, + .bpp = 10, + } };/*
Signature · 1 line
2.25.1
Re: [PATCH v2 02/11] media: ipu3-cio2: Add support for V4L2_PIX_FMT_IPU3_Y10
Quoted 3 lines · Daniel Scally
We have platforms where a camera sensor transmits Y10 data to the CIO2 device - add support for that (packed) format to the ipu3-cio2 driver.
...
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c static const struct ipu3_cio2_fmt formats[] = { · line 68
Quoted 1 line
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +0
-1- },
Why?
Quoted 6 lines
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +6
-0+ }, { + .mbus_code = MEDIA_BUS_FMT_Y10_1X10, + .fourcc = V4L2_PIX_FMT_IPU3_Y10, + .mipicode = 0x2b, + .bpp = 10, + }
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 02/11] media: ipu3-cio2: Add support for V4L2_PIX_FMT_IPU3_Y10
Hi Andy
Quoted 8 lines · Andy Shevchenko
Quoted 3 lines · Daniel Scally
We have platforms where a camera sensor transmits Y10 data to the CIO2 device - add support for that (packed) format to the ipu3-cio2 driver.
...
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c static const struct ipu3_cio2_fmt formats[] = { · line 68
Quoted 1 line
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +0
-1- },Why?
Why have the open and close brace on the same line you mean? Its just the format that the other entries use, so I copied it.
Quoted 7 lines
Quoted 7 lines
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +6
-0+ }, { + .mbus_code = MEDIA_BUS_FMT_Y10_1X10, + .fourcc = V4L2_PIX_FMT_IPU3_Y10, + .mipicode = 0x2b, + .bpp = 10, + }
Re: [PATCH v2 02/11] media: ipu3-cio2: Add support for V4L2_PIX_FMT_IPU3_Y10
Quoted 8 lines · Daniel Scally
Hi Andy
Quoted 4 lines · Andy Shevchenko
Quoted 3 lines · Daniel Scally
We have platforms where a camera sensor transmits Y10 data to the CIO2 device - add support for that (packed) format to the ipu3-cio2 driver.
Quoted 8 lines
Quoted 4 lines
...
Quoted 1 line
- },
Why?
Why have the open and close brace on the same line you mean? Its just the format that the other entries use, so I copied it.
I meant why you touched that line and as a consequence removed the comma.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +6
-0+ }, { + .mbus_code = MEDIA_BUS_FMT_Y10_1X10, + .fourcc = V4L2_PIX_FMT_IPU3_Y10, + .mipicode = 0x2b, + .bpp = 10, + }
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 02/11] media: ipu3-cio2: Add support for V4L2_PIX_FMT_IPU3_Y10
Quoted 8 lines · Andy Shevchenko
Quoted 7 lines · Daniel Scally
Hi Andy
Quoted 4 lines · Andy Shevchenko
Quoted 3 lines · Daniel Scally
We have platforms where a camera sensor transmits Y10 data to the CIO2 device - add support for that (packed) format to the ipu3-cio2 driver.
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines
...
Quoted 1 line
- },
Why?
Why have the open and close brace on the same line you mean? Its just the format that the other entries use, so I copied it.
I meant why you touched that line and as a consequence removed the comma.
Ah - I didn't close my new entry in that table with a comma. I can fix that in the next version
Quoted 9 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +6
-0+ }, { + .mbus_code = MEDIA_BUS_FMT_Y10_1X10, + .fourcc = V4L2_PIX_FMT_IPU3_Y10, + .mipicode = 0x2b, + .bpp = 10, + }
PATCH v2 3/11 media: i2c: Add acpi support to ov7251
In reply to Daniel ScallyAdd support for enumeration through ACPI to the ov7251 driver
---
Changes in v2:
- None
drivers/media/i2c/ov7251.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/media/i2c/ov7251.c +8 -0
@@ -14,6 +14,7 @@#include <linux/i2c.h> #include <linux/init.h> #include <linux/module.h> +#include <linux/mod_devicetable.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/types.h>
@@ -1490,9 +1491,16 @@ static const struct of_device_id ov7251_of_match[] = { };MODULE_DEVICE_TABLE (of, ov7251_of_match); +static const struct acpi_device_id ov7251_acpi_match[] = { + {"INT347E" }, + { } +}; +MODULE_DEVICE_TABLE (acpi, ov7251_acpi_match); +static struct i2c_driver ov7251_i2c_driver = { .driver = { .of_match_table = ov7251_of_match, + .acpi_match_table = ov7251_acpi_match, .name ="ov7251" , }, .probe_new = ov7251_probe,
Signature · 1 line
2.25.1
PATCH v2 4/11 media: i2c: Provide ov7251_check_hwcfg()
In reply to Daniel ScallyMove the endpoint checking from .probe() to a dedicated function, and additionally check that the firmware provided link frequencies are a match for those supported by the driver. Store the index to the matching link frequency so it can be easily identified later.
---
Changes in v2:
- Switched to use unsigned int (Sakari)
- Dropped the checks for bus_type and number of data lanes (Sakari)
- Fixed the double-loop break (Dave)
- Stored the index to the configured link frequency so it can be used later on.
drivers/media/i2c/ov7251.c | 78 +++++++++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 18 deletions(-)
drivers/media/i2c/ov7251.c +60 -18
@@ -60,6 +60,11 @@ struct ov7251_mode_info {struct v4l2_fract timeperframe; }; +enum supported_link_freqs { +OV7251_LINK_FREQ_240_MHZ , +OV7251_NUM_SUPPORTED_LINK_FREQS +}; +struct ov7251 {struct i2c_client *i2c_client;struct device *dev;
@@ -75,6 +80,7 @@ struct ov7251 {struct regulator *core_regulator;struct regulator *analog_regulator; +enum supported_link_freqs link_freq_idx;const struct ov7251_mode_info *current_mode;struct v4l2_ctrl_handler ctrls;
@@ -1255,10 +1261,61 @@ static const struct v4l2_subdev_ops ov7251_subdev_ops = { .pad = &ov7251_subdev_pad_ops, }; +static int ov7251_check_hwcfg (struct ov7251 *ov7251) +{ +struct fwnode_handle *fwnode =dev_fwnode (ov7251->dev); +struct v4l2_fwnode_endpoint bus_cfg = { + .bus_type =V4L2_MBUS_CSI2_DPHY , + }; +struct fwnode_handle *endpoint; +bool freq_found = false; +unsigned int i, j; +int ret; + + endpoint =fwnode_graph_get_next_endpoint (fwnode,NULL ); +if (!endpoint) +return -EPROBE_DEFER ;/* could be provided by cio2-bridge */ + + ret =v4l2_fwnode_endpoint_alloc_parse (endpoint, &bus_cfg); +fwnode_handle_put (endpoint); +if (ret) +return dev_err_probe (ov7251->dev, ret, +"parsing endpoint node failed\n" ); + +if (!bus_cfg.nr_of_link_frequencies) { +dev_err (ov7251->dev,"no link frequencies defined\n" ); + ret = -EINVAL ; + goto out_free_bus_cfg; + } + +for (i =0 ; i < bus_cfg.nr_of_link_frequencies; i++) { +for (j =0 ; j <ARRAY_SIZE (link_freq); j++) +if (bus_cfg.link_frequencies[i] == link_freq[j]) { + freq_found = true; +break ; + } + +if (freq_found) +break ; + } + +if (i == bus_cfg.nr_of_link_frequencies) { +dev_err (ov7251->dev,"no supported link freq found\n" ); + ret = -EINVAL ; + goto out_free_bus_cfg; + } + + ov7251->link_freq_idx = i; + +out_free_bus_cfg: +v4l2_fwnode_endpoint_free (&bus_cfg); + +return ret; +} +static int ov7251_probe (struct i2c_client *client) {struct device *dev = &client->dev; -struct fwnode_handle *endpoint;struct ov7251 *ov7251;u8 chip_id_high, chip_id_low, chip_rev;int ret;
@@ -1270,24 +1327,9 @@ static int ov7251_probe(struct i2c_client *client) ov7251->i2c_client = client; ov7251->dev = dev; - endpoint =fwnode_graph_get_next_endpoint (dev_fwnode (dev),NULL ); -if (!endpoint) { -dev_err (dev,"endpoint node not found\n" ); -return -EINVAL ; - } - - ret =v4l2_fwnode_endpoint_parse (endpoint, &ov7251->ep); -fwnode_handle_put (endpoint); -if (ret <0 ) { -dev_err (dev,"parsing endpoint node failed\n" ); + ret =ov7251_check_hwcfg (ov7251); +if (ret)return ret; - } - -if (ov7251->ep.bus_type !=V4L2_MBUS_CSI2_DPHY ) { -dev_err (dev,"invalid bus type (%u), must be CSI2 (%u)\n" , - ov7251->ep.bus_type,V4L2_MBUS_CSI2_DPHY ); -return -EINVAL ; - }/* get system clock (xclk) */ ov7251->xclk =devm_clk_get (dev,"xclk" );
Signature · 1 line
2.25.1
Re: [PATCH v2 04/11] media: i2c: Provide ov7251_check_hwcfg()
Quoted 4 lines · Daniel Scally
Move the endpoint checking from .probe() to a dedicated function, and additionally check that the firmware provided link frequencies are a match for those supported by the driver. Store the index to the matching link frequency so it can be easily identified later.
...
drivers/media/i2c/ov7251.c static const struct v4l2_subdev_ops ov7251_subdev_ops = { · line 1287
Quoted 10 lines
drivers/media/i2c/ov7251.c +9
-0+ ret =v4l2_fwnode_endpoint_alloc_parse (endpoint, &bus_cfg); +fwnode_handle_put (endpoint); +if (ret) +return dev_err_probe (ov7251->dev, ret, +"parsing endpoint node failed\n" ); + +if (!bus_cfg.nr_of_link_frequencies) { +dev_err (ov7251->dev,"no link frequencies defined\n" ); + ret = -EINVAL ;
It's also fine to use dev_err_probe() here.
drivers/media/i2c/ov7251.c static const struct v4l2_subdev_ops ov7251_subdev_ops = { · line 1299
Quoted 12 lines
drivers/media/i2c/ov7251.c +12
-0+ goto out_free_bus_cfg; + } + +for (i =0 ; i < bus_cfg.nr_of_link_frequencies; i++) { +for (j =0 ; j <ARRAY_SIZE (link_freq); j++) +if (bus_cfg.link_frequencies[i] == link_freq[j]) { + freq_found = true; +break ; + } + +if (freq_found) +break ;
freq_found may be replaced by the
if (j < ARRAY_SIZE(link_freq))
here.
drivers/media/i2c/ov7251.c static const struct v4l2_subdev_ops ov7251_subdev_ops = { · line 1304
Quoted 5 lines
drivers/media/i2c/ov7251.c +5
-0+ } + +if (i == bus_cfg.nr_of_link_frequencies) { +dev_err (ov7251->dev,"no supported link freq found\n" ); + ret = -EINVAL ;
dev_err_probe()
Quoted 10 lines
drivers/media/i2c/ov7251.c +10
-0+ goto out_free_bus_cfg; + } + + ov7251->link_freq_idx = i; + +out_free_bus_cfg: +v4l2_fwnode_endpoint_free (&bus_cfg); + +return ret; +}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 04/11] media: i2c: Provide ov7251_check_hwcfg()
Hi Andy
Quoted 7 lines · Andy Shevchenko
Quoted 4 lines · Daniel Scally
Move the endpoint checking from .probe() to a dedicated function, and additionally check that the firmware provided link frequencies are a match for those supported by the driver. Store the index to the matching link frequency so it can be easily identified later.
...
Quoted 10 lines
drivers/media/i2c/ov7251.c static const struct v4l2_subdev_ops ov7251_subdev_ops = { · line 1287
Quoted 9 lines
drivers/media/i2c/ov7251.c +9
-0+ ret =v4l2_fwnode_endpoint_alloc_parse (endpoint, &bus_cfg); +fwnode_handle_put (endpoint); +if (ret) +return dev_err_probe (ov7251->dev, ret, +"parsing endpoint node failed\n" ); + +if (!bus_cfg.nr_of_link_frequencies) { +dev_err (ov7251->dev,"no link frequencies defined\n" ); + ret = -EINVAL ;It's also fine to use
dev_err_probe()here.
Yup will switch to that.
Quoted 15 lines
drivers/media/i2c/ov7251.c static const struct v4l2_subdev_ops ov7251_subdev_ops = { · line 1299
Quoted 13 lines
drivers/media/i2c/ov7251.c +12
-0+ goto out_free_bus_cfg; + } + +for (i =0 ; i < bus_cfg.nr_of_link_frequencies; i++) { +for (j =0 ; j <ARRAY_SIZE (link_freq); j++) +if (bus_cfg.link_frequencies[i] == link_freq[j]) { + freq_found = true; +break ; + } + +if (freq_found) +break ;
freq_foundmay be replaced by the
Quoted 3 lines
if (j <
ARRAY_SIZE(link_freq))here.
Huh oh yeah. I don't know why that never occurred to me...I was originally even using a goto and swapped it because it was ugly. Thanks!
Quoted 18 lines
drivers/media/i2c/ov7251.c static const struct v4l2_subdev_ops ov7251_subdev_ops = { · line 1304
Quoted 6 lines
drivers/media/i2c/ov7251.c +5
-0+ } + +if (i == bus_cfg.nr_of_link_frequencies) { +dev_err (ov7251->dev,"no supported link freq found\n" ); + ret = -EINVAL ;
dev_err_probe()Quoted 10 lines
drivers/media/i2c/ov7251.c +10
-0+ goto out_free_bus_cfg; + } + + ov7251->link_freq_idx = i; + +out_free_bus_cfg: +v4l2_fwnode_endpoint_free (&bus_cfg); + +return ret; +}
PATCH v2 5/11 media: i2c: Remove per-mode frequencies from ov7251
In reply to Daniel ScallyEach of the defined modes in the ov7251 driver uses the same link frequency and pixel rate; just drop those members of the modes and set the controls to read only during initialisation. Add a new table defining the supported pixel rates to substitue for the values hardcoded in the modes.
---
Changes in v2:
- New patch
drivers/media/i2c/ov7251.c | 43 +++++++++++++------------------------- 1 file changed, 14 insertions(+), 29 deletions(-)
drivers/media/i2c/ov7251.c +14 -29
@@ -526,7 +526,11 @@ static const struct reg_value ov7251_setting_vga_90fps[] = { };static const s64 link_freq[] = { -240000000 , + [OV7251_LINK_FREQ_240_MHZ ] =240000000 , +}; + +static const s64 pixel_rates[] = { + [OV7251_LINK_FREQ_240_MHZ ] =48000000 , };static const struct ov7251_mode_info ov7251_mode_info_data[] = {
@@ -535,8 +539,6 @@ static const struct ov7251_mode_info ov7251_mode_info_data[] = { .height = 480, .data = ov7251_setting_vga_30fps, .data_size = ARRAY_SIZE(ov7251_setting_vga_30fps), - .pixel_clock = 48000000, - .link_freq = 0, /* an index in link_freq[] */ .exposure_max = 1704, .exposure_def = 504, .timeperframe = {
@@ -549,8 +551,6 @@ static const struct ov7251_mode_info ov7251_mode_info_data[] = { .height = 480, .data = ov7251_setting_vga_60fps, .data_size = ARRAY_SIZE(ov7251_setting_vga_60fps), - .pixel_clock = 48000000, - .link_freq = 0, /* an index in link_freq[] */ .exposure_max = 840, .exposure_def = 504, .timeperframe = {
@@ -563,8 +563,6 @@ static const struct ov7251_mode_info ov7251_mode_info_data[] = { .height = 480, .data = ov7251_setting_vga_90fps, .data_size = ARRAY_SIZE(ov7251_setting_vga_90fps), - .pixel_clock = 48000000, - .link_freq = 0, /* an index in link_freq[] */ .exposure_max = 552, .exposure_def = 504, .timeperframe = {
@@ -1059,16 +1057,6 @@ static int ov7251_set_format(struct v4l2_subdev *sd, __crop->height = new_mode->height;if (format->which ==V4L2_SUBDEV_FORMAT_ACTIVE ) { - ret =__v4l2_ctrl_s_ctrl_int64 (ov7251->pixel_clock, - new_mode->pixel_clock); -if (ret <0 ) - goto exit; - - ret =__v4l2_ctrl_s_ctrl (ov7251->link_freq, - new_mode->link_freq); -if (ret <0 ) - goto exit; - ret =__v4l2_ctrl_modify_range (ov7251->exposure,1 , new_mode->exposure_max,1 , new_mode->exposure_def);
@@ -1199,16 +1187,6 @@ static int ov7251_set_frame_interval(struct v4l2_subdev *subdev, new_mode =ov7251_find_mode_by_ival (ov7251, &fi->interval);if (new_mode != ov7251->current_mode) { - ret =__v4l2_ctrl_s_ctrl_int64 (ov7251->pixel_clock, - new_mode->pixel_clock); -if (ret <0 ) - goto exit; - - ret =__v4l2_ctrl_s_ctrl (ov7251->link_freq, - new_mode->link_freq); -if (ret <0 ) - goto exit; - ret =__v4l2_ctrl_modify_range (ov7251->exposure,1 , new_mode->exposure_max,1 , new_mode->exposure_def);
@@ -1318,6 +1296,7 @@ static int ov7251_probe(struct i2c_client *client)struct device *dev = &client->dev;struct ov7251 *ov7251;u8 chip_id_high, chip_id_low, chip_rev; +s64 pixel_rate;int ret; ov7251 =devm_kzalloc (dev,sizeof (struct ov7251 ),GFP_KERNEL );
@@ -1399,17 +1378,23 @@ static int ov7251_probe(struct i2c_client *client)V4L2_CID_TEST_PATTERN ,ARRAY_SIZE (ov7251_test_pattern_menu) -1 , 0, 0, ov7251_test_pattern_menu); + + pixel_rate = pixel_rates[ov7251->link_freq_idx]; ov7251->pixel_clock =v4l2_ctrl_new_std (&ov7251->ctrls, &ov7251_ctrl_ops,V4L2_CID_PIXEL_RATE , -1 ,INT_MAX ,1 ,1 ); + pixel_rate,INT_MAX , + pixel_rate, pixel_rate); ov7251->link_freq =v4l2_ctrl_new_int_menu (&ov7251->ctrls, &ov7251_ctrl_ops,V4L2_CID_LINK_FREQ ,ARRAY_SIZE (link_freq) -1 , -0 , link_freq); + ov7251->link_freq_idx, + link_freq);if (ov7251->link_freq) ov7251->link_freq->flags |=V4L2_CTRL_FLAG_READ_ONLY ; +if (ov7251->pixel_clock) + ov7251->pixel_clock->flags |=V4L2_CTRL_FLAG_READ_ONLY ; ov7251->sd.ctrl_handler = &ov7251->ctrls;
Signature · 1 line
2.25.1
PATCH v2 6/11 media: i2c: Add ov7251_pll_configure()
In reply to Daniel ScallyRather than having the pll settings hidden inside mode blobs, define them in structs and use a dedicated function to set them. This makes it simpler to extend the driver to support other frequencies for both the external clock and desired link frequency.
---
Changes in v2:
- Updated to support different link-frequencies in addition to different external clock frequencies.
drivers/media/i2c/ov7251.c | 175 ++++++++++++++++++++++++++++++------- 1 file changed, 145 insertions(+), 30 deletions(-)
drivers/media/i2c/ov7251.c +145 -30
@@ -42,6 +42,16 @@#define OV7251_TIMING_FORMAT2_MIRROR BIT(2)#define OV7251_PRE_ISP_00 0x5e00#define OV7251_PRE_ISP_00_TEST_PATTERN BIT(7) +#define OV7251_PLL1_PRE_DIV_REG 0x30b4 +#define OV7251_PLL1_MULT_REG 0x30b3 +#define OV7251_PLL1_DIVIDER_REG 0x30b1 +#define OV7251_PLL1_PIX_DIV_REG 0x30b0 +#define OV7251_PLL1_MIPI_DIV_REG 0x30b5 +#define OV7251_PLL2_PRE_DIV_REG 0x3098 +#define OV7251_PLL2_MULT_REG 0x3099 +#define OV7251_PLL2_DIVIDER_REG 0x309d +#define OV7251_PLL2_SYS_DIV_REG 0x309a +#define OV7251_PLL2_ADC_DIV_REG 0x309bstruct reg_value {u16 reg;
@@ -60,6 +70,36 @@ struct ov7251_mode_info {struct v4l2_fract timeperframe; }; +struct ov7251_pll1_cfg { +unsigned int pre_div; +unsigned int mult; +unsigned int div; +unsigned int pix_div; +unsigned int mipi_div; +}; + +struct ov7251_pll2_cfg { +unsigned int pre_div; +unsigned int mult; +unsigned int div; +unsigned int sys_div; +unsigned int adc_div; +}; + +/* +* Rubbish ordering, but only PLL1 needs to have a separate configuration per +* link frequency and the array member needs to be last. +*/ +struct ov7251_pll_cfgs { +const struct ov7251_pll2_cfg *pll2; +const struct ov7251_pll1_cfg *pll1[]; +}; + +enum xclk_rate { +OV7251_24_MHZ , +OV7251_NUM_SUPPORTED_RATES +}; +enum supported_link_freqs {OV7251_LINK_FREQ_240_MHZ ,OV7251_NUM_SUPPORTED_LINK_FREQS
@@ -80,6 +120,7 @@ struct ov7251 {struct regulator *core_regulator;struct regulator *analog_regulator; +const struct ov7251_pll_cfgs *pll_cfgs;enum supported_link_freqs link_freq_idx;const struct ov7251_mode_info *current_mode;
@@ -106,6 +147,33 @@ static inline struct ov7251 *to_ov7251(struct v4l2_subdev *sd) return container_of(sd, struct ov7251, sd); } +static const struct ov7251_pll1_cfg ov7251_pll1_cfg_24_mhz_240_mhz = { + .pre_div =0x03 , + .mult =0x64 , + .div =0x01 , + .pix_div =0x0a , + .mipi_div =0x05 +}; + +static const struct ov7251_pll2_cfg ov7251_pll2_cfg_24_mhz = { + .pre_div =0x04 , + .mult =0x28 , + .div =0x00 , + .sys_div =0x05 , + .adc_div =0x04 +}; + +static const struct ov7251_pll_cfgs ov7251_pll_cfgs_24_mhz = { + .pll2 = &ov7251_pll2_cfg_24_mhz, + .pll1 = { + [OV7251_LINK_FREQ_240_MHZ ] = &ov7251_pll1_cfg_24_mhz_240_mhz, + } +}; + +static const struct ov7251_pll_cfgs *ov7251_pll_cfgs[] = { + [OV7251_24_MHZ ] = &ov7251_pll_cfgs_24_mhz +}; +static const struct reg_value ov7251_global_init_setting[] = { {0x0103 ,0x01 }, {0x303b ,0x02 },
@@ -124,16 +192,6 @@ static const struct reg_value ov7251_setting_vga_30fps[] = { { 0x301c, 0xf0 }, { 0x3023, 0x05 }, { 0x3037, 0xf0 }, - { 0x3098, 0x04 }, /* pll2 pre divider */ - { 0x3099, 0x28 }, /* pll2 multiplier */ - { 0x309a, 0x05 }, /* pll2 sys divider */ - { 0x309b, 0x04 }, /* pll2 adc divider */ - { 0x309d, 0x00 }, /* pll2 divider */ - { 0x30b0, 0x0a }, /* pll1 pix divider */ - { 0x30b1, 0x01 }, /* pll1 divider */ - { 0x30b3, 0x64 }, /* pll1 multiplier */ - { 0x30b4, 0x03 }, /* pll1 pre divider */ - { 0x30b5, 0x05 }, /* pll1 mipi divider */ { 0x3106, 0xda }, { 0x3503, 0x07 }, { 0x3509, 0x10 },
@@ -262,16 +320,6 @@ static const struct reg_value ov7251_setting_vga_60fps[] = { { 0x301c, 0x00 }, { 0x3023, 0x05 }, { 0x3037, 0xf0 }, - { 0x3098, 0x04 }, /* pll2 pre divider */ - { 0x3099, 0x28 }, /* pll2 multiplier */ - { 0x309a, 0x05 }, /* pll2 sys divider */ - { 0x309b, 0x04 }, /* pll2 adc divider */ - { 0x309d, 0x00 }, /* pll2 divider */ - { 0x30b0, 0x0a }, /* pll1 pix divider */ - { 0x30b1, 0x01 }, /* pll1 divider */ - { 0x30b3, 0x64 }, /* pll1 multiplier */ - { 0x30b4, 0x03 }, /* pll1 pre divider */ - { 0x30b5, 0x05 }, /* pll1 mipi divider */ { 0x3106, 0xda }, { 0x3503, 0x07 }, { 0x3509, 0x10 },
@@ -400,16 +448,6 @@ static const struct reg_value ov7251_setting_vga_90fps[] = { { 0x301c, 0x00 }, { 0x3023, 0x05 }, { 0x3037, 0xf0 }, - { 0x3098, 0x04 }, /* pll2 pre divider */ - { 0x3099, 0x28 }, /* pll2 multiplier */ - { 0x309a, 0x05 }, /* pll2 sys divider */ - { 0x309b, 0x04 }, /* pll2 adc divider */ - { 0x309d, 0x00 }, /* pll2 divider */ - { 0x30b0, 0x0a }, /* pll1 pix divider */ - { 0x30b1, 0x01 }, /* pll1 divider */ - { 0x30b3, 0x64 }, /* pll1 multiplier */ - { 0x30b4, 0x03 }, /* pll1 pre divider */ - { 0x30b5, 0x05 }, /* pll1 mipi divider */ { 0x3106, 0xda }, { 0x3503, 0x07 }, { 0x3509, 0x10 },
@@ -525,6 +563,10 @@ static const struct reg_value ov7251_setting_vga_90fps[] = { { 0x5001, 0x80 }, }; +static const unsigned long supported_xclk_rates[] = { + [OV7251_24_MHZ ] =24000000 , +}; +static const s64 link_freq[] = { [OV7251_LINK_FREQ_240_MHZ ] =240000000 , };
@@ -696,6 +738,63 @@ static int ov7251_read_reg(struct ov7251 *ov7251, u16 reg, u8 *val)return 0 ; } +static int ov7251_pll_configure (struct ov7251 *ov7251) +{ +const struct ov7251_pll_cfgs *configs; +int ret; + + configs = ov7251->pll_cfgs; + + ret =ov7251_write_reg (ov7251,OV7251_PLL1_PRE_DIV_REG , + configs->pll1[ov7251->link_freq_idx]->pre_div); +if (ret <0 ) +return ret; + + ret =ov7251_write_reg (ov7251,OV7251_PLL1_MULT_REG , + configs->pll1[ov7251->link_freq_idx]->mult); +if (ret <0 ) +return ret; + ret =ov7251_write_reg (ov7251,OV7251_PLL1_DIVIDER_REG , + configs->pll1[ov7251->link_freq_idx]->div); +if (ret <0 ) +return ret; + + ret =ov7251_write_reg (ov7251,OV7251_PLL1_PIX_DIV_REG , + configs->pll1[ov7251->link_freq_idx]->pix_div); +if (ret <0 ) +return ret; + + ret =ov7251_write_reg (ov7251,OV7251_PLL1_MIPI_DIV_REG , + configs->pll1[ov7251->link_freq_idx]->mipi_div); +if (ret <0 ) +return ret; + + ret =ov7251_write_reg (ov7251,OV7251_PLL2_PRE_DIV_REG , + configs->pll2->pre_div); +if (ret <0 ) +return ret; + + ret =ov7251_write_reg (ov7251,OV7251_PLL2_MULT_REG , + configs->pll2->mult); +if (ret <0 ) +return ret; + + ret =ov7251_write_reg (ov7251,OV7251_PLL2_DIVIDER_REG , + configs->pll2->div); +if (ret <0 ) +return ret; + + ret =ov7251_write_reg (ov7251,OV7251_PLL2_SYS_DIV_REG , + configs->pll2->sys_div); +if (ret <0 ) +return ret; + + ret =ov7251_write_reg (ov7251,OV7251_PLL2_ADC_DIV_REG , + configs->pll2->adc_div); + +return ret; +} +static int ov7251_set_exposure (struct ov7251 *ov7251,s32 exposure) {u16 reg;
@@ -1137,6 +1236,11 @@ static int ov7251_s_stream(struct v4l2_subdev *subdev, int enable)mutex_lock (&ov7251->lock);if (enable) { + ret =ov7251_pll_configure (ov7251); +if (ret) +return dev_err_probe (ov7251->dev, ret, +"error configuring PLLs\n" ); + ret =ov7251_set_register_array (ov7251, ov7251->current_mode->data, ov7251->current_mode->data_size);
@@ -1298,6 +1402,7 @@ static int ov7251_probe(struct i2c_client *client)u8 chip_id_high, chip_id_low, chip_rev;s64 pixel_rate;int ret; +int i; ov7251 =devm_kzalloc (dev,sizeof (struct ov7251 ),GFP_KERNEL );if (!ov7251)
@@ -1336,6 +1441,16 @@ static int ov7251_probe(struct i2c_client *client)dev_err (dev,"could not set xclk frequency\n" );return ret; } +for (i =0 ; i <ARRAY_SIZE (supported_xclk_rates); i++) +if (ov7251->xclk_freq == supported_xclk_rates[i]) +break ; + +if (i ==ARRAY_SIZE (supported_xclk_rates)) +return dev_err_probe (dev, -EINVAL , +"clock rate %u Hz is unsupported\n" , + ov7251->xclk_freq); + + ov7251->pll_cfgs = ov7251_pll_cfgs[i]; ov7251->io_regulator =devm_regulator_get (dev,"vdddo" );if (IS_ERR (ov7251->io_regulator)) {
Signature · 1 line
2.25.1
Re: [PATCH v2 06/11] media: i2c: Add ov7251_pll_configure()
Quoted 4 lines · Daniel Scally
Rather than having the pll settings hidden inside mode blobs, define them in structs and use a dedicated function to set them. This makes it simpler to extend the driver to support other frequencies for both the external clock and desired link frequency.
...
drivers/media/i2c/ov7251.c static inline struct ov7251 *to_ov7251(struct v4l2_subdev *sd) · line 155
Quoted 6 lines
drivers/media/i2c/ov7251.c +6
-0+static const struct ov7251_pll1_cfg ov7251_pll1_cfg_24_mhz_240_mhz = { + .pre_div =0x03 , + .mult =0x64 , + .div =0x01 , + .pix_div =0x0a , + .mipi_div =0x05
+ Comma.
drivers/media/i2c/ov7251.c static inline struct ov7251 *to_ov7251(struct v4l2_subdev *sd) · line 163
Quoted 8 lines
drivers/media/i2c/ov7251.c +8
-0+}; + +static const struct ov7251_pll2_cfg ov7251_pll2_cfg_24_mhz = { + .pre_div =0x04 , + .mult =0x28 , + .div =0x00 , + .sys_div =0x05 , + .adc_div =0x04
Ditto.
drivers/media/i2c/ov7251.c static inline struct ov7251 *to_ov7251(struct v4l2_subdev *sd) · line 170
Quoted 7 lines
drivers/media/i2c/ov7251.c +7
-0+}; + +static const struct ov7251_pll_cfgs ov7251_pll_cfgs_24_mhz = { + .pll2 = &ov7251_pll2_cfg_24_mhz, + .pll1 = { + [OV7251_LINK_FREQ_240_MHZ ] = &ov7251_pll1_cfg_24_mhz_240_mhz, + }
Ditto.
drivers/media/i2c/ov7251.c static inline struct ov7251 *to_ov7251(struct v4l2_subdev *sd) · line 174
Quoted 4 lines
drivers/media/i2c/ov7251.c +4
-0+}; + +static const struct ov7251_pll_cfgs *ov7251_pll_cfgs[] = { + [OV7251_24_MHZ ] = &ov7251_pll_cfgs_24_mhz
Ditto.
Quoted 1 line
+};
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH v2 7/11 media: i2c: Add support for new frequencies to ov7251
In reply to Daniel ScallyThe OV7251 sensor is used as the IR camera sensor on the Microsoft Surface line of tablets; this provides a 19.2MHz external clock, and the Windows driver for this sensor configures a 319.2MHz link freq to the CSI-2 receiver. Add the ability to support those rate to the driver by defining a new set of PLL configs.
---
Changes in v2:
- Added support for 319.2MHz link frequency
drivers/media/i2c/ov7251.c | 79 ++++++++++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 16 deletions(-)
drivers/media/i2c/ov7251.c +63 -16
@@ -96,12 +96,14 @@ struct ov7251_pll_cfgs { };enum xclk_rate { +OV7251_19_2_MHZ ,OV7251_24_MHZ ,OV7251_NUM_SUPPORTED_RATES };enum supported_link_freqs {OV7251_LINK_FREQ_240_MHZ , +OV7251_LINK_FREQ_319_2_MHZ ,OV7251_NUM_SUPPORTED_LINK_FREQS };
@@ -147,6 +149,22 @@ static inline struct ov7251 *to_ov7251(struct v4l2_subdev *sd) return container_of(sd, struct ov7251, sd); } +static const struct ov7251_pll1_cfg ov7251_pll1_cfg_19_2_mhz_240_mhz = { + .pre_div =0x03 , + .mult =0x4b , + .div =0x01 , + .pix_div =0x0a , + .mipi_div =0x05 +}; + +static const struct ov7251_pll1_cfg ov7251_pll1_cfg_19_2_mhz_319_2_mhz = { + .pre_div =0x01 , + .mult =0x85 , + .div =0x04 , + .pix_div =0x0a , + .mipi_div =0x05 +}; +static const struct ov7251_pll1_cfg ov7251_pll1_cfg_24_mhz_240_mhz = { .pre_div =0x03 , .mult =0x64 ,
@@ -155,6 +173,22 @@ static const struct ov7251_pll1_cfg ov7251_pll1_cfg_24_mhz_240_mhz = { .mipi_div = 0x05 }; +static const struct ov7251_pll1_cfg ov7251_pll1_cfg_24_mhz_319_2_mhz = { + .pre_div =0x05 , + .mult =0x85 , + .div =0x02 , + .pix_div =0x0a , + .mipi_div =0x05 +}; + +static const struct ov7251_pll2_cfg ov7251_pll2_cfg_19_2_mhz = { + .pre_div =0x04 , + .mult =0x32 , + .div =0x00 , + .sys_div =0x05 , + .adc_div =0x04 +}; +static const struct ov7251_pll2_cfg ov7251_pll2_cfg_24_mhz = { .pre_div =0x04 , .mult =0x28 ,
@@ -163,14 +197,24 @@ static const struct ov7251_pll2_cfg ov7251_pll2_cfg_24_mhz = { .adc_div = 0x04 }; +static const struct ov7251_pll_cfgs ov7251_pll_cfgs_19_2_mhz = { + .pll2 = &ov7251_pll2_cfg_19_2_mhz, + .pll1 = { + [OV7251_LINK_FREQ_240_MHZ ] = &ov7251_pll1_cfg_19_2_mhz_240_mhz, + [OV7251_LINK_FREQ_319_2_MHZ ] = &ov7251_pll1_cfg_19_2_mhz_319_2_mhz, + } +}; +static const struct ov7251_pll_cfgs ov7251_pll_cfgs_24_mhz = { .pll2 = &ov7251_pll2_cfg_24_mhz, .pll1 = { [OV7251_LINK_FREQ_240_MHZ ] = &ov7251_pll1_cfg_24_mhz_240_mhz, + [OV7251_LINK_FREQ_319_2_MHZ ] = &ov7251_pll1_cfg_24_mhz_319_2_mhz, } };static const struct ov7251_pll_cfgs *ov7251_pll_cfgs[] = { + [OV7251_19_2_MHZ ] = &ov7251_pll_cfgs_19_2_mhz, [OV7251_24_MHZ ] = &ov7251_pll_cfgs_24_mhz };
@@ -564,15 +608,18 @@ static const struct reg_value ov7251_setting_vga_90fps[] = { };static const unsigned long supported_xclk_rates[] = { + [OV7251_19_2_MHZ ] =19200000 , [OV7251_24_MHZ ] =24000000 , };static const s64 link_freq[] = { [OV7251_LINK_FREQ_240_MHZ ] =240000000 , + [OV7251_LINK_FREQ_319_2_MHZ ] =319200000 , };static const s64 pixel_rates[] = { [OV7251_LINK_FREQ_240_MHZ ] =48000000 , + [OV7251_LINK_FREQ_319_2_MHZ ] =63840000 , };static const struct ov7251_mode_info ov7251_mode_info_data[] = {
@@ -1400,6 +1447,7 @@ static int ov7251_probe(struct i2c_client *client)struct device *dev = &client->dev;struct ov7251 *ov7251;u8 chip_id_high, chip_id_low, chip_rev; +unsigned int rate =0 ;s64 pixel_rate;int ret;int i;
@@ -1416,31 +1464,30 @@ static int ov7251_probe(struct i2c_client *client)return ret;/* get system clock (xclk) */ - ov7251->xclk =devm_clk_get (dev,"xclk" ); + ov7251->xclk =devm_clk_get (dev,NULL );if (IS_ERR (ov7251->xclk)) {dev_err (dev,"could not get xclk" );return PTR_ERR (ov7251->xclk); } +/* +* We could have either a 24MHz or 19.2MHz clock rate from either dt or +* ACPI. We also need to support the IPU3 case which will have both an +* external clock AND a clock-frequency property. +*/ ret =fwnode_property_read_u32 (dev_fwnode (dev),"clock-frequency" , - &ov7251->xclk_freq); -if (ret) { -dev_err (dev,"could not get xclk frequency\n" ); -return ret; + &rate); +if (!ret && ov7251->xclk) { + ret =clk_set_rate (ov7251->xclk, rate); +if (ret) +return dev_err_probe (dev, ret, +"failed to set clock rate\n" ); + }else if (ret && !ov7251->xclk) { +return dev_err_probe (dev, ret,"invalid clock config\n" ); } -/* external clock must be 24MHz, allow 1% tolerance */ -if (ov7251->xclk_freq <23760000 || ov7251->xclk_freq >24240000 ) { -dev_err (dev,"external clock frequency %u is not supported\n" , - ov7251->xclk_freq); -return -EINVAL ; - } + ov7251->xclk_freq = rate ? rate :clk_get_rate (ov7251->xclk); - ret =clk_set_rate (ov7251->xclk, ov7251->xclk_freq); -if (ret) { -dev_err (dev,"could not set xclk frequency\n" ); -return ret; - }for (i =0 ; i <ARRAY_SIZE (supported_xclk_rates); i++)if (ov7251->xclk_freq == supported_xclk_rates[i])break ;
Signature · 1 line
2.25.1
Re: [PATCH v2 07/11] media: i2c: Add support for new frequencies to ov7251
drivers/media/i2c/ov7251.c static inline struct ov7251 *to_ov7251(struct v4l2_subdev *sd) · line 157
Quoted 12 lines · Daniel Scally
The OV7251 sensor is used as the IR camera sensor on the Microsoft Surface line of tablets; this provides a 19.2MHz external clock, and the Windows driver for this sensor configures a 319.2MHz link freq to the CSI-2 receiver. Add the ability to support those rate to the driver by defining a new set of PLL configs.
drivers/media/i2c/ov7251.c +6
-0+static const struct ov7251_pll1_cfg ov7251_pll1_cfg_19_2_mhz_240_mhz = { + .pre_div =0x03 , + .mult =0x4b , + .div =0x01 , + .pix_div =0x0a , + .mipi_div =0x05
+ Comma.
drivers/media/i2c/ov7251.c static inline struct ov7251 *to_ov7251(struct v4l2_subdev *sd) · line 165
Quoted 8 lines
drivers/media/i2c/ov7251.c +8
-0+}; + +static const struct ov7251_pll1_cfg ov7251_pll1_cfg_19_2_mhz_319_2_mhz = { + .pre_div =0x01 , + .mult =0x85 , + .div =0x04 , + .pix_div =0x0a , + .mipi_div =0x05
Ditto.
Quoted 1 line
+};
...
drivers/media/i2c/ov7251.c static const struct ov7251_pll1_cfg ov7251_pll1_cfg_24_mhz_240_mhz = { · line 181
Quoted 6 lines
drivers/media/i2c/ov7251.c +6
-0+static const struct ov7251_pll1_cfg ov7251_pll1_cfg_24_mhz_319_2_mhz = { + .pre_div =0x05 , + .mult =0x85 , + .div =0x02 , + .pix_div =0x0a , + .mipi_div =0x05
Ditto.
drivers/media/i2c/ov7251.c static const struct ov7251_pll1_cfg ov7251_pll1_cfg_24_mhz_240_mhz = { · line 189
Quoted 8 lines
drivers/media/i2c/ov7251.c +8
-0+}; + +static const struct ov7251_pll2_cfg ov7251_pll2_cfg_19_2_mhz = { + .pre_div =0x04 , + .mult =0x32 , + .div =0x00 , + .sys_div =0x05 , + .adc_div =0x04
Ditto.
Quoted 1 line
+};
...
drivers/media/i2c/ov7251.c static const struct ov7251_pll2_cfg ov7251_pll2_cfg_24_mhz = { · line 205
Quoted 6 lines
drivers/media/i2c/ov7251.c +6
-0+static const struct ov7251_pll_cfgs ov7251_pll_cfgs_19_2_mhz = { + .pll2 = &ov7251_pll2_cfg_19_2_mhz, + .pll1 = { + [OV7251_LINK_FREQ_240_MHZ ] = &ov7251_pll1_cfg_19_2_mhz_240_mhz, + [OV7251_LINK_FREQ_319_2_MHZ ] = &ov7251_pll1_cfg_19_2_mhz_319_2_mhz, + }
Ditto.
Quoted 1 line
+};
...
drivers/media/i2c/ov7251.c static int ov7251_probe(struct i2c_client *client) · line 1467
Quoted 3 lines
drivers/media/i2c/ov7251.c +1
-1/* get system clock (xclk) */ - ov7251->xclk =devm_clk_get (dev,"xclk" ); + ov7251->xclk =devm_clk_get (dev,NULL );
Why a clock doesn't have a name anymore?
Shouldn't you rather switch to _optional()?
drivers/media/i2c/ov7251.c static int ov7251_probe(struct i2c_client *client) · line 1470
Quoted 3 lines
drivers/media/i2c/ov7251.c +0
-0if (IS_ERR (ov7251->xclk)) {dev_err (dev,"could not get xclk" );return PTR_ERR (ov7251->xclk);
This should be dev_err_probe().
Quoted 1 line
}
...
drivers/media/i2c/ov7251.c static int ov7251_probe(struct i2c_client *client) · line 1474
Quoted 2 lines
drivers/media/i2c/ov7251.c +2
-0+/* +* We could have either a 24MHz or 19.2MHz clock rate from either dt or
DT
drivers/media/i2c/ov7251.c static int ov7251_probe(struct i2c_client *client) · line 1476
Quoted 2 lines
drivers/media/i2c/ov7251.c +2
-0+* ACPI. We also need to support the IPU3 case which will have both an +* external clock AND a clock-frequency property.
Why is that? Broken table?
drivers/media/i2c/ov7251.c static int ov7251_probe(struct i2c_client *client) · line 1485
Quoted 13 lines
drivers/media/i2c/ov7251.c +8
-4+*/ ret =fwnode_property_read_u32 (dev_fwnode (dev),"clock-frequency" , - &ov7251->xclk_freq); -if (ret) { -dev_err (dev,"could not get xclk frequency\n" ); -return ret; + &rate); +if (!ret && ov7251->xclk) { + ret =clk_set_rate (ov7251->xclk, rate); +if (ret) +return dev_err_probe (dev, ret, +"failed to set clock rate\n" ); + }else if (ret && !ov7251->xclk) {
Redundant 'else' if you test for error condition first.
Quoted 2 lines
drivers/media/i2c/ov7251.c +1
-0+return dev_err_probe (dev, ret,"invalid clock config\n" ); }
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 07/11] media: i2c: Add support for new frequencies to ov7251
Quoted 56 lines · Andy Shevchenko
drivers/media/i2c/ov7251.c static inline struct ov7251 *to_ov7251(struct v4l2_subdev *sd) · line 157
Quoted 11 lines · Daniel Scally
The OV7251 sensor is used as the IR camera sensor on the Microsoft Surface line of tablets; this provides a 19.2MHz external clock, and the Windows driver for this sensor configures a 319.2MHz link freq to the CSI-2 receiver. Add the ability to support those rate to the driver by defining a new set of PLL configs.
drivers/media/i2c/ov7251.c +6
-0+static const struct ov7251_pll1_cfg ov7251_pll1_cfg_19_2_mhz_240_mhz = { + .pre_div =0x03 , + .mult =0x4b , + .div =0x01 , + .pix_div =0x0a , + .mipi_div =0x05 + Comma.
drivers/media/i2c/ov7251.c static inline struct ov7251 *to_ov7251(struct v4l2_subdev *sd) · line 165
Quoted 8 lines
drivers/media/i2c/ov7251.c +8
-0+}; + +static const struct ov7251_pll1_cfg ov7251_pll1_cfg_19_2_mhz_319_2_mhz = { + .pre_div =0x01 , + .mult =0x85 , + .div =0x04 , + .pix_div =0x0a , + .mipi_div =0x05 Ditto.
Quoted 1 line
+};
...
drivers/media/i2c/ov7251.c static const struct ov7251_pll1_cfg ov7251_pll1_cfg_24_mhz_240_mhz = { · line 181
Quoted 6 lines
drivers/media/i2c/ov7251.c +6
-0+static const struct ov7251_pll1_cfg ov7251_pll1_cfg_24_mhz_319_2_mhz = { + .pre_div =0x05 , + .mult =0x85 , + .div =0x02 , + .pix_div =0x0a , + .mipi_div =0x05 Ditto.
drivers/media/i2c/ov7251.c static const struct ov7251_pll1_cfg ov7251_pll1_cfg_24_mhz_240_mhz = { · line 189
Quoted 8 lines
drivers/media/i2c/ov7251.c +8
-0+}; + +static const struct ov7251_pll2_cfg ov7251_pll2_cfg_19_2_mhz = { + .pre_div =0x04 , + .mult =0x32 , + .div =0x00 , + .sys_div =0x05 , + .adc_div =0x04 Ditto.
Quoted 1 line
+};
...
drivers/media/i2c/ov7251.c static const struct ov7251_pll2_cfg ov7251_pll2_cfg_24_mhz = { · line 205
Quoted 6 lines
drivers/media/i2c/ov7251.c +6
-0+static const struct ov7251_pll_cfgs ov7251_pll_cfgs_19_2_mhz = { + .pll2 = &ov7251_pll2_cfg_19_2_mhz, + .pll1 = { + [OV7251_LINK_FREQ_240_MHZ ] = &ov7251_pll1_cfg_19_2_mhz_240_mhz, + [OV7251_LINK_FREQ_319_2_MHZ ] = &ov7251_pll1_cfg_19_2_mhz_319_2_mhz, + }Ditto.
Quoted 8 lines
Quoted 1 line
+};
...
drivers/media/i2c/ov7251.c static int ov7251_probe(struct i2c_client *client) · line 1467
Quoted 3 lines
/* get system clock (xclk) */
drivers/media/i2c/ov7251.c +1
-1- ov7251->xclk =devm_clk_get (dev,"xclk" ); + ov7251->xclk =devm_clk_get (dev,NULL );Why a clock doesn't have a name anymore?
Shouldn't you rather switch to_optional()?
The problem is since we could have a the clock coming from some dt file with it named xclk, as this driver is obviously designed for, but it also can be created by the int3472-tps68470 or int3472-discrete drivers which don't use that name. Without knowing what it's called, best thing I could think to do was remove the name and rely on device matching.
Quoted 5 lines
Quoted 4 lines
if (IS_ERR(ov7251->xclk)) { dev_err(dev, "could not get xclk"); return PTR_ERR(ov7251->xclk);This should be
dev_err_probe().
Yep
Quoted 11 lines
Quoted 2 lines
}...
drivers/media/i2c/ov7251.c static int ov7251_probe(struct i2c_client *client) · line 1474
Quoted 2 lines
drivers/media/i2c/ov7251.c +2
-0+/* +* We could have either a 24MHz or 19.2MHz clock rate from either dt or DT
drivers/media/i2c/ov7251.c static int ov7251_probe(struct i2c_client *client) · line 1476
Quoted 2 lines
drivers/media/i2c/ov7251.c +2
-0+* ACPI. We also need to support the IPU3 case which will have both an +* external clock AND a clock-frequency property. Why is that? Broken table?
Broken ACPI compensated for by the cio2-bridge - it creates the clock-frequency property which ordinarily wouldn't be there on ACPI systems AIUI.
Quoted 15 lines
Quoted 4 lines
drivers/media/i2c/ov7251.c +1
-1+*/ ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency", - &ov7251->xclk_freq);drivers/media/i2c/ov7251.c static int ov7251_probe(struct i2c_client *client) · line 1485
Quoted 10 lines
drivers/media/i2c/ov7251.c +7
-3-if (ret) { -dev_err (dev,"could not get xclk frequency\n" ); -return ret; + &rate); +if (!ret && ov7251->xclk) { + ret =clk_set_rate (ov7251->xclk, rate); +if (ret) +return dev_err_probe (dev, ret, +"failed to set clock rate\n" ); + }else if (ret && !ov7251->xclk) {Redundant 'else' if you test for error condition first.
Ah yes, ok thanks.
Quoted 3 lines
Quoted 3 lines
drivers/media/i2c/ov7251.c +1
-0+return dev_err_probe (dev, ret,"invalid clock config\n" ); }
Re: [PATCH v2 07/11] media: i2c: Add support for new frequencies to ov7251
Quoted 2 lines · Daniel Scally
Quoted 1 line · Andy Shevchenko
On Fri, Feb 25, 2022 at 12:07:49AM +0000, Daniel Scally wrote:
...
Quoted 11 lines
Quoted 5 lines
drivers/media/i2c/ov7251.c static int ov7251_probe(struct i2c_client *client) · line 1467
Quoted 3 lines
/* get system clock (xclk) */
drivers/media/i2c/ov7251.c +1
-1- ov7251->xclk =devm_clk_get (dev,"xclk" ); + ov7251->xclk =devm_clk_get (dev,NULL );Why a clock doesn't have a name anymore?
Shouldn't you rather switch to_optional()?The problem is since we could have a the clock coming from some dt file with it named xclk, as this driver is obviously designed for, but it also can be created by the int3472-tps68470 or int3472-discrete drivers which don't use that name. Without knowing what it's called, best thing I could think to do was remove the name and rely on device matching.
So, then the Q is why it's not called the same in the other drivers?
...
Quoted 3 lines
Broken ACPI compensated for by the cio2-bridge - it creates the clock-frequency property which ordinarily wouldn't be there on ACPI systems AIUI.
In the current practice we have CLK priority over property, this means we may do:
1) unconditional reading of the property;
2) trying CLK.
Can it be done here?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 07/11] media: i2c: Add support for new frequencies to ov7251
Hi Andy
Quoted 10 lines · Andy Shevchenko
Quoted 2 lines · Daniel Scally
Quoted 1 line · Andy Shevchenko
On Fri, Feb 25, 2022 at 12:07:49AM +0000, Daniel Scally wrote:
...
Quoted 5 lines
Quoted 5 lines
drivers/media/i2c/ov7251.c static int ov7251_probe(struct i2c_client *client) · line 1467
Quoted 3 lines
/* get system clock (xclk) */drivers/media/i2c/ov7251.c +1
-1- ov7251->xclk =devm_clk_get (dev,"xclk" ); + ov7251->xclk =devm_clk_get (dev,NULL );Why a clock doesn't have a name anymore?
Shouldn't you rather switch to_optional()?
Quoted 6 lines
Quoted 5 lines
The problem is since we could have a the clock coming from some dt file with it named xclk, as this driver is obviously designed for, but it also can be created by the int3472-tps68470 or int3472-discrete drivers which don't use that name. Without knowing what it's called, best thing I could think to do was remove the name and rely on device matching.
So, then the Q is why it's not called the same in the other drivers?
If I'm honest this is one of those areas I'm still sketchy on, in drivers/media/i2c I see calls to clk_get with clock names like so:
eclk
extclk
mclk
refclk
xclk
xti
xvclk
But those only work if the firmware (I.E. dt) for the device defines that name for the clock which means they need to define the dt in a particular way. So if I make the int3472-discrete driver (which is sort of playing the part of dt here) register the clocks called "xclk" that means the drivers all need to have that name too, which breaks the dt entries if they weren't originally called that. On the other hand, if the driver has no name but relies on device matching it will work for both the original dt and also for the int3472-discrete driver's clock
Basically it seems better to me to just let it match by device rather than have the names. The only advantage I can see for the names is if a device has multiple clocks assigned to it...but there are no instances of that in media/i2c.
Quoted 9 lines
Quoted 4 lines
Broken ACPI compensated for by the cio2-bridge - it creates the clock-frequency property which ordinarily wouldn't be there on ACPI systems AIUI.
In the current practice we have CLK priority over property, this means we may do:
1) unconditional reading of the property;
2) trying CLK.Can it be done here?
Er, can you point me to an example?
Quoted 1 line
Re: [PATCH v2 07/11] media: i2c: Add support for new frequencies to ov7251
Quoted 3 lines · Daniel Scally
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Daniel Scally
On 25/02/2022 17:09, Andy Shevchenko wrote:
...
Quoted 4 lines
Basically it seems better to me to just let it match by device rather than have the names. The only advantage I can see for the names is if a device has multiple clocks assigned to it...but there are no instances of that in media/i2c.
I have heard you, but leave for the judgement done by maintainers.
...
Quoted 10 lines
Quoted 8 lines
Quoted 3 lines
Broken ACPI compensated for by the cio2-bridge - it creates the clock-frequency property which ordinarily wouldn't be there on ACPI systems AIUI.
In the current practice we have CLK priority over property, this means we may do:
1) unconditional reading of the property;
2) trying CLK.Can it be done here?
Er, can you point me to an example?
Something like
device_read_property_u32("clock-frequency", &rate);
clk = devm_clk_get_optional(...);
if (IS_ERR(clk))
return PTR_ERR(clk);
clk_rate = clk_get_rate(...);
if (clk_rate == 0)
clk_rate = rate;
if (clk_rate == 0)
return dev_err_probe(...);Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 07/11] media: i2c: Add support for new frequencies to ov7251
Quoted 12 lines · Andy Shevchenko
Quoted 3 lines · Daniel Scally
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Daniel Scally
On 25/02/2022 17:09, Andy Shevchenko wrote:
...
Quoted 4 lines
Basically it seems better to me to just let it match by device rather than have the names. The only advantage I can see for the names is if a device has multiple clocks assigned to it...but there are no instances of that in media/i2c.
I have heard you, but leave for the judgement done by maintainers.
Fair enough :)
Quoted 12 lines
Quoted 10 lines
Quoted 9 lines
Quoted 4 lines
Broken ACPI compensated for by the cio2-bridge - it creates the clock-frequency property which ordinarily wouldn't be there on ACPI systems AIUI.
In the current practice we have CLK priority over property, this means we may do:
1) unconditional reading of the property;
2) trying CLK.Can it be done here?
Er, can you point me to an example?
Something like
Quoted 12 lines
device_read_property_u32("clock-frequency", &rate);
clk = devm_clk_get_optional(...);
if (IS_ERR(clk))
return PTR_ERR(clk);
clk_rate = clk_get_rate(...);
if (clk_rate == 0)
clk_rate = rate;
if (clk_rate == 0)
return dev_err_probe(...);Gotcha - ok sure, leave that with me.
Sakari Ailus
maintainerRe: [PATCH v2 07/11] media: i2c: Add support for new frequencies to ov7251
In reply to Andy ShevchenkoQuoted 12 lines · Andy Shevchenko
Quoted 2 lines · Daniel Scally
Quoted 1 line · Andy Shevchenko
On Fri, Feb 25, 2022 at 12:07:49AM +0000, Daniel Scally wrote:
...
Quoted 6 lines
Quoted 5 lines
drivers/media/i2c/ov7251.c static int ov7251_probe(struct i2c_client *client) · line 1467
Quoted 3 lines
/* get system clock (xclk) */
drivers/media/i2c/ov7251.c +1
-1- ov7251->xclk =devm_clk_get (dev,"xclk" ); + ov7251->xclk =devm_clk_get (dev,NULL );Why a clock doesn't have a name anymore?
Shouldn't you rather switch to_optional()?
Quoted 7 lines
Quoted 5 lines
The problem is since we could have a the clock coming from some dt file with it named xclk, as this driver is obviously designed for, but it also can be created by the int3472-tps68470 or int3472-discrete drivers which don't use that name. Without knowing what it's called, best thing I could think to do was remove the name and rely on device matching.
So, then the Q is why it's not called the same in the other drivers?
FWIW, most sensor drivers use NULL for the name as there's just a single clock. This one is rather an exception. Existing DT should continue to just work as well as not specifying the name gives you the first one.
The name could be removed frem the bindings IMO.
Signature · 1 line
Sakari Ailus
PATCH v2 8/11 media: i2c: Add ov7251_detect_chip()
In reply to Daniel Scally.probe() is quite busy for this driver; make it cleaner by moving the chip verification to a dedicated function.
---
Changes in v2:
- None
drivers/media/i2c/ov7251.c | 62 +++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 27 deletions(-)
drivers/media/i2c/ov7251.c +35 -27
@@ -1442,11 +1442,43 @@ static int ov7251_check_hwcfg(struct ov7251 *ov7251)return ret; } +static int ov7251_detect_chip (struct ov7251 *ov7251) +{ +u8 chip_id_high, chip_id_low, chip_rev; +int ret; + + ret =ov7251_read_reg (ov7251,OV7251_CHIP_ID_HIGH , &chip_id_high); +if (ret <0 || chip_id_high !=OV7251_CHIP_ID_HIGH_BYTE ) +return dev_err_probe (ov7251->dev, -ENODEV , +"could not read ID high\n" ); + + ret =ov7251_read_reg (ov7251,OV7251_CHIP_ID_LOW , &chip_id_low); +if (ret <0 || chip_id_low !=OV7251_CHIP_ID_LOW_BYTE ) +return dev_err_probe (ov7251->dev, -ENODEV , +"could not read ID low\n" ); + + ret =ov7251_read_reg (ov7251,OV7251_SC_GP_IO_IN1 , &chip_rev); +if (ret <0 ) +return dev_err_probe (ov7251->dev, -ENODEV , +"could not read revision\n" ); + chip_rev >>=4 ; + +dev_info (ov7251->dev, +"OV7251 revision %x (%s) detected at address 0x%02x\n" , + chip_rev, + chip_rev ==0x4 ?"1A / 1B" : + chip_rev ==0x5 ?"1C / 1D" : + chip_rev ==0x6 ?"1E" : + chip_rev ==0x7 ?"1F" :"unknown" , + ov7251->i2c_client->addr); + +return 0 ; +} +static int ov7251_probe (struct i2c_client *client) {struct device *dev = &client->dev;struct ov7251 *ov7251; -u8 chip_id_high, chip_id_low, chip_rev;unsigned int rate =0 ;s64 pixel_rate;int ret;
@@ -1585,34 +1617,10 @@ static int ov7251_probe(struct i2c_client *client) goto free_entity; } - ret =ov7251_read_reg (ov7251,OV7251_CHIP_ID_HIGH , &chip_id_high); -if (ret <0 || chip_id_high !=OV7251_CHIP_ID_HIGH_BYTE ) { -dev_err (dev,"could not read ID high\n" ); - ret = -ENODEV ; - goto power_down; - } - ret =ov7251_read_reg (ov7251,OV7251_CHIP_ID_LOW , &chip_id_low); -if (ret <0 || chip_id_low !=OV7251_CHIP_ID_LOW_BYTE ) { -dev_err (dev,"could not read ID low\n" ); - ret = -ENODEV ; - goto power_down; - } - - ret =ov7251_read_reg (ov7251,OV7251_SC_GP_IO_IN1 , &chip_rev); -if (ret <0 ) { -dev_err (dev,"could not read revision\n" ); - ret = -ENODEV ; + ret =ov7251_detect_chip (ov7251); +if (ret) goto power_down; - } - chip_rev >>=4 ; -dev_info (dev,"OV7251 revision %x (%s) detected at address 0x%02x\n" , - chip_rev, - chip_rev ==0x4 ?"1A / 1B" : - chip_rev ==0x5 ?"1C / 1D" : - chip_rev ==0x6 ?"1E" : - chip_rev ==0x7 ?"1F" :"unknown" , - client->addr); ret =ov7251_read_reg (ov7251,OV7251_PRE_ISP_00 , &ov7251->pre_isp_00);
Signature · 1 line
2.25.1
PATCH v2 9/11 media: i2c: Add pm_runtime support to ov7251
In reply to Daniel ScallyAdd pm_runtime support to the ov7251 driver.
---
Changes in v2:
- Switched ov7251_set_power_[on|off]() to take a struct device * as the input parameter and used those functions for pm_runtime instead of adding wrappers (Sakari)
drivers/media/i2c/ov7251.c | 81 ++++++++++++++++++++++++++++---------- 1 file changed, 60 insertions(+), 21 deletions(-)
drivers/media/i2c/ov7251.c +60 -21
@@ -15,6 +15,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/mod_devicetable.h> +#include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/types.h>
@@ -883,8 +884,11 @@ static int ov7251_set_register_array(struct ov7251 *ov7251,return 0 ; } -static int ov7251_set_power_on (struct ov7251 *ov7251) +static int ov7251_set_power_on (struct device *dev) { + struct i2c_client *client = container_of(dev, struct i2c_client, dev); +struct v4l2_subdev *sd =i2c_get_clientdata (client); +struct ov7251 *ov7251 =to_ov7251 (sd);int ret;u32 wait_us;
@@ -909,11 +913,17 @@ static int ov7251_set_power_on(struct ov7251 *ov7251)return 0 ; } -static void ov7251_set_power_off (struct ov7251 *ov7251) +static int ov7251_set_power_off (struct device *dev) { + struct i2c_client *client = container_of(dev, struct i2c_client, dev); +struct v4l2_subdev *sd =i2c_get_clientdata (client); +struct ov7251 *ov7251 =to_ov7251 (sd); +clk_disable_unprepare (ov7251->xclk);gpiod_set_value_cansleep (ov7251->enable_gpio,0 );ov7251_regulators_disable (ov7251); + +return 0 ; }static int ov7251_s_power (struct v4l2_subdev *sd,int on)
@@ -928,7 +938,7 @@ static int ov7251_s_power(struct v4l2_subdev *sd, int on) goto exit;if (on) { - ret =ov7251_set_power_on (ov7251); + ret =ov7251_set_power_on (ov7251->dev);if (ret <0 ) goto exit;
@@ -937,13 +947,13 @@ static int ov7251_s_power(struct v4l2_subdev *sd, int on) ARRAY_SIZE(ov7251_global_init_setting));if (ret <0 ) {dev_err (ov7251->dev,"could not set init registers\n" ); -ov7251_set_power_off (ov7251); +ov7251_set_power_off (ov7251->dev); goto exit; } ov7251->power_on = true; }else { -ov7251_set_power_off (ov7251); +ov7251_set_power_off (ov7251->dev); ov7251->power_on = false; }
@@ -1017,7 +1027,7 @@ static int ov7251_s_ctrl(struct v4l2_ctrl *ctrl)/* v4l2_ctrl_lock() locks our mutex */ -if (!ov7251->power_on) +if (!pm_runtime_get_if_in_use (ov7251->dev))return 0 ;switch (ctrl->id) {
@@ -1041,6 +1051,8 @@ static int ov7251_s_ctrl(struct v4l2_ctrl *ctrl)break ; } +pm_runtime_put (ov7251->dev); +return ret; }
@@ -1283,10 +1295,15 @@ static int ov7251_s_stream(struct v4l2_subdev *subdev, int enable)mutex_lock (&ov7251->lock);if (enable) { + ret =pm_runtime_get_sync (ov7251->dev); +if (ret <0 ) + goto unlock_out; + ret =ov7251_pll_configure (ov7251); -if (ret) -return dev_err_probe (ov7251->dev, ret, -"error configuring PLLs\n" ); +if (ret) { +dev_err (ov7251->dev,"error configuring PLLs\n" ); + goto err_power_down; + } ret = ov7251_set_register_array(ov7251, ov7251->current_mode->data,
@@ -1295,23 +1312,29 @@ static int ov7251_s_stream(struct v4l2_subdev *subdev, int enable)dev_err (ov7251->dev,"could not set mode %dx%d\n" , ov7251->current_mode->width, ov7251->current_mode->height); - goto exit; + goto err_power_down; } ret =__v4l2_ctrl_handler_setup (&ov7251->ctrls);if (ret <0 ) {dev_err (ov7251->dev,"could not sync v4l2 controls\n" ); - goto exit; + goto err_power_down; } ret =ov7251_write_reg (ov7251,OV7251_SC_MODE_SELECT ,OV7251_SC_MODE_SELECT_STREAMING ); +if (ret) + goto err_power_down; }else { ret =ov7251_write_reg (ov7251,OV7251_SC_MODE_SELECT ,OV7251_SC_MODE_SELECT_SW_STANDBY ); +pm_runtime_put (ov7251->dev); } -exit: +unlock_out:mutex_unlock (&ov7251->lock); +return ret; +err_power_down: +pm_runtime_put_noidle (ov7251->dev);return ret; }
@@ -1611,23 +1634,24 @@ static int ov7251_probe(struct i2c_client *client) goto free_ctrl; } - ret =ov7251_s_power (&ov7251->sd, true); -if (ret <0 ) { -dev_err (dev,"could not power up OV7251\n" ); + ret =ov7251_set_power_on (ov7251->dev); +if (ret) goto free_entity; - } ret =ov7251_detect_chip (ov7251);if (ret) goto power_down; +pm_runtime_set_active (&client->dev); +pm_runtime_get_noresume (&client->dev); +pm_runtime_enable (&client->dev); ret =ov7251_read_reg (ov7251,OV7251_PRE_ISP_00 , &ov7251->pre_isp_00);if (ret <0 ) {dev_err (dev,"could not read test pattern value\n" ); ret = -ENODEV ; - goto power_down; + goto err_pm_runtime; } ret = ov7251_read_reg(ov7251, OV7251_TIMING_FORMAT1,
@@ -1635,7 +1659,7 @@ static int ov7251_probe(struct i2c_client *client)if (ret <0 ) {dev_err (dev,"could not read vflip value\n" ); ret = -ENODEV ; - goto power_down; + goto err_pm_runtime; } ret = ov7251_read_reg(ov7251, OV7251_TIMING_FORMAT2,
@@ -1643,10 +1667,12 @@ static int ov7251_probe(struct i2c_client *client)if (ret <0 ) {dev_err (dev,"could not read hflip value\n" ); ret = -ENODEV ; - goto power_down; + goto err_pm_runtime; } -ov7251_s_power (&ov7251->sd, false); +pm_runtime_set_autosuspend_delay (&client->dev,1000 ); +pm_runtime_use_autosuspend (&client->dev); +pm_runtime_put_autosuspend (&client->dev); ret =v4l2_async_register_subdev (&ov7251->sd);if (ret <0 ) {
@@ -1658,8 +1684,11 @@ static int ov7251_probe(struct i2c_client *client)return 0 ; +err_pm_runtime: +pm_runtime_disable (ov7251->dev); +pm_runtime_put_noidle (ov7251->dev); power_down: -ov7251_s_power (&ov7251->sd, false); +ov7251_set_power_off (ov7251->dev); free_entity:media_entity_cleanup (&ov7251->sd.entity); free_ctrl:
@@ -1679,9 +1708,18 @@ static int ov7251_remove(struct i2c_client *client)v4l2_ctrl_handler_free (&ov7251->ctrls);mutex_destroy (&ov7251->lock); +pm_runtime_disable (ov7251->dev); +if (!pm_runtime_status_suspended (ov7251->dev)) +ov7251_set_power_off (ov7251->dev); +pm_runtime_set_suspended (ov7251->dev); +return 0 ; } +static const struct dev_pm_ops ov7251_pm_ops = { +SET_RUNTIME_PM_OPS (ov7251_set_power_off, ov7251_set_power_on,NULL ) +}; +static const struct of_device_id ov7251_of_match[] = { { .compatible ="ovti,ov7251" }, {/* sentinel */ }
@@ -1699,6 +1737,7 @@ static struct i2c_driver ov7251_i2c_driver = { .of_match_table = ov7251_of_match, .acpi_match_table = ov7251_acpi_match, .name = "ov7251", + .pm = &ov7251_pm_ops, }, .probe_new = ov7251_probe, .remove = ov7251_remove,
Signature · 1 line
2.25.1
PATCH v2 10/11 media: i2c: Remove .s_power() from ov7251
In reply to Daniel ScallyThe .s_power() callback is deprecated, and now that we have pm_runtime functionality in the driver there's no further use for it. Delete the function.
---
Changes in v2:
- Set the global init registers as part of ov7251_set_power_on() (Sakari)
drivers/media/i2c/ov7251.c | 53 +++++++------------------------------- 1 file changed, 10 insertions(+), 43 deletions(-)
drivers/media/i2c/ov7251.c +10 -43
@@ -910,7 +910,16 @@ static int ov7251_set_power_on(struct device *dev) DIV_ROUND_UP(ov7251->xclk_freq, 1000));usleep_range (wait_us, wait_us +1000 ); -return 0 ; + ret =ov7251_set_register_array (ov7251, + ov7251_global_init_setting, +ARRAY_SIZE (ov7251_global_init_setting)); +if (ret <0 ) { +dev_err (ov7251->dev,"error during global init\n" ); +ov7251_regulators_disable (ov7251); +return ret; + } + +return ret; }static int ov7251_set_power_off (struct device *dev)
@@ -926,43 +935,6 @@ static int ov7251_set_power_off(struct device *dev)return 0 ; } -static int ov7251_s_power (struct v4l2_subdev *sd,int on) -{ -struct ov7251 *ov7251 =to_ov7251 (sd); -int ret =0 ; - -mutex_lock (&ov7251->lock); - -/* If the power state is not modified - no work to do. */ -if (ov7251->power_on == !!on) - goto exit; - -if (on) { - ret =ov7251_set_power_on (ov7251->dev); -if (ret <0 ) - goto exit; - - ret =ov7251_set_register_array (ov7251, - ov7251_global_init_setting, -ARRAY_SIZE (ov7251_global_init_setting)); -if (ret <0 ) { -dev_err (ov7251->dev,"could not set init registers\n" ); -ov7251_set_power_off (ov7251->dev); - goto exit; - } - - ov7251->power_on = true; - }else { -ov7251_set_power_off (ov7251->dev); - ov7251->power_on = false; - } - -exit: -mutex_unlock (&ov7251->lock); - -return ret; -} -static int ov7251_set_hflip (struct ov7251 *ov7251,s32 value) {u8 val = ov7251->timing_format2;
@@ -1387,10 +1359,6 @@ static int ov7251_set_frame_interval(struct v4l2_subdev *subdev,return ret; } -static const struct v4l2_subdev_core_ops ov7251_core_ops = { - .s_power = ov7251_s_power, -}; -static const struct v4l2_subdev_video_ops ov7251_video_ops = { .s_stream = ov7251_s_stream, .g_frame_interval = ov7251_get_frame_interval,
@@ -1408,7 +1376,6 @@ static const struct v4l2_subdev_pad_ops ov7251_subdev_pad_ops = { };static const struct v4l2_subdev_ops ov7251_subdev_ops = { - .core = &ov7251_core_ops, .video = &ov7251_video_ops, .pad = &ov7251_subdev_pad_ops, };
Signature · 1 line
2.25.1
PATCH v2 11/11 media: ipu3-cio2: Add INT347E to cio2-bridge
In reply to Daniel ScallyThe OVTI7251 sensor can be found on x86 laptops with an IPU3, and so needs to be supported by the cio2-bridge. Add it to the table of supported sensors.
---
Changes in v2:
- Switched to 319.2MHz link frequency
drivers/media/pci/intel/ipu3/cio2-bridge.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/pci/intel/ipu3/cio2-bridge.c +2 -0
@@ -25,6 +25,8 @@ static const struct cio2_sensor_config cio2_supported_sensors[] = {CIO2_SENSOR_CONFIG ("INT33BE" ,1 ,419200000 ),/* Omnivision OV8865 */ CIO2_SENSOR_CONFIG ("INT347A" ,1 ,360000000 ), +/* Omnivision OV7251 */ +CIO2_SENSOR_CONFIG ("INT347E" ,1 ,319200000 ),/* Omnivision OV2680 */ CIO2_SENSOR_CONFIG("OVTI2680", 0), };
Signature · 1 line
2.25.1