diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index f43542ae2981c538c20fe07fdbbf17b06d259ca6..0c7195e3e0937b41c71756eee2cbfe51963cd7f9 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2254,7 +2254,7 @@ video encoding.
The VIDIOC_G_CHIP_IDENT ioctl was renamed
-to VIDIOC_G_CHIP_IDENT_OLD and &VIDIOC-DBG-G-CHIP-IDENT;
+to VIDIOC_G_CHIP_IDENT_OLD and VIDIOC_DBG_G_CHIP_IDENT
was introduced in its place. The old struct v4l2_chip_ident
was renamed to v4l2_chip_ident_old.
@@ -2513,6 +2513,16 @@ that used it. It was originally scheduled for removal in 2.6.35.
+
+ V4L2 in Linux 3.11
+
+
+ Remove obsolete VIDIOC_DBG_G_CHIP_IDENT ioctl.
+
+
+
+
+
Relation of V4L2 to other Linux multimedia APIs
@@ -2596,7 +2606,7 @@ and may change in the future.
ioctls.
- &VIDIOC-DBG-G-CHIP-IDENT; ioctl.
+ &VIDIOC-DBG-G-CHIP-INFO; ioctl.&VIDIOC-ENUM-DV-TIMINGS;, &VIDIOC-QUERY-DV-TIMINGS; and
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml
index bfe823dd0f31cf7c6adecb79b5b8a888f434b888..8469fe13945c524afe06a7c759d44d14e1911495 100644
--- a/Documentation/DocBook/media/v4l/v4l2.xml
+++ b/Documentation/DocBook/media/v4l/v4l2.xml
@@ -140,6 +140,14 @@ structs, ioctls) must be noted in more detail in the history chapter
(compat.xml), along with the possible impact on existing drivers and
applications. -->
+
+ 3.11
+ 2013-05-26
+ hv
+ Remove obsolete VIDIOC_DBG_G_CHIP_IDENT ioctl.
+
+
+
3.102013-03-25
@@ -493,7 +501,7 @@ and discussions on the V4L mailing list.
Video for Linux Two API Specification
- Revision 3.10
+ Revision 3.11
&sub-common;
@@ -547,7 +555,6 @@ and discussions on the V4L mailing list.
&sub-create-bufs;
&sub-cropcap;
- &sub-dbg-g-chip-ident;
&sub-dbg-g-chip-info;
&sub-dbg-g-register;
&sub-decoder-cmd;
diff --git a/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml b/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml
deleted file mode 100644
index 921e18550d269861f9bc16c2680ba678defb2b87..0000000000000000000000000000000000000000
--- a/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-
-
- ioctl VIDIOC_DBG_G_CHIP_IDENT
- &manvol;
-
-
-
- VIDIOC_DBG_G_CHIP_IDENT
- Identify the chips on a TV card
-
-
-
-
-
- int ioctl
- int fd
- int request
- struct v4l2_dbg_chip_ident
-*argp
-
-
-
-
-
- Arguments
-
-
-
- fd
-
- &fd;
-
-
-
- request
-
- VIDIOC_DBG_G_CHIP_IDENT
-
-
-
- argp
-
-
-
-
-
-
-
-
- Description
-
-
- Experimental
-
- This is an experimental interface and may change in
-the future.
-
-
- For driver debugging purposes this ioctl allows test
-applications to query the driver about the chips present on the TV
-card. Regular applications must not use it. When you found a chip
-specific bug, please contact the linux-media mailing list (&v4l-ml;)
-so it can be fixed.
-
- To query the driver applications must initialize the
-match.type and
-match.addr or match.name
-fields of a &v4l2-dbg-chip-ident;
-and call VIDIOC_DBG_G_CHIP_IDENT with a pointer to
-this structure. On success the driver stores information about the
-selected chip in the ident and
-revision fields. On failure the structure
-remains unchanged.
-
- When match.type is
-V4L2_CHIP_MATCH_HOST,
-match.addr selects the nth non-&i2c; chip
-on the TV card. You can enumerate all chips by starting at zero and
-incrementing match.addr by one until
-VIDIOC_DBG_G_CHIP_IDENT fails with an &EINVAL;.
-The number zero always selects the host chip, ⪚ the chip connected
-to the PCI or USB bus.
-
- When match.type is
-V4L2_CHIP_MATCH_I2C_DRIVER,
-match.name contains the I2C driver name.
-For instance
-"saa7127" will match any chip
-supported by the saa7127 driver, regardless of its &i2c; bus address.
-When multiple chips supported by the same driver are present, the
-ioctl will return V4L2_IDENT_AMBIGUOUS in the
-ident field.
-
- When match.type is
-V4L2_CHIP_MATCH_I2C_ADDR,
-match.addr selects a chip by its 7 bit
-&i2c; bus address.
-
- When match.type is
-V4L2_CHIP_MATCH_AC97,
-match.addr selects the nth AC97 chip
-on the TV card. You can enumerate all chips by starting at zero and
-incrementing match.addr by one until
-VIDIOC_DBG_G_CHIP_IDENT fails with an &EINVAL;.
-
- On success, the ident field will
-contain a chip ID from the Linux
-media/v4l2-chip-ident.h header file, and the
-revision field will contain a driver
-specific value, or zero if no particular revision is associated with
-this chip.
-
- When the driver could not identify the selected chip,
-ident will contain
-V4L2_IDENT_UNKNOWN. When no chip matched
-the ioctl will succeed but the
-ident field will contain
-V4L2_IDENT_NONE. If multiple chips matched,
-ident will contain
-V4L2_IDENT_AMBIGUOUS. In all these cases the
-revision field remains unchanged.
-
- This ioctl is optional, not all drivers may support it. It
-was introduced in Linux 2.6.21, but the API was changed to the
-one described here in 2.6.29.
-
- We recommended the v4l2-dbg
-utility over calling this ioctl directly. It is available from the
-LinuxTV v4l-dvb repository; see http://linuxtv.org/repo/ for
-access instructions.
-
-
-
- struct <structname>v4l2_dbg_match</structname>
-
- &cs-ustr;
-
-
- __u32
- type
- See for a list of
-possible types.
-
-
- union
- (anonymous)
-
-
-
- __u32
- addr
- Match a chip by this number, interpreted according
-to the type field.
-
-
-
- char
- name[32]
- Match a chip by this name, interpreted according
-to the type field.
-
-
-
-
-
-
- struct <structname>v4l2_dbg_chip_ident</structname>
-
- &cs-str;
-
-
- struct v4l2_dbg_match
- match
- How to match the chip, see .
-
-
- __u32
- ident
- A chip identifier as defined in the Linux
-media/v4l2-chip-ident.h header file, or one of
-the values from .
-
-
- __u32
- revision
- A chip revision, chip and driver specific.
-
-
-
-
-
-
-
- Chip Match Types
-
- &cs-def;
-
-
- V4L2_CHIP_MATCH_BRIDGE
- 0
- Match the nth chip on the card, zero for the
- bridge chip. Does not match sub-devices.
-
-
- V4L2_CHIP_MATCH_I2C_DRIVER
- 1
- Match an &i2c; chip by its driver name.
-
-
- V4L2_CHIP_MATCH_I2C_ADDR
- 2
- Match a chip by its 7 bit &i2c; bus address.
-
-
- V4L2_CHIP_MATCH_AC97
- 3
- Match the nth anciliary AC97 chip.
-
-
- V4L2_CHIP_MATCH_SUBDEV
- 4
- Match the nth sub-device. Can't be used with this ioctl.
-
-
-
-
-
-
-
- Chip Identifiers
-
- &cs-def;
-
-
- V4L2_IDENT_NONE
- 0
- No chip matched.
-
-
- V4L2_IDENT_AMBIGUOUS
- 1
- Multiple chips matched.
-
-
- V4L2_IDENT_UNKNOWN
- 2
- A chip is present at this address, but the driver
-could not identify it.
-
-
-
-
-
-
-
- &return-value;
-
-
-
- EINVAL
-
- The match_type is invalid.
-
-
-
-
-
diff --git a/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-info.xml b/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-info.xml
index 80e8021369f6d8f91428a716545a881395518236..4c4603c135fe2b6843e82b542fd4e94a11cfbdfb 100644
--- a/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-info.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-info.xml
@@ -131,7 +131,7 @@ to the type field.
charname[32]Match a chip by this name, interpreted according
-to the type field.
+to the type field. Currently unused.
@@ -181,21 +181,6 @@ is set, then the driver supports reading registers from the device. If
Match the nth chip on the card, zero for the
bridge chip. Does not match sub-devices.
-
- V4L2_CHIP_MATCH_I2C_DRIVER
- 1
- Match an &i2c; chip by its driver name. Can't be used with this ioctl.
-
-
- V4L2_CHIP_MATCH_I2C_ADDR
- 2
- Match a chip by its 7 bit &i2c; bus address. Can't be used with this ioctl.
-
-
- V4L2_CHIP_MATCH_AC97
- 3
- Match the nth anciliary AC97 chip. Can't be used with this ioctl.
- V4L2_CHIP_MATCH_SUBDEV4
diff --git a/Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml b/Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml
index e23285fad3bfd3c3172e03bb549ed744fe8df7aa..32c4bde9d4b8ebad15d184366e5baa413f16e793 100644
--- a/Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml
@@ -101,27 +101,6 @@ on the TV card. The number zero always selects the host chip, ⪚ the
chip connected to the PCI or USB bus. You can find out which chips are
present with the &VIDIOC-DBG-G-CHIP-INFO; ioctl.
- When match.type is
-V4L2_CHIP_MATCH_I2C_DRIVER,
-match.name contains the I2C driver name.
-For instance
-"saa7127" will match any chip
-supported by the saa7127 driver, regardless of its &i2c; bus address.
-When multiple chips supported by the same driver are present, the
-effect of these ioctls is undefined. Again with the
-&VIDIOC-DBG-G-CHIP-INFO; ioctl you can find out which &i2c; chips are
-present.
-
- When match.type is
-V4L2_CHIP_MATCH_I2C_ADDR,
-match.addr selects a chip by its 7 bit &i2c;
-bus address.
-
- When match.type is
-V4L2_CHIP_MATCH_AC97,
-match.addr selects the nth AC97 chip
-on the TV card.
-
When match.type is
V4L2_CHIP_MATCH_SUBDEV,
match.addr selects the nth sub-device.
@@ -160,7 +139,7 @@ access instructions.
__u32type
- See for a list of
+ See for a list of
possible types.
@@ -179,7 +158,7 @@ to the type field.
charname[32]Match a chip by this name, interpreted according
-to the type field.
+to the type field. Currently unused.
@@ -231,21 +210,6 @@ register.
Match the nth chip on the card, zero for the
bridge chip. Does not match sub-devices.
-
- V4L2_CHIP_MATCH_I2C_DRIVER
- 1
- Match an &i2c; chip by its driver name.
-
-
- V4L2_CHIP_MATCH_I2C_ADDR
- 2
- Match a chip by its 7 bit &i2c; bus address.
-
-
- V4L2_CHIP_MATCH_AC97
- 3
- Match the nth anciliary AC97 chip.
- V4L2_CHIP_MATCH_SUBDEV4