4 files changed, 76 insertions, 37 deletions

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index a08ef2c16300..a25c2afa67e1 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1398,6 +1398,14 @@ struct v4l2_register {
         __u64 val;
 };
 
+/* VIDIOC_G_CHIP_IDENT */
+struct v4l2_chip_ident {
+        __u32 match_type;  /* Match type */
+        __u32 match_chip;  /* Match this chip, meaning determined by match_type */
+        __u32 ident;       /* chip identifier as specified in <media/v4l2-chip-ident.h> */
+        __u32 revision;    /* chip revision, chip specific */
+};
+
 /*
  *      I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
  *
@@ -1471,6 +1479,8 @@ struct v4l2_register {
 /* Experimental, only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */
 #define VIDIOC_DBG_S_REGISTER   _IOW  ('V', 79, struct v4l2_register)
 #define VIDIOC_DBG_G_REGISTER   _IOWR ('V', 80, struct v4l2_register)
+
+#define VIDIOC_G_CHIP_IDENT     _IOWR ('V', 81, struct v4l2_chip_ident)
 #endif
 
 #ifdef __OLD_VIDIOC_
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
new file mode 100644
index 000000000000..f6686ce133d8
--- /dev/null
+++ b/include/media/v4l2-chip-ident.h
@@ -0,0 +1,62 @@
+/*
+    v4l2 chip identifiers header
+
+    This header provides a list of chip identifiers that can be returned
+    through the VIDIOC_G_CHIP_IDENT ioctl.
+
+    Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef V4L2_CHIP_IDENT_H_
+#define V4L2_CHIP_IDENT_H_
+
+/* VIDIOC_G_CHIP_IDENT: identifies the actual chip installed on the board */
+enum {
+        /* general idents: reserved range 0-49 */
+        V4L2_IDENT_NONE      = 0,       /* No chip matched */
+        V4L2_IDENT_AMBIGUOUS = 1,       /* Match too general, multiple chips matched */
+        V4L2_IDENT_UNKNOWN   = 2,       /* Chip found, but cannot identify */
+
+        /* module saa7110: just ident= 100 */
+        V4L2_IDENT_SAA7110 = 100,
+
+        /* module saa7111: just ident= 101 */
+        V4L2_IDENT_SAA7111 = 101,
+
+        /* module saa7115: reserved range 102-149 */
+        V4L2_IDENT_SAA7113 = 103,
+        V4L2_IDENT_SAA7114 = 104,
+        V4L2_IDENT_SAA7115 = 105,
+        V4L2_IDENT_SAA7118 = 108,
+
+        /* module saa7127: reserved range 150-199 */
+        V4L2_IDENT_SAA7127 = 157,
+        V4L2_IDENT_SAA7129 = 159,
+
+        /* module cx25840: reserved range 200-249 */
+        V4L2_IDENT_CX25836 = 236,
+        V4L2_IDENT_CX25837 = 237,
+        V4L2_IDENT_CX25840 = 240,
+        V4L2_IDENT_CX25841 = 241,
+        V4L2_IDENT_CX25842 = 242,
+        V4L2_IDENT_CX25843 = 243,
+
+        /* OmniVision sensors - range 250-299 */
+        V4L2_IDENT_OV7670 = 250,
+};
+
+#endif
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index abb9ce9b21b8..181a40c46a52 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -98,6 +98,8 @@ u32 v4l2_ctrl_next(const u32 * const *ctrl_classes, u32 id);
 
 struct i2c_client; /* forward reference */
 int v4l2_chip_match_i2c_client(struct i2c_client *c, u32 id_type, u32 chip_id);
+int v4l2_chip_ident_i2c_client(struct i2c_client *c, struct v4l2_chip_ident *chip,
+                u32 ident, u32 revision);
 int v4l2_chip_match_host(u32 id_type, u32 chip_id);
 
 /* ------------------------------------------------------------------------- */
@@ -114,39 +116,6 @@ struct v4l2_decode_vbi_line {
         u32 type;               /* VBI service type (V4L2_SLICED_*). 0 if no service found */
 };
 
-/* VIDIOC_INT_G_CHIP_IDENT: identifies the actual chip installed on the board */
-enum v4l2_chip_ident {
-        /* general idents: reserved range 0-49 */
-        V4L2_IDENT_UNKNOWN = 0,
-
-        /* module saa7110: just ident= 100 */
-        V4L2_IDENT_SAA7110 = 100,
-
-        /* module saa7111: just ident= 101 */
-        V4L2_IDENT_SAA7111 = 101,
-
-        /* module saa7115: reserved range 102-149 */
-        V4L2_IDENT_SAA7113 = 103,
-        V4L2_IDENT_SAA7114 = 104,
-        V4L2_IDENT_SAA7115 = 105,
-        V4L2_IDENT_SAA7118 = 108,
-
-        /* module saa7127: reserved range 150-199 */
-        V4L2_IDENT_SAA7127 = 157,
-        V4L2_IDENT_SAA7129 = 159,
-
-        /* module cx25840: reserved range 200-249 */
-        V4L2_IDENT_CX25836 = 236,
-        V4L2_IDENT_CX25837 = 237,
-        V4L2_IDENT_CX25840 = 240,
-        V4L2_IDENT_CX25841 = 241,
-        V4L2_IDENT_CX25842 = 242,
-        V4L2_IDENT_CX25843 = 243,
-
-        /* OmniVision sensors - range 250-299 */
-        V4L2_IDENT_OV7670 = 250,
-};
-
 /* audio ioctls */
 
 /* v4l device was opened in Radio mode, to be replaced by VIDIOC_INT_S_TUNER_MODE */
@@ -208,10 +177,6 @@ enum v4l2_chip_ident {
    whether CC data from the first or second field should be obtained). */
 #define VIDIOC_INT_G_VBI_DATA           _IOWR('d', 106, struct v4l2_sliced_vbi_data)
 
-/* Returns the chip identifier or V4L2_IDENT_UNKNOWN if no identification can
-   be made. */
-#define VIDIOC_INT_G_CHIP_IDENT         _IOR ('d', 107, enum v4l2_chip_ident)
-
 /* Sets I2S speed in bps. This is used to provide a standard way to select I2S
    clock used by driving digital audio streams at some board designs.
    Usual values for the frequency are 1024000 and 2048000.
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 2693f3ae6ffb..d62847f846c2 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -317,6 +317,8 @@ struct video_device
         int (*vidioc_s_register)       (struct file *file, void *fh,
                                         struct v4l2_register *reg);
 #endif
+        int (*vidioc_g_chip_ident)     (struct file *file, void *fh,
+                                        struct v4l2_chip_ident *chip);
 
 
 #ifdef OBSOLETE_OWNER /* to be removed soon */