From 34285a5e5b5ac955b31d9e3bd0d9dbdd267140cc Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Mon, 9 Jan 2006 15:25:37 -0200
Subject: [PATCH] --- yaml --- r: 17332 b: refs/heads/master c:
 21dcd8ccd76e80118f524b1a730c35ab1c46c09e h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/video/Kconfig   | 16 +++++++++-------
 trunk/drivers/media/video/tvp5150.c | 24 ++++++++++++++++++++++++
 trunk/include/linux/i2c-id.h        |  1 +
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 29de06bd3b54..3b67706c3f23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bb13a6dc3a6f68c990264838ff0493d900c48d7
+refs/heads/master: 21dcd8ccd76e80118f524b1a730c35ab1c46c09e
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
index c89cc0a922ee..2fe260fff85d 100644
--- a/trunk/drivers/media/video/Kconfig
+++ b/trunk/drivers/media/video/Kconfig
@@ -7,6 +7,15 @@ menu "Video For Linux"
 
 comment "Video Adapters"
 
+config VIDEO_ADV_DEBUG
+	bool "Enable advanced debug functionality"
+	depends on VIDEO_DEV
+	default n
+	---help---
+	  Say Y here to enable advanced debugging functionality on some
+	  V4L devices.
+	  In doubt, say N.
+
 config VIDEO_BT848
 	tristate "BT848 Video For Linux"
 	depends on VIDEO_DEV && PCI && I2C
@@ -344,11 +353,4 @@ config VIDEO_DECODER
 	  Say Y here to compile drivers for SAA7115, SAA7127 and CX25840
 	  video decoders.
 
-config VIDEO_ADV_DEBUG
-	bool "Enable advanced debug functionality"
-	depends on VIDEO_DEV && VIDEO_DECODER && EXPERIMENTAL
-	---help---
-	  Say Y here to enable advanced debugging functionality in the
-	  SAA7115, SAA7127 and CX25840 video decoders.
-
 endmenu
diff --git a/trunk/drivers/media/video/tvp5150.c b/trunk/drivers/media/video/tvp5150.c
index 9ed839d688eb..07ad675cd58e 100644
--- a/trunk/drivers/media/video/tvp5150.c
+++ b/trunk/drivers/media/video/tvp5150.c
@@ -850,6 +850,30 @@ static int tvp5150_command(struct i2c_client *c,
 		*(v4l2_std_id *)arg = decoder->norm;
 		break;
 
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+	case VIDIOC_INT_G_REGISTER:
+	{
+		struct v4l2_register *reg = arg;
+
+		if (reg->i2c_id != I2C_DRIVERID_TVP5150)
+			return -EINVAL;
+		reg->val = tvp5150_read(c, reg->reg & 0xff);
+		break;
+	}
+
+	case VIDIOC_INT_S_REGISTER:
+	{
+		struct v4l2_register *reg = arg;
+
+		if (reg->i2c_id != I2C_DRIVERID_TVP5150)
+			return -EINVAL;
+		if (!capable(CAP_SYS_ADMIN))
+			return -EPERM;
+		tvp5150_write(c, reg->reg & 0xff, reg->val & 0xff);
+		break;
+	}
+#endif
+
 	case DECODER_DUMP:
 		dump_reg(c);
 		break;
diff --git a/trunk/include/linux/i2c-id.h b/trunk/include/linux/i2c-id.h
index fb46f8d56999..6ff2d365895f 100644
--- a/trunk/include/linux/i2c-id.h
+++ b/trunk/include/linux/i2c-id.h
@@ -103,6 +103,7 @@
 #define I2C_DRIVERID_SAA711X	73	/* saa711x video encoders	*/
 #define I2C_DRIVERID_AKITAIOEXP	74	/* IO Expander on Sharp SL-C1000 */
 #define I2C_DRIVERID_INFRARED	75	/* I2C InfraRed on Video boards */
+#define I2C_DRIVERID_TVP5150	76	/* TVP5150 video decoder        */
 
 #define I2C_DRIVERID_I2CDEV	900
 #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */