media: mt9m001: add media controller support

Create a source pad and set the media controller type to the sensor.

Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index ac35284..2a9e87a 100644 (file)
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -870,6 +870,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.

diff --git a/drivers/media/i2c/mt9m001.c b/drivers/media/i2c/mt9m001.c
index 5a3b612..0a648e2 100644 (file)
--- a/drivers/media/i2c/mt9m001.c
+++ b/drivers/media/i2c/mt9m001.c
@@ -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);