diff options
| author | Hu Kejun <william.hu@rock-chips.com> | 2018-11-27 15:03:24 +0800 |
|---|---|---|
| committer | Tao Huang <huangtao@rock-chips.com> | 2018-11-28 11:56:45 +0800 |
| commit | 5b63dff013e0ae049922755e56f06bffd475bda2 (patch) | |
| tree | 06aedab54f57eaa887ded77b777192ccc13244d6 /drivers/media/platform/rockchip | |
| parent | 4542ef41d3edf008ff5b64a10997d9a573b0a387 (diff) | |
media: rockchip: isp1: add version of isp in querycap
Change-Id: Ie6953c8cf48ff8629d5bcb166d88fd6946e5405f
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Diffstat (limited to 'drivers/media/platform/rockchip')
| -rw-r--r-- | drivers/media/platform/rockchip/isp1/capture.c | 3 | ||||
| -rw-r--r-- | drivers/media/platform/rockchip/isp1/isp_params.c | 4 | ||||
| -rw-r--r-- | drivers/media/platform/rockchip/isp1/isp_stats.c | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/platform/rockchip/isp1/capture.c b/drivers/media/platform/rockchip/isp1/capture.c index b998c17e637a..6c71dc5e466c 100644 --- a/drivers/media/platform/rockchip/isp1/capture.c +++ b/drivers/media/platform/rockchip/isp1/capture.c @@ -1709,8 +1709,9 @@ static int rkisp1_querycap(struct file *file, void *priv, struct device *dev = stream->ispdev->dev; struct video_device *vdev = video_devdata(file); - strlcpy(cap->driver, dev->driver->name, sizeof(cap->driver)); strlcpy(cap->card, vdev->name, sizeof(cap->card)); + snprintf(cap->driver, sizeof(cap->driver), + "%s_v%02d", dev->driver->name, stream->ispdev->isp_ver); snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s", dev_name(dev)); diff --git a/drivers/media/platform/rockchip/isp1/isp_params.c b/drivers/media/platform/rockchip/isp1/isp_params.c index 0bff3147cf81..42f55ed3a027 100644 --- a/drivers/media/platform/rockchip/isp1/isp_params.c +++ b/drivers/media/platform/rockchip/isp1/isp_params.c @@ -1800,8 +1800,10 @@ static int rkisp1_params_querycap(struct file *file, void *priv, struct v4l2_capability *cap) { struct video_device *vdev = video_devdata(file); + struct rkisp1_isp_params_vdev *params_vdev = video_get_drvdata(vdev); - strcpy(cap->driver, DRIVER_NAME); + snprintf(cap->driver, sizeof(cap->driver), + "%s_v%02d", DRIVER_NAME, params_vdev->dev->isp_ver); strlcpy(cap->card, vdev->name, sizeof(cap->card)); strlcpy(cap->bus_info, "platform: " DRIVER_NAME, sizeof(cap->bus_info)); diff --git a/drivers/media/platform/rockchip/isp1/isp_stats.c b/drivers/media/platform/rockchip/isp1/isp_stats.c index cfacbc58fee4..aedee172213f 100644 --- a/drivers/media/platform/rockchip/isp1/isp_stats.c +++ b/drivers/media/platform/rockchip/isp1/isp_stats.c @@ -76,8 +76,11 @@ static int rkisp1_stats_querycap(struct file *file, void *priv, struct v4l2_capability *cap) { struct video_device *vdev = video_devdata(file); + struct rkisp1_isp_stats_vdev *stats_vdev = video_get_drvdata(vdev); strcpy(cap->driver, DRIVER_NAME); + snprintf(cap->driver, sizeof(cap->driver), + "%s_v%02d", DRIVER_NAME, stats_vdev->dev->isp_ver); strlcpy(cap->card, vdev->name, sizeof(cap->card)); strlcpy(cap->bus_info, "platform: " DRIVER_NAME, sizeof(cap->bus_info)); |