Hi Mita-san,
On Sun, Dec 23, 2018 at 02:12:51AM +0900, Akinobu Mita wrote:
> Register a sub-device to the asynchronous subdevice framework, and also
> create subdevice device node.
>
> Cc: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
> Cc: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxxx>
> Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
> ---
> drivers/media/i2c/Kconfig | 2 +-
> drivers/media/i2c/mt9m001.c | 9 ++++++++-
> 2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
> index 5e30ad3..a6d8416 100644
> --- a/drivers/media/i2c/Kconfig
> +++ b/drivers/media/i2c/Kconfig
> @@ -845,7 +845,7 @@ config VIDEO_VS6624
>
> config VIDEO_MT9M001
> tristate "mt9m001 support"
> - depends on I2C && VIDEO_V4L2
> + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
VIDEO_V4L2_SUBDEV_API depends on MEDIA_CONTROLLER, so MEDIA_CONTROLLER
below can be removed.
> depends on MEDIA_CAMERA_SUPPORT
> depends on MEDIA_CONTROLLER
> help
> diff --git a/drivers/media/i2c/mt9m001.c b/drivers/media/i2c/mt9m001.c
> index e31fb7d..b4deec3 100644
> --- a/drivers/media/i2c/mt9m001.c
> +++ b/drivers/media/i2c/mt9m001.c
> @@ -716,6 +716,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;
|=
Otherwise you lose flags set by v4l2_i2c_subdev_init().
> v4l2_ctrl_handler_init(&mt9m001->hdl, 4);
> v4l2_ctrl_new_std(&mt9m001->hdl, &mt9m001_ctrl_ops,
> V4L2_CID_VFLIP, 0, 1, 1, 0);
> @@ -765,10 +766,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_put_sync(&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);
> @@ -785,9 +792,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);
--
Kind regards,
Sakari Ailus
sakari.ailus@xxxxxxxxxxxxxxx
