media: mt9m001: switch soc_mt9m001 to a standard subdev sensor driver
Subsystems (3)
v2 cover media: mt9m001: switch soc_mt9m001 to a standard subdev sensor driver
This patchset converts soc_camera mt9m001 driver to a standard subdev sensor driver.
* v2
- Update binding doc suggested by Rob Herring.
- Fix MODULE_LICENSE() masmatch.
- Sort headers alphabetically.
- Add new label for error handling in s_stream() callback.
- Replace pm_runtime_get_noresume() + pm_runtime_put_sync() with a single pm_runtime_idle() call in probe() function.
- Change the argument of mt9m001_power_o{n,ff} to struct device, and use them for runtime PM callbacks directly.
- Remove redundant Kconfig dependency
- Preserve subdev flags set by v4l2_i2c_subdev_init().
- Set initial try format with default configuration instead of current one.
Akinobu Mita (13):
media: i2c: mt9m001: copy mt9m001 soc_camera sensor driver
media: i2c: mt9m001: dt: add binding for mt9m001
media: mt9m001: convert to SPDX license identifer
media: mt9m001: sort headers alphabetically
media: mt9m001: add of_match_table
media: mt9m001: introduce multi_reg_write()
media: mt9m001: switch s_power callback to runtime PM
media: mt9m001: remove remaining soc_camera specific code
media: mt9m001: add media controller support
media: mt9m001: register to V4L2 asynchronous subdevice framework
media: mt9m001: support log_status ioctl and event interface
media: mt9m001: make VIDIOC_SUBDEV_G_FMT ioctl work with
V4L2_SUBDEV_FORMAT_TRY
media: mt9m001: set all mbus format field when G_FMT and S_FMT ioctls
.../devicetree/bindings/media/i2c/mt9m001.txt | 38 + drivers/media/i2c/Kconfig | 8 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/mt9m001.c | 884 +++++++++++++++++++++ 4 files changed, 931 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9m001.txt create mode 100644 drivers/media/i2c/mt9m001.c
Signature · 1 line
2.7.4
PATCH v2 1/13 media: i2c: mt9m001: copy mt9m001 soc_camera sensor driver
Copy the soc_camera based driver in v4l2 sensor driver directory. This commit just copies the original file without modifying it.
---
* No changes from v1
drivers/media/i2c/Kconfig | 7 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/mt9m001.c | 757 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 765 insertions(+) create mode 100644 drivers/media/i2c/mt9m001.c
drivers/media/i2c/Kconfig +7 -0
@@ -857,6 +857,13 @@ config VIDEO_VS6624 To compile this driver as a module, choose M here: the module will be called vs6624. +config VIDEO_MT9M001 + tristate "mt9m001 support" + depends on SOC_CAMERA && I2C + help + This driver supports MT9M001 cameras from Micron, monochrome + and colour models. + config VIDEO_MT9M032 tristate "MT9M032 camera sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
drivers/media/i2c/Makefile +1 -0
@@ -81,6 +81,7 @@ obj-$(CONFIG_VIDEO_OV7740) += ov7740.o obj-$(CONFIG_VIDEO_OV9650) += ov9650.o obj-$(CONFIG_VIDEO_OV9655) += ov9655.o obj-$(CONFIG_VIDEO_OV13858) += ov13858.o +obj-$(CONFIG_VIDEO_MT9M001) += mt9m001.o obj-$(CONFIG_VIDEO_MT9M032) += mt9m032.o obj-$(CONFIG_VIDEO_MT9M111) += mt9m111.o obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o
drivers/media/i2c/mt9m001.c new file +757 -0
757 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v2 2/13 media: i2c: mt9m001: dt: add binding for mt9m001
In reply to Akinobu MitaAdd device tree binding documentation for the MT9M001 CMOS image sensor.
---
* v2
- Update binding doc suggested by Rob Herring.
.../devicetree/bindings/media/i2c/mt9m001.txt | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9m001.txt
Documentation/devicetree/bindings/media/i2c/mt9m001.txt new file +38 -0
@@ -0,0 +1,38 @@ +MT9M001: 1/2-Inch Megapixel Digital Image Sensor + +The MT9M001 is an SXGA-format with a 1/2-inch CMOS active-pixel digital +image sensor. It is programmable through I2C interface. + +Required Properties: + +- compatible: shall be "onnn,mt9m001". +- clocks: reference to the master clock into sensor + +Optional Properties: + +- reset-gpios: GPIO handle which is connected to the reset pin of the chip. + Active low. +- standby-gpios: GPIO handle which is connected to the standby pin of the chip. + Active high. + +The device node must contain one 'port' child node with one 'endpoint' child +sub-node for its digital output video port, in accordance with the video +interface bindings defined in: +Documentation/devicetree/bindings/media/video-interfaces.txt + +Example: + + &i2c1 { + camera-sensor@5d { + compatible = "onnn,mt9m001"; + reg = <0x5d>; + reset-gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + standby-gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; + clocks = <&camera_clk>; + port { + mt9m001_out: endpoint { + remote-endpoint = <&vcap_in>; + }; + }; + }; + };
Signature · 1 line
2.7.4
Re: [PATCH v2 02/13] media: i2c: mt9m001: dt: add binding for mt9m001
Quoted 7 lines · Akinobu Mita
Add device tree binding documentation for the MT9M001 CMOS image sensor.
Cc Rob Herring <[email protected]>Cc Guennadi Liakhovetski <[email protected]>Cc Sakari Ailus <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Signed-off-by Akinobu Mita <[email protected]>
Quoted 8 lines
---
* v2
- Update binding doc suggested by Rob Herring..../devicetree/bindings/media/i2c/mt9m001.txt | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9m001.txt
PATCH v2 3/13 media: mt9m001: convert to SPDX license identifer
In reply to Akinobu MitaReplace GPL license statements with SPDX license identifiers (GPL-2.0).
This also fixes MODULE_LICENSE() ident to match the actual license text.
---
* v2
- Fix MODULE_LICENSE() masmatch.
drivers/media/i2c/mt9m001.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/media/i2c/mt9m001.c +2 -5
@@ -1,11 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for MT9M001 CMOS Image Sensor from Micron * * Copyright (C) 2008, Guennadi Liakhovetski <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. */ #include <linux/videodev2.h>
@@ -754,4 +751,4 @@ module_i2c_driver(mt9m001_i2c_driver);MODULE_DESCRIPTION ("Micron MT9M001 Camera driver" );MODULE_AUTHOR ("Guennadi Liakhovetski <[email protected]>" ); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.7.4
PATCH v2 4/13 media: mt9m001: sort headers alphabetically
In reply to Akinobu MitaSort header block alphabetically for easy maintenance.
---
* New patch from v2
drivers/media/i2c/mt9m001.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/i2c/mt9m001.c +4 -4
@@ -5,17 +5,17 @@* Copyright (C) 2008, Guennadi Liakhovetski <[email protected]> */ -#include <linux/videodev2.h> -#include <linux/slab.h> #include <linux/i2c.h> #include <linux/log2.h> #include <linux/module.h> +#include <linux/slab.h> +#include <linux/videodev2.h> -#include <media/soc_camera.h> #include <media/drv-intf/soc_mediabus.h> +#include <media/soc_camera.h> #include <media/v4l2-clk.h> -#include <media/v4l2-subdev.h> #include <media/v4l2-ctrls.h> +#include <media/v4l2-subdev.h> /* * mt9m001 i2c address 0x5d
Signature · 1 line
2.7.4
PATCH v2 5/13 media: mt9m001: add of_match_table
In reply to Akinobu MitaAdd of_match_table for the MT9M001 CMOS image sensor.
---
* No changes from v1
drivers/media/i2c/mt9m001.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/media/i2c/mt9m001.c +7 -0
@@ -738,9 +738,16 @@ static const struct i2c_device_id mt9m001_id[] = { };MODULE_DEVICE_TABLE (i2c, mt9m001_id); +static const struct of_device_id mt9m001_of_match[] = { + { .compatible ="onnn,mt9m001" , }, + {/* sentinel */ }, +}; +MODULE_DEVICE_TABLE (of, mt9m001_of_match); +static struct i2c_driver mt9m001_i2c_driver = { .driver = { .name ="mt9m001" , + .of_match_table = mt9m001_of_match, }, .probe = mt9m001_probe, .remove = mt9m001_remove,
Signature · 1 line
2.7.4
PATCH v2 6/13 media: mt9m001: introduce multi_reg_write()
In reply to Akinobu MitaIntroduce multi_reg_write() to write multiple registers to the device and use it where possible.
---
* No changes from v1
drivers/media/i2c/mt9m001.c | 88 +++++++++++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 31 deletions(-)
drivers/media/i2c/mt9m001.c +57 -31
@@ -47,6 +47,8 @@#define MT9M001_MIN_HEIGHT 32#define MT9M001_COLUMN_SKIP 20#define MT9M001_ROW_SKIP 12 +#define MT9M001_DEFAULT_HBLANK 9 +#define MT9M001_DEFAULT_VBLANK 25/* MT9M001 has only one fixed colorspace per pixelcode */ struct mt9m001_datafmt {
@@ -137,25 +139,65 @@ static int reg_clear(struct i2c_client *client, const u8 reg,return reg_write (client, reg, ret & ~data); } +struct mt9m001_reg { +u8 reg; +u16 data; +}; + +static int multi_reg_write (struct i2c_client *client, +const struct mt9m001_reg *regs,int num) +{ +int i; + +for (i =0 ; i < num; i++) { +int ret =reg_write (client, regs[i].reg, regs[i].data); + +if (ret) +return ret; + } + +return 0 ; +} +static int mt9m001_init (struct i2c_client *client) { -int ret; +const struct mt9m001_reg init_regs[] = { +/* +* Issue a soft reset. This returns all registers to their +* default values. +*/ + {MT9M001_RESET ,1 }, + {MT9M001_RESET ,0 }, +/* Disable chip, synchronous option update */ + {MT9M001_OUTPUT_CONTROL ,0 } + };dev_dbg (&client->dev,"%s\n" , __func__); -/* -* We don't know, whether platform provides reset, issue a soft reset -* too. This returns all registers to their default values. -*/ - ret =reg_write (client,MT9M001_RESET ,1 ); -if (!ret) - ret =reg_write (client,MT9M001_RESET ,0 ); +return multi_reg_write (client, init_regs,ARRAY_SIZE (init_regs)); +} -/* Disable chip, synchronous option update */ -if (!ret) - ret =reg_write (client,MT9M001_OUTPUT_CONTROL ,0 ); +static int mt9m001_apply_selection (struct v4l2_subdev *sd, +struct v4l2_rect *rect) +{ +struct i2c_client *client =v4l2_get_subdevdata (sd); +struct mt9m001 *mt9m001 =to_mt9m001 (client); +const struct mt9m001_reg regs[] = { +/* Blanking and start values - default... */ + {MT9M001_HORIZONTAL_BLANKING ,MT9M001_DEFAULT_HBLANK }, + {MT9M001_VERTICAL_BLANKING ,MT9M001_DEFAULT_VBLANK }, +/* +* The caller provides a supported format, as verified per +* call to .set_fmt(FORMAT_TRY). +*/ + {MT9M001_COLUMN_START , rect->left }, + {MT9M001_ROW_START , rect->top }, + {MT9M001_WINDOW_WIDTH , rect->width -1 }, + {MT9M001_WINDOW_HEIGHT , + rect->height + mt9m001->y_skip_top -1 }, + }; -return ret; +return multi_reg_write (client, regs,ARRAY_SIZE (regs)); }static int mt9m001_s_stream (struct v4l2_subdev *sd,int enable)
@@ -175,7 +217,6 @@ static int mt9m001_set_selection(struct v4l2_subdev *sd,struct i2c_client *client =v4l2_get_subdevdata (sd);struct mt9m001 *mt9m001 =to_mt9m001 (client);struct v4l2_rect rect = sel->r; -const u16 hblank =9 , vblank =25 ;int ret; if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE ||
@@ -199,26 +240,11 @@ static int mt9m001_set_selection(struct v4l2_subdev *sd,soc_camera_limit_side (&rect.top, &rect.height,MT9M001_ROW_SKIP ,MT9M001_MIN_HEIGHT ,MT9M001_MAX_HEIGHT ); - mt9m001->total_h = rect.height + mt9m001->y_skip_top + vblank; + mt9m001->total_h = rect.height + mt9m001->y_skip_top + +MT9M001_DEFAULT_VBLANK ; -/* Blanking and start values - default... */ - ret =reg_write (client,MT9M001_HORIZONTAL_BLANKING , hblank); -if (!ret) - ret =reg_write (client,MT9M001_VERTICAL_BLANKING , vblank); -/* -* The caller provides a supported format, as verified per -* call to .set_fmt(FORMAT_TRY). -*/ -if (!ret) - ret =reg_write (client,MT9M001_COLUMN_START , rect.left); -if (!ret) - ret =reg_write (client,MT9M001_ROW_START , rect.top); -if (!ret) - ret =reg_write (client,MT9M001_WINDOW_WIDTH , rect.width -1 ); -if (!ret) - ret =reg_write (client,MT9M001_WINDOW_HEIGHT , - rect.height + mt9m001->y_skip_top -1 ); + ret =mt9m001_apply_selection (sd, &rect);if (!ret &&v4l2_ctrl_g_ctrl (mt9m001->autoexposure) ==V4L2_EXPOSURE_AUTO ) ret =reg_write (client,MT9M001_SHUTTER_WIDTH , mt9m001->total_h);
Signature · 1 line
2.7.4
PATCH v2 7/13 media: mt9m001: switch s_power callback to runtime PM
In reply to Akinobu MitaSwitch s_power() callback to runtime PM framework. This also removes soc_camera specific power management code and introduces reset and standby gpios instead.
---
* v2
- Add new label for error handling in s_stream() callback.
- Replace pm_runtime_get_noresume() + pm_runtime_put_sync() with a single pm_runtime_idle() call in probe() function.
- Change the argument of mt9m001_power_o{n,ff} to struct device, and use them for runtime PM callbacks directly.
drivers/media/i2c/mt9m001.c | 222 +++++++++++++++++++++++++++++++------------- 1 file changed, 160 insertions(+), 62 deletions(-)
drivers/media/i2c/mt9m001.c +160 -62
@@ -5,15 +5,18 @@* Copyright (C) 2008, Guennadi Liakhovetski <[email protected]> */ +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/log2.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #include <linux/slab.h> #include <linux/videodev2.h> #include <media/drv-intf/soc_mediabus.h> #include <media/soc_camera.h> -#include <media/v4l2-clk.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h>
@@ -92,8 +95,12 @@ struct mt9m001 {struct v4l2_ctrl *autoexposure;struct v4l2_ctrl *exposure; }; +bool streaming; +struct mutex mutex;struct v4l2_rect rect;/* Sensor window */ -struct v4l2_clk *clk; +struct clk *clk; +struct gpio_desc *standby_gpio; +struct gpio_desc *reset_gpio;const struct mt9m001_datafmt *fmt;const struct mt9m001_datafmt *fmts;int num_fmts;
@@ -177,8 +184,7 @@ static int mt9m001_init(struct i2c_client *client)return multi_reg_write (client, init_regs,ARRAY_SIZE (init_regs)); } -static int mt9m001_apply_selection (struct v4l2_subdev *sd, -struct v4l2_rect *rect) +static int mt9m001_apply_selection (struct v4l2_subdev *sd) {struct i2c_client *client =v4l2_get_subdevdata (sd);struct mt9m001 *mt9m001 =to_mt9m001 (client);
@@ -190,11 +196,11 @@ static int mt9m001_apply_selection(struct v4l2_subdev *sd,* The caller provides a supported format, as verified per * call to .set_fmt(FORMAT_TRY). */ - { MT9M001_COLUMN_START, rect->left }, - { MT9M001_ROW_START, rect->top }, - { MT9M001_WINDOW_WIDTH, rect->width - 1 }, + { MT9M001_COLUMN_START, mt9m001->rect.left }, + { MT9M001_ROW_START, mt9m001->rect.top }, + { MT9M001_WINDOW_WIDTH, mt9m001->rect.width - 1 }, { MT9M001_WINDOW_HEIGHT, - rect->height + mt9m001->y_skip_top - 1 }, + mt9m001->rect.height + mt9m001->y_skip_top - 1 }, };return multi_reg_write (client, regs,ARRAY_SIZE (regs));
@@ -203,11 +209,48 @@ static int mt9m001_apply_selection(struct v4l2_subdev *sd,static int mt9m001_s_stream (struct v4l2_subdev *sd,int enable) {struct i2c_client *client =v4l2_get_subdevdata (sd); +struct mt9m001 *mt9m001 =to_mt9m001 (client); +int ret =0 ; + +mutex_lock (&mt9m001->mutex); + +if (mt9m001->streaming == enable) + goto done; + +if (enable) { + ret =pm_runtime_get_sync (&client->dev); +if (ret <0 ) + goto put_unlock; + + ret =mt9m001_apply_selection (sd); +if (ret) + goto put_unlock; + + ret =__v4l2_ctrl_handler_setup (&mt9m001->hdl); +if (ret) + goto put_unlock; + +/* Switch to master "normal" mode */ + ret =reg_write (client,MT9M001_OUTPUT_CONTROL ,2 ); +if (ret <0 ) + goto put_unlock; + }else { +/* Switch to master stop sensor readout */ +reg_write (client,MT9M001_OUTPUT_CONTROL ,0 ); +pm_runtime_put (&client->dev); + } + + mt9m001->streaming = enable; +done: +mutex_unlock (&mt9m001->mutex); -/* Switch to master "normal" mode or stop sensor readout */ -if (reg_write (client,MT9M001_OUTPUT_CONTROL , enable ?2 :0 ) <0 ) -return -EIO ;return 0 ; + +put_unlock: +pm_runtime_put (&client->dev); +mutex_unlock (&mt9m001->mutex); + +return ret; } static int mt9m001_set_selection(struct v4l2_subdev *sd,
@@ -217,7 +260,6 @@ static int mt9m001_set_selection(struct v4l2_subdev *sd,struct i2c_client *client =v4l2_get_subdevdata (sd);struct mt9m001 *mt9m001 =to_mt9m001 (client);struct v4l2_rect rect = sel->r; -int ret;if (sel->which !=V4L2_SUBDEV_FORMAT_ACTIVE || sel->target !=V4L2_SEL_TGT_CROP )
@@ -243,15 +285,9 @@ static int mt9m001_set_selection(struct v4l2_subdev *sd, mt9m001->total_h = rect.height + mt9m001->y_skip_top +MT9M001_DEFAULT_VBLANK ; + mt9m001->rect = rect; - ret =mt9m001_apply_selection (sd, &rect); -if (!ret &&v4l2_ctrl_g_ctrl (mt9m001->autoexposure) ==V4L2_EXPOSURE_AUTO ) - ret =reg_write (client,MT9M001_SHUTTER_WIDTH , mt9m001->total_h); - -if (!ret) - mt9m001->rect = rect; - -return ret; +return 0 ; } static int mt9m001_get_selection(struct v4l2_subdev *sd,
@@ -395,13 +431,40 @@ static int mt9m001_s_register(struct v4l2_subdev *sd, }#endif -static int mt9m001_s_power (struct v4l2_subdev *sd,int on) +static int mt9m001_power_on (struct device *dev) { -struct i2c_client *client =v4l2_get_subdevdata (sd); -struct soc_camera_subdev_desc *ssdd =soc_camera_i2c_to_desc (client); +struct i2c_client *client =to_i2c_client (dev);struct mt9m001 *mt9m001 =to_mt9m001 (client); +int ret; + + ret =clk_prepare_enable (mt9m001->clk); +if (ret) +return ret; + +if (mt9m001->standby_gpio) { +gpiod_set_value_cansleep (mt9m001->standby_gpio,0 ); +usleep_range (1000 ,2000 ); + } -return soc_camera_set_power (&client->dev, ssdd, mt9m001->clk, on); +if (mt9m001->reset_gpio) { +gpiod_set_value_cansleep (mt9m001->reset_gpio,1 ); +usleep_range (1000 ,2000 ); +gpiod_set_value_cansleep (mt9m001->reset_gpio,0 ); +usleep_range (1000 ,2000 ); + } + +return 0 ; +} + +static int mt9m001_power_off (struct device *dev) +{ +struct i2c_client *client =to_i2c_client (dev); +struct mt9m001 *mt9m001 =to_mt9m001 (client); + +gpiod_set_value_cansleep (mt9m001->standby_gpio,1 ); +clk_disable_unprepare (mt9m001->clk); + +return 0 ; }static int mt9m001_g_volatile_ctrl (struct v4l2_ctrl *ctrl)
@@ -429,16 +492,18 @@ static int mt9m001_s_ctrl(struct v4l2_ctrl *ctrl)struct i2c_client *client =v4l2_get_subdevdata (sd);struct v4l2_ctrl *exp = mt9m001->exposure;int data; +int ret; + +if (!pm_runtime_get_if_in_use (&client->dev)) +return 0 ;switch (ctrl->id) {case V4L2_CID_VFLIP :if (ctrl->val) - data =reg_set (client,MT9M001_READ_OPTIONS2 ,0x8000 ); + ret =reg_set (client,MT9M001_READ_OPTIONS2 ,0x8000 );else - data =reg_clear (client,MT9M001_READ_OPTIONS2 ,0x8000 ); -if (data <0 ) -return -EIO ; -return 0 ; + ret =reg_clear (client,MT9M001_READ_OPTIONS2 ,0x8000 ); +break ;case V4L2_CID_GAIN :/* See Datasheet Table 7, Gain settings. */
@@ -448,9 +513,7 @@ static int mt9m001_s_ctrl(struct v4l2_ctrl *ctrl) data = ((ctrl->val - (s32 )ctrl->minimum) *8 + range /2 ) / range;dev_dbg (&client->dev,"Setting gain %d\n" , data); - data =reg_write (client,MT9M001_GLOBAL_GAIN , data); -if (data <0 ) -return -EIO ; + ret =reg_write (client,MT9M001_GLOBAL_GAIN , data); }else {/* Pack it into 1.125..15 variable step, register values 9..67 */ /* We assume qctrl->maximum - qctrl->default_value - 1 > 0 */
@@ -467,11 +530,9 @@ static int mt9m001_s_ctrl(struct v4l2_ctrl *ctrl)dev_dbg (&client->dev,"Setting gain from %d to %d\n" ,reg_read (client,MT9M001_GLOBAL_GAIN ), data); - data =reg_write (client,MT9M001_GLOBAL_GAIN , data); -if (data <0 ) -return -EIO ; + ret =reg_write (client,MT9M001_GLOBAL_GAIN , data); } -return 0 ; +break ;case V4L2_CID_EXPOSURE_AUTO :if (ctrl->val ==V4L2_EXPOSURE_MANUAL ) {
@@ -482,19 +543,22 @@ static int mt9m001_s_ctrl(struct v4l2_ctrl *ctrl)dev_dbg (&client->dev,"Setting shutter width from %d to %lu\n" ,reg_read (client,MT9M001_SHUTTER_WIDTH ), shutter); -if (reg_write (client,MT9M001_SHUTTER_WIDTH , shutter) <0 ) -return -EIO ; + ret =reg_write (client,MT9M001_SHUTTER_WIDTH , shutter); }else { -const u16 vblank =25 ; - mt9m001->total_h = mt9m001->rect.height + - mt9m001->y_skip_top + vblank; -if (reg_write (client,MT9M001_SHUTTER_WIDTH , mt9m001->total_h) <0 ) -return -EIO ; + mt9m001->y_skip_top +MT9M001_DEFAULT_VBLANK ; + ret =reg_write (client,MT9M001_SHUTTER_WIDTH , + mt9m001->total_h); } -return 0 ; +break ; +default : + ret = -EINVAL ; +break ; } -return -EINVAL ; + +pm_runtime_put (&client->dev); + +return ret; }/*
@@ -509,10 +573,6 @@ static int mt9m001_video_probe(struct soc_camera_subdev_desc *ssdd,unsigned long flags;int ret; - ret =mt9m001_s_power (&mt9m001->subdev,1 ); -if (ret <0 ) -return ret; -/* Enable the chip */ data =reg_write (client,MT9M001_CHIP_ENABLE ,1 );dev_dbg (&client->dev,"write: %d\n" , data);
@@ -571,7 +631,6 @@ static int mt9m001_video_probe(struct soc_camera_subdev_desc *ssdd, ret =v4l2_ctrl_handler_setup (&mt9m001->hdl); done: -mt9m001_s_power (&mt9m001->subdev,0 );return ret; }
@@ -601,7 +660,6 @@ static const struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = { .g_register = mt9m001_g_register, .s_register = mt9m001_s_register,#endif - .s_power = mt9m001_s_power, }; static int mt9m001_enum_mbus_code(struct v4l2_subdev *sd,
@@ -700,6 +758,20 @@ static int mt9m001_probe(struct i2c_client *client,if (!mt9m001)return -ENOMEM ; + mt9m001->clk =devm_clk_get (&client->dev,NULL ); +if (IS_ERR (mt9m001->clk)) +return PTR_ERR (mt9m001->clk); + + mt9m001->standby_gpio =devm_gpiod_get_optional (&client->dev,"standby" , +GPIOD_OUT_LOW ); +if (IS_ERR (mt9m001->standby_gpio)) +return PTR_ERR (mt9m001->standby_gpio); + + mt9m001->reset_gpio =devm_gpiod_get_optional (&client->dev,"reset" , +GPIOD_OUT_LOW ); +if (IS_ERR (mt9m001->reset_gpio)) +return PTR_ERR (mt9m001->reset_gpio); +v4l2_i2c_subdev_init (&mt9m001->subdev, client, &mt9m001_subdev_ops);v4l2_ctrl_handler_init (&mt9m001->hdl,4 ); v4l2_ctrl_new_std(&mt9m001->hdl, &mt9m001_ctrl_ops,
@@ -722,6 +794,9 @@ static int mt9m001_probe(struct i2c_client *client,v4l2_ctrl_auto_cluster (2 , &mt9m001->autoexposure,V4L2_EXPOSURE_MANUAL , true); +mutex_init (&mt9m001->mutex); + mt9m001->hdl.lock = &mt9m001->mutex; +/* Second stage probe - when a capture adapter is there */ mt9m001->y_skip_top =0 ; mt9m001->rect.left =MT9M001_COLUMN_SKIP ;
@@ -729,18 +804,29 @@ static int mt9m001_probe(struct i2c_client *client, mt9m001->rect.width =MT9M001_MAX_WIDTH ; mt9m001->rect.height =MT9M001_MAX_HEIGHT ; - mt9m001->clk =v4l2_clk_get (&client->dev,"mclk" ); -if (IS_ERR (mt9m001->clk)) { - ret =PTR_ERR (mt9m001->clk); - goto eclkget; - } + ret =mt9m001_power_on (&client->dev); +if (ret) + goto error_hdl_free; + +pm_runtime_set_active (&client->dev); +pm_runtime_enable (&client->dev); ret =mt9m001_video_probe (ssdd, client); -if (ret) { -v4l2_clk_put (mt9m001->clk); -eclkget: -v4l2_ctrl_handler_free (&mt9m001->hdl); - } +if (ret) + goto error_power_off; + +pm_runtime_idle (&client->dev); + +return 0 ; + +error_power_off: +pm_runtime_disable (&client->dev); +pm_runtime_set_suspended (&client->dev); +mt9m001_power_off (&client->dev); + +error_hdl_free: +v4l2_ctrl_handler_free (&mt9m001->hdl); +mutex_destroy (&mt9m001->mutex);return ret; }
@@ -750,10 +836,17 @@ static int mt9m001_remove(struct i2c_client *client)struct mt9m001 *mt9m001 =to_mt9m001 (client);struct soc_camera_subdev_desc *ssdd =soc_camera_i2c_to_desc (client); -v4l2_clk_put (mt9m001->clk);v4l2_device_unregister_subdev (&mt9m001->subdev); +pm_runtime_get_sync (&client->dev); + +pm_runtime_disable (&client->dev); +pm_runtime_set_suspended (&client->dev); +pm_runtime_put_noidle (&client->dev); +mt9m001_power_off (&client->dev); +v4l2_ctrl_handler_free (&mt9m001->hdl);mt9m001_video_remove (ssdd); +mutex_destroy (&mt9m001->mutex);return 0 ; }
@@ -764,6 +857,10 @@ static const struct i2c_device_id mt9m001_id[] = { };MODULE_DEVICE_TABLE (i2c, mt9m001_id); +static const struct dev_pm_ops mt9m001_pm_ops = { +SET_RUNTIME_PM_OPS (mt9m001_power_off, mt9m001_power_on,NULL ) +}; +static const struct of_device_id mt9m001_of_match[] = { { .compatible ="onnn,mt9m001" , }, {/* sentinel */ },
@@ -773,6 +870,7 @@ MODULE_DEVICE_TABLE(of, mt9m001_of_match);static struct i2c_driver mt9m001_i2c_driver = { .driver = { .name ="mt9m001" , + .pm = &mt9m001_pm_ops, .of_match_table = mt9m001_of_match, }, .probe = mt9m001_probe,
Signature · 1 line
2.7.4
PATCH v2 8/13 media: mt9m001: remove remaining soc_camera specific code
In reply to Akinobu MitaRemove remaining soc_camera specific code and drop soc_camera dependency from this driver.
---
* No changes from v1
drivers/media/i2c/Kconfig | 2 +- drivers/media/i2c/mt9m001.c | 84 ++++++++------------------------------------- 2 files changed, 15 insertions(+), 71 deletions(-)
drivers/media/i2c/Kconfig +1 -1
@@ -859,7 +859,7 @@ config VIDEO_VS6624 config VIDEO_MT9M001 tristate "mt9m001 support" - depends on SOC_CAMERA && I2C + depends on I2C && VIDEO_V4L2 help This driver supports MT9M001 cameras from Micron, monochrome and colour models.
drivers/media/i2c/mt9m001.c +14 -70
182 lines not on this page · raw message
Signature · 1 line
2.7.4
Re: [PATCH v2 08/13] media: mt9m001: remove remaining soc_camera specific code
2019年1月8日(火) 23:52 Akinobu Mita <[email protected]>:
Quoted 56 lines
Remove remaining
soc_cameraspecific code and dropsoc_cameradependency from this driver.Cc Guennadi Liakhovetski <[email protected]>Cc Sakari Ailus <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Signed-off-by Akinobu Mita <[email protected]>---
* No changes from v1drivers/media/i2c/Kconfig | 2 +- drivers/media/i2c/mt9m001.c | 84 ++++++++------------------------------------- 2 files changed, 15 insertions(+), 71 deletions(-)drivers/media/i2c/Kconfig +1
-1@@ -859,7 +859,7 @@ config VIDEO_VS6624 config VIDEO_MT9M001 tristate "mt9m001 support" - depends on SOC_CAMERA && I2C + depends on I2C && VIDEO_V4L2 help This driver supports MT9M001 cameras from Micron, monochrome and colour models.drivers/media/i2c/mt9m001.c +2
-6@@ -15,15 +15,12 @@#include <linux/slab.h> #include <linux/videodev2.h> -#include <media/drv-intf/soc_mediabus.h> -#include <media/soc_camera.h> #include <media/v4l2-ctrls.h> +#include <media/v4l2-device.h> #include <media/v4l2-subdev.h> /* * mt9m001 i2c address 0x5d -* The platform has to define struct i2c_board_info objects and link to them -* from struct soc_camera_host_desc */ /* mt9m001 selected register addresses */ @@ -276,11 +273,15 @@ static int mt9m001_set_selection(struct v4l2_subdev *sd, rect.width =ALIGN (rect.width,2 ); rect.left =ALIGN (rect.left,2 ); -soc_camera_limit_side (&rect.left, &rect.width, -MT9M001_COLUMN_SKIP ,MT9M001_MIN_WIDTH ,MT9M001_MAX_WIDTH ); + rect.width = clamp_t(u32, rect.width, MT9M001_MIN_WIDTH,
drivers/media/i2c/mt9m001.c static int mt9m001_set_selection(struct v4l2_subdev *sd, · line 284
Quoted 10 lines
drivers/media/i2c/mt9m001.c +7
-2+ MT9M001_MAX_WIDTH); + rect.left =clamp_t (u32, rect.left,MT9M001_COLUMN_SKIP , +MT9M001_COLUMN_SKIP +MT9M001_MAX_WIDTH - rect.width); -soc_camera_limit_side (&rect.top, &rect.height, -MT9M001_ROW_SKIP ,MT9M001_MIN_HEIGHT ,MT9M001_MAX_HEIGHT ); + rect.height =clamp_t (u32, rect.height,MT9M001_MIN_HEIGHT , +MT9M001_MAX_HEIGHT ); + rect.top =clamp_t (u32, rect.top,MT9M001_ROW_SKIP , +MT9M001_ROW_SKIP +MT9M001_MAX_HEIGHT - rect.width);
Oops. This line isn't correct. s/rect.width/rect.height/
Sakari Ailus
maintainerRe: [PATCH v2 08/13] media: mt9m001: remove remaining soc_camera specific code
Hi Mita-san,
Quoted 61 lines · Akinobu Mita
2019年1月8日(火) 23:52 Akinobu Mita <[email protected]>:
Quoted 60 lines
Remove remaining
soc_cameraspecific code and dropsoc_cameradependency from this driver.Cc Guennadi Liakhovetski <[email protected]>Cc Sakari Ailus <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Signed-off-by Akinobu Mita <[email protected]>---
* No changes from v1drivers/media/i2c/Kconfig | 2 +- drivers/media/i2c/mt9m001.c | 84 ++++++++------------------------------------- 2 files changed, 15 insertions(+), 71 deletions(-)drivers/media/i2c/Kconfig +1
-1@@ -859,7 +859,7 @@ config VIDEO_VS6624 config VIDEO_MT9M001 tristate "mt9m001 support" - depends on SOC_CAMERA && I2C + depends on I2C && VIDEO_V4L2 help This driver supports MT9M001 cameras from Micron, monochrome and colour models.drivers/media/i2c/mt9m001.c +5
-6@@ -15,15 +15,12 @@#include <linux/slab.h> #include <linux/videodev2.h> -#include <media/drv-intf/soc_mediabus.h> -#include <media/soc_camera.h> #include <media/v4l2-ctrls.h> +#include <media/v4l2-device.h> #include <media/v4l2-subdev.h> /* * mt9m001 i2c address 0x5d -* The platform has to define struct i2c_board_info objects and link to them -* from struct soc_camera_host_desc */ /* mt9m001 selected register addresses */ @@ -276,11 +273,15 @@ static int mt9m001_set_selection(struct v4l2_subdev *sd, rect.width =ALIGN (rect.width,2 ); rect.left =ALIGN (rect.left,2 ); -soc_camera_limit_side (&rect.left, &rect.width, -MT9M001_COLUMN_SKIP ,MT9M001_MIN_WIDTH ,MT9M001_MAX_WIDTH ); + rect.width =clamp_t (u32, rect.width,MT9M001_MIN_WIDTH , +MT9M001_MAX_WIDTH ); + rect.left =clamp_t (u32, rect.left,MT9M001_COLUMN_SKIP , +MT9M001_COLUMN_SKIP +MT9M001_MAX_WIDTH - rect.width);
Quoted 8 lines
drivers/media/i2c/mt9m001.c static int mt9m001_set_selection(struct v4l2_subdev *sd, · line 284
Quoted 6 lines
drivers/media/i2c/mt9m001.c +4
-2-soc_camera_limit_side (&rect.top, &rect.height, -MT9M001_ROW_SKIP ,MT9M001_MIN_HEIGHT ,MT9M001_MAX_HEIGHT ); + rect.height =clamp_t (u32, rect.height,MT9M001_MIN_HEIGHT , +MT9M001_MAX_HEIGHT ); + rect.top =clamp_t (u32, rect.top,MT9M001_ROW_SKIP , +MT9M001_ROW_SKIP +MT9M001_MAX_HEIGHT - rect.width);Oops. This line isn't correct. s/rect.width/rect.height/
Could you resend just that patch? The rest seems fine as-is, at least on a quick glance. I'm also waiting for Rob's ack to the binding patch.
Signature · 4 lines
Kind regards, Sakari Ailus [email protected]
PATCH v2 8/13 media: mt9m001: remove remaining soc_camera specific code
Remove remaining soc_camera specific code and drop soc_camera dependency from this driver.
---
* v2.1
- Fix misconversion while opencoding soc_camera_limit_side().
drivers/media/i2c/Kconfig | 2 +- drivers/media/i2c/mt9m001.c | 84 ++++++++------------------------------------- 2 files changed, 15 insertions(+), 71 deletions(-)
drivers/media/i2c/Kconfig +1 -1
@@ -859,7 +859,7 @@ config VIDEO_VS6624 config VIDEO_MT9M001 tristate "mt9m001 support" - depends on SOC_CAMERA && I2C + depends on I2C && VIDEO_V4L2 help This driver supports MT9M001 cameras from Micron, monochrome and colour models.
drivers/media/i2c/mt9m001.c +14 -70
182 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v2 9/13 media: mt9m001: add media controller support
In reply to Akinobu MitaCreate a source pad and set the media controller type to the sensor.
---
* No changes from v1
drivers/media/i2c/Kconfig | 2 ++ drivers/media/i2c/mt9m001.c | 9 +++++++++ 2 files changed, 11 insertions(+)
drivers/media/i2c/Kconfig +2 -0
@@ -860,6 +860,8 @@ config VIDEO_VS6624 config VIDEO_MT9M001 tristate "mt9m001 support" depends on I2C && VIDEO_V4L2 + depends on MEDIA_CAMERA_SUPPORT + depends on MEDIA_CONTROLLER help This driver supports MT9M001 cameras from Micron, monochrome and colour models.
drivers/media/i2c/mt9m001.c +9 -0
@@ -103,6 +103,7 @@ struct mt9m001 {int num_fmts;unsigned int total_h;unsigned short y_skip_top;/* Lines to skip at the top */ +struct media_pad pad; };static struct mt9m001 *to_mt9m001 (const struct i2c_client *client)
@@ -761,6 +762,12 @@ static int mt9m001_probe(struct i2c_client *client,if (ret) goto error_power_off; + mt9m001->pad.flags =MEDIA_PAD_FL_SOURCE ; + mt9m001->subdev.entity.function =MEDIA_ENT_F_CAM_SENSOR ; + ret =media_entity_pads_init (&mt9m001->subdev.entity,1 , &mt9m001->pad); +if (ret) + goto error_power_off; +pm_runtime_idle (&client->dev);return 0 ;
@@ -784,6 +791,8 @@ static int mt9m001_remove(struct i2c_client *client)v4l2_device_unregister_subdev (&mt9m001->subdev);pm_runtime_get_sync (&client->dev); +media_entity_cleanup (&mt9m001->subdev.entity); +pm_runtime_disable (&client->dev);pm_runtime_set_suspended (&client->dev);pm_runtime_put_noidle (&client->dev);
Signature · 1 line
2.7.4
PATCH v2 10/13 media: mt9m001: register to V4L2 asynchronous subdevice framework
In reply to Akinobu MitaRegister a sub-device to the asynchronous subdevice framework, and also create subdevice device node.
---
* v2
- Remove redundant Kconfig dependency
- Preserve subdev flags set by v4l2_i2c_subdev_init().
drivers/media/i2c/Kconfig | 3 +-- drivers/media/i2c/mt9m001.c | 9 ++++++++- 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/media/i2c/Kconfig +1 -2
@@ -859,9 +859,8 @@ config VIDEO_VS6624 config VIDEO_MT9M001 tristate "mt9m001 support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API depends on MEDIA_CAMERA_SUPPORT - depends on MEDIA_CONTROLLER help This driver supports MT9M001 cameras from Micron, monochrome and colour models.
drivers/media/i2c/mt9m001.c +8 -1
@@ -720,6 +720,7 @@ static int mt9m001_probe(struct i2c_client *client,return PTR_ERR (mt9m001->reset_gpio);v4l2_i2c_subdev_init (&mt9m001->subdev, client, &mt9m001_subdev_ops); + mt9m001->subdev.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ;v4l2_ctrl_handler_init (&mt9m001->hdl,4 );v4l2_ctrl_new_std (&mt9m001->hdl, &mt9m001_ctrl_ops,V4L2_CID_VFLIP ,0 ,1 ,1 ,0 );
@@ -768,10 +769,16 @@ static int mt9m001_probe(struct i2c_client *client,if (ret) goto error_power_off; + ret =v4l2_async_register_subdev (&mt9m001->subdev); +if (ret) + goto error_entity_cleanup; +pm_runtime_idle (&client->dev);return 0 ; +error_entity_cleanup: +media_entity_cleanup (&mt9m001->subdev.entity); error_power_off:pm_runtime_disable (&client->dev);pm_runtime_set_suspended (&client->dev);
@@ -788,9 +795,9 @@ static int mt9m001_remove(struct i2c_client *client) {struct mt9m001 *mt9m001 =to_mt9m001 (client); -v4l2_device_unregister_subdev (&mt9m001->subdev);pm_runtime_get_sync (&client->dev); +v4l2_async_unregister_subdev (&mt9m001->subdev);media_entity_cleanup (&mt9m001->subdev.entity);pm_runtime_disable (&client->dev);
Signature · 1 line
2.7.4
PATCH v2 11/13 media: mt9m001: support log_status ioctl and event interface
In reply to Akinobu MitaThis adds log_status ioctl and event interface for mt9m001's v4l2 controls.
---
* No changes from v1
drivers/media/i2c/mt9m001.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/media/i2c/mt9m001.c +6 -1
@@ -17,6 +17,7 @@#include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> +#include <media/v4l2-event.h> #include <media/v4l2-subdev.h> /*
@@ -632,6 +633,9 @@ static const struct v4l2_ctrl_ops mt9m001_ctrl_ops = { };static const struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = { + .log_status = v4l2_ctrl_subdev_log_status, + .subscribe_event = v4l2_ctrl_subdev_subscribe_event, + .unsubscribe_event = v4l2_event_subdev_unsubscribe, #ifdef CONFIG_VIDEO_ADV_DEBUG .g_register = mt9m001_g_register, .s_register = mt9m001_s_register,
@@ -720,7 +724,8 @@ static int mt9m001_probe(struct i2c_client *client,return PTR_ERR (mt9m001->reset_gpio);v4l2_i2c_subdev_init (&mt9m001->subdev, client, &mt9m001_subdev_ops); - mt9m001->subdev.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; + mt9m001->subdev.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE | +V4L2_SUBDEV_FL_HAS_EVENTS ;v4l2_ctrl_handler_init (&mt9m001->hdl,4 );v4l2_ctrl_new_std (&mt9m001->hdl, &mt9m001_ctrl_ops,V4L2_CID_VFLIP ,0 ,1 ,1 ,0 );
Signature · 1 line
2.7.4
PATCH v2 12/13 media: mt9m001: make VIDIOC_SUBDEV_G_FMT ioctl work with V4L2_SUBDEV_FORMAT_TRY
In reply to Akinobu MitaThe VIDIOC_SUBDEV_G_FMT ioctl for this driver doesn't recognize V4L2_SUBDEV_FORMAT_TRY and always works as if V4L2_SUBDEV_FORMAT_ACTIVE is specified.
---
* v2
- Set initial try format with default configuration instead of current one.
drivers/media/i2c/mt9m001.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/media/i2c/mt9m001.c +27 -0
@@ -329,6 +329,12 @@ static int mt9m001_get_fmt(struct v4l2_subdev *sd,if (format->pad)return -EINVAL ; +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { + mf =v4l2_subdev_get_try_format (sd, cfg,0 ); + format->format = *mf; +return 0 ; + } + mf->width = mt9m001->rect.width; mf->height = mt9m001->rect.height; mf->code = mt9m001->fmt->code;
@@ -642,6 +648,26 @@ static const struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {#endif }; +static int mt9m001_init_cfg (struct v4l2_subdev *sd, +struct v4l2_subdev_pad_config *cfg) +{ +struct i2c_client *client =v4l2_get_subdevdata (sd); +struct mt9m001 *mt9m001 =to_mt9m001 (client); +struct v4l2_mbus_framefmt *try_fmt = +v4l2_subdev_get_try_format (sd, cfg,0 ); + + try_fmt->width =MT9M001_MAX_WIDTH ; + try_fmt->height =MT9M001_MAX_HEIGHT ; + try_fmt->code = mt9m001->fmts[0 ].code; + try_fmt->colorspace = mt9m001->fmts[0 ].colorspace; + try_fmt->field =V4L2_FIELD_NONE ; + try_fmt->ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; + try_fmt->quantization =V4L2_QUANTIZATION_DEFAULT ; + try_fmt->xfer_func =V4L2_XFER_FUNC_DEFAULT ; + +return 0 ; +} +static int mt9m001_enum_mbus_code (struct v4l2_subdev *sd,struct v4l2_subdev_pad_config *cfg,struct v4l2_subdev_mbus_code_enum *code)
@@ -678,6 +704,7 @@ static const struct v4l2_subdev_sensor_ops mt9m001_subdev_sensor_ops = { };static const struct v4l2_subdev_pad_ops mt9m001_subdev_pad_ops = { + .init_cfg = mt9m001_init_cfg, .enum_mbus_code = mt9m001_enum_mbus_code, .get_selection = mt9m001_get_selection, .set_selection = mt9m001_set_selection,
Signature · 1 line
2.7.4
PATCH v2 13/13 media: mt9m001: set all mbus format field when G_FMT and S_FMT ioctls
In reply to Akinobu MitaThis driver doesn't set all members of mbus format field when the VIDIOC_SUBDEV_{S,G}_FMT ioctls are called.
This is detected by v4l2-compliance.
---
* No changes from v1
drivers/media/i2c/mt9m001.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/media/i2c/mt9m001.c +7 -0
@@ -340,6 +340,9 @@ static int mt9m001_get_fmt(struct v4l2_subdev *sd, mf->code = mt9m001->fmt->code; mf->colorspace = mt9m001->fmt->colorspace; mf->field =V4L2_FIELD_NONE ; + mf->ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; + mf->quantization =V4L2_QUANTIZATION_DEFAULT ; + mf->xfer_func =V4L2_XFER_FUNC_DEFAULT ;return 0 ; }
@@ -400,6 +403,10 @@ static int mt9m001_set_fmt(struct v4l2_subdev *sd, } mf->colorspace = fmt->colorspace; + mf->field =V4L2_FIELD_NONE ; + mf->ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; + mf->quantization =V4L2_QUANTIZATION_DEFAULT ; + mf->xfer_func =V4L2_XFER_FUNC_DEFAULT ;if (format->which ==V4L2_SUBDEV_FORMAT_ACTIVE )return mt9m001_s_fmt (sd, fmt, mf);
Signature · 1 line
2.7.4
Hi Mita-san,
Quoted 16 lines · Akinobu Mita
This patchset converts
soc_cameramt9m001 driver to a standard subdev sensor driver.* v2
- Update binding doc suggested by Rob Herring.
- FixMODULE_LICENSE()masmatch.
- Sort headers alphabetically.
- Add new label for error handling ins_stream()callback.
- Replacepm_runtime_get_noresume()+pm_runtime_put_sync()with a singlepm_runtime_idle()call inprobe()function.
- Change the argument of mt9m001_power_o{n,ff} to struct device, and use them for runtime PM callbacks directly.
- Remove redundantKconfigdependency
- Preserve subdev flags set byv4l2_i2c_subdev_init().
- Set initial try format with default configuration instead of current one.
While this set improved the original mt9m001 driver a lot, it did not add a MAINTAINERS entry for it. The same applies to the mt9m111 driver.
Could you provide the MAINTAINERS entries for the two drivers, please?
Thanks.
Signature · 3 lines
Kind regards, Sakari Ailus
2019年2月4日(月) 18:06 Sakari Ailus <[email protected]>:
Quoted 21 lines
Hi Mita-san,
Quoted 16 lines · Akinobu Mita
This patchset converts
soc_cameramt9m001 driver to a standard subdev sensor driver.* v2
- Update binding doc suggested by Rob Herring.
- FixMODULE_LICENSE()masmatch.
- Sort headers alphabetically.
- Add new label for error handling ins_stream()callback.
- Replacepm_runtime_get_noresume()+pm_runtime_put_sync()with a singlepm_runtime_idle()call inprobe()function.
- Change the argument of mt9m001_power_o{n,ff} to struct device, and use them for runtime PM callbacks directly.
- Remove redundantKconfigdependency
- Preserve subdev flags set byv4l2_i2c_subdev_init().
- Set initial try format with default configuration instead of current one.
Quoted 4 lines
While this set improved the original mt9m001 driver a lot, it did not add a
MAINTAINERSentry for it. The same applies to the mt9m111 driver.Could you provide the
MAINTAINERSentries for the two drivers, please?
As long as I have those two sensors, I can review and test the patches. So I would like to add the following MAINTAINERS entries.
MT9M001 CAMERA SENSOR
M: Sakari Ailus <[email protected]> R: Akinobu Mita <[email protected]> L: [email protected] T: git git://linuxtv.org/media_tree.git S: Maintained F: Documentation/devicetree/bindings/media/i2c/mt9m001.txt F: drivers/media/i2c/mt9m001.c
MT9M111 CAMERA SENSOR
M: Sakari Ailus <[email protected]> R: Akinobu Mita <[email protected]> L: [email protected] T: git git://linuxtv.org/media_tree.git S: Maintained F: Documentation/devicetree/bindings/media/i2c/mt9m111.txt F: drivers/media/i2c/mt9m111.c
Quoted 22 lines · Akinobu Mita
2019年2月4日(月) 18:06 Sakari Ailus <[email protected]>:
Quoted 21 lines
Hi Mita-san,
Quoted 16 lines · Akinobu Mita
This patchset converts
soc_cameramt9m001 driver to a standard subdev sensor driver.* v2
- Update binding doc suggested by Rob Herring.
- FixMODULE_LICENSE()masmatch.
- Sort headers alphabetically.
- Add new label for error handling ins_stream()callback.
- Replacepm_runtime_get_noresume()+pm_runtime_put_sync()with a singlepm_runtime_idle()call inprobe()function.
- Change the argument of mt9m001_power_o{n,ff} to struct device, and use them for runtime PM callbacks directly.
- Remove redundantKconfigdependency
- Preserve subdev flags set byv4l2_i2c_subdev_init().
- Set initial try format with default configuration instead of current one.
Quoted 7 lines
Quoted 4 lines
While this set improved the original mt9m001 driver a lot, it did not add a
MAINTAINERSentry for it. The same applies to the mt9m111 driver.Could you provide the
MAINTAINERSentries for the two drivers, please?As long as I have those two sensors, I can review and test the patches. So I would like to add the following
MAINTAINERSentries.
Ok. Works for me.
Could you send a patch to add the entries, please?
Quoted 18 lines
MT9M001 CAMERA SENSOR
M: Sakari Ailus <[email protected]> R: Akinobu Mita <[email protected]> L: [email protected] T: git git://linuxtv.org/media_tree.git S: Maintained F: Documentation/devicetree/bindings/media/i2c/mt9m001.txt F: drivers/media/i2c/mt9m001.cMT9M111 CAMERA SENSOR
M: Sakari Ailus <[email protected]> R: Akinobu Mita <[email protected]> L: [email protected] T: git git://linuxtv.org/media_tree.git S: Maintained F: Documentation/devicetree/bindings/media/i2c/mt9m111.txt F: drivers/media/i2c/mt9m111.c
Signature · 1 line
Sakari Ailus
PATCH 1/1 MAINTAINERS: media: add entries for mt9m001 and mt9m111 drivers
As long as I have these two sensors, I can review and test the patches.
--- MAINTAINERS | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
MAINTAINERS +18 -0
@@ -10270,6 +10270,15 @@ L: [email protected] S: Maintained F: drivers/mtd/devices/docg3* +MT9M001 CAMERA SENSOR +M: Sakari Ailus <[email protected]> +R: Akinobu Mita <[email protected]> +L: [email protected] +T: git git://linuxtv.org/media_tree.git +S: Maintained +F: Documentation/devicetree/bindings/media/i2c/mt9m001.txt +F: drivers/media/i2c/mt9m001.c + MT9M032 APTINA SENSOR DRIVER M: Laurent Pinchart <[email protected]> L: [email protected]
@@ -10278,6 +10287,15 @@ S: Maintained F: drivers/media/i2c/mt9m032.c F: include/media/i2c/mt9m032.h +MT9M111 CAMERA SENSOR +M: Sakari Ailus <[email protected]> +R: Akinobu Mita <[email protected]> +L: [email protected] +T: git git://linuxtv.org/media_tree.git +S: Maintained +F: Documentation/devicetree/bindings/media/i2c/mt9m111.txt +F: drivers/media/i2c/mt9m111.c + MT9P031 APTINA CAMERA SENSOR M: Laurent Pinchart <[email protected]> L: [email protected]
Signature · 1 line
2.7.4