aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-22 18:34:18 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:39:33 -0500
commitbc97430510960846b6e8f2d62c503653031991e1 (patch)
treeb4a08f2412fe75f61057d17c293c4f59f8868e14 /drivers/media/video
parentb3ee7e21f25cdd50cccc906dc09e547f36166372 (diff)
V4L/DVB (9969): tvp5150: add support for VIDIOC_G_CHIP_IDENT ioctl
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/tvp5150.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index e8a4637350ec..a388a9f0cb18 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -12,6 +12,7 @@
12#include <media/v4l2-device.h> 12#include <media/v4l2-device.h>
13#include <media/tvp5150.h> 13#include <media/tvp5150.h>
14#include <media/v4l2-i2c-drv-legacy.h> 14#include <media/v4l2-i2c-drv-legacy.h>
15#include <media/v4l2-chip-ident.h>
15 16
16#include "tvp5150_reg.h" 17#include "tvp5150_reg.h"
17 18
@@ -961,6 +962,20 @@ static int tvp5150_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
961} 962}
962 963
963 964
965static int tvp5150_g_chip_ident(struct v4l2_subdev *sd,
966 struct v4l2_chip_ident *chip)
967{
968 int rev;
969 struct i2c_client *client = v4l2_get_subdevdata(sd);
970
971 rev = tvp5150_read(sd, TVP5150_ROM_MAJOR_VER) << 8 |
972 tvp5150_read(sd, TVP5150_ROM_MINOR_VER);
973
974 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_TVP5150,
975 rev);
976}
977
978
964#ifdef CONFIG_VIDEO_ADV_DEBUG 979#ifdef CONFIG_VIDEO_ADV_DEBUG
965static int tvp5150_g_register(struct v4l2_subdev *sd, struct v4l2_register *reg) 980static int tvp5150_g_register(struct v4l2_subdev *sd, struct v4l2_register *reg)
966{ 981{
@@ -1026,6 +1041,7 @@ static const struct v4l2_subdev_core_ops tvp5150_core_ops = {
1026 .s_ctrl = tvp5150_s_ctrl, 1041 .s_ctrl = tvp5150_s_ctrl,
1027 .queryctrl = tvp5150_queryctrl, 1042 .queryctrl = tvp5150_queryctrl,
1028 .reset = tvp5150_reset, 1043 .reset = tvp5150_reset,
1044 .g_chip_ident = tvp5150_g_chip_ident,
1029#ifdef CONFIG_VIDEO_ADV_DEBUG 1045#ifdef CONFIG_VIDEO_ADV_DEBUG
1030 .g_register = tvp5150_g_register, 1046 .g_register = tvp5150_g_register,
1031 .s_register = tvp5150_s_register, 1047 .s_register = tvp5150_s_register,