Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: admin-guide: make clear about PCI subsystem IDs

On several parts of the document, it mentions "PCI ID", when
it is actually referring to the subsystem's part of the PCI
ID.

Change the language to let it be clear.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

+25 -18
+1 -1
Documentation/admin-guide/media/bt8xx.rst
··· 70 70 71 71 Exceptions are: 72 72 73 - - Old TV cards without EEPROMs, sharing a common PCI ID; 73 + - Old TV cards without EEPROMs, sharing a common PCI subsystem ID; 74 74 - Old TwinHan DST cards or clones with or without CA slot and not 75 75 containing an Eeprom. 76 76
+1 -1
Documentation/admin-guide/media/bttv-cardlist.rst
··· 12 12 13 13 * - Card number 14 14 - Card name 15 - - PCI IDs 15 + - PCI subsystem IDs 16 16 17 17 * - 0 18 18 - *** UNKNOWN/GENERIC ***
+18 -11
Documentation/admin-guide/media/cardlist.rst
··· 183 183 - Vendor ID and device ID; 184 184 - Subsystem ID and Subsystem device ID; 185 185 186 - The ``lspci -nn`` command allows identifying the vendor/device PCI IDs:: 186 + The ``lspci -nn`` command allows identifying the vendor/device PCI IDs: 187 + 188 + .. code-block:: none 189 + :emphasize-lines: 4 187 190 188 191 $ lspci -nn 189 192 ... 193 + 00:0a.0 Multimedia controller [0480]: Philips Semiconductors SAA7131/SAA7133/SAA7135 Video Broadcast Decoder [1131:7133] (rev d1) 190 194 00:0b.0 Multimedia controller [0480]: Brooktree Corporation Bt878 Audio Capture [109e:0878] (rev 11) 191 195 01:00.0 Multimedia video controller [0400]: Conexant Systems, Inc. CX23887/8 PCIe Broadcast Audio and Video Decoder with 3D Comb [14f1:8880] (rev 0f) 192 - 01:01.0 Multimedia controller [0480]: Philips Semiconductors SAA7131/SAA7133/SAA7135 Video Broadcast Decoder [1131:7133] (rev d1) 193 196 02:01.0 Multimedia video controller [0400]: Internext Compression Inc iTVC15 (CX23415) Video Decoder [4444:0803] (rev 01) 194 197 02:02.0 Multimedia video controller [0400]: Conexant Systems, Inc. CX23418 Single-Chip MPEG-2 Encoder with Integrated Analog Video/Broadcast Audio Decoder [14f1:5b7a] 195 198 02:03.0 Multimedia video controller [0400]: Brooktree Corporation Bt878 Video Capture [109e:036e] (rev 11) ··· 205 202 206 203 $ lspci -vn 207 204 ... 208 - 01:01.0 0480: 1131:7133 (rev d1) 209 - Subsystem: 1461:f01d 210 - Flags: bus master, medium devsel, latency 32, IRQ 209 211 - Memory at e2002000 (32-bit, non-prefetchable) [size=2K] 212 - Capabilities: [40] Power Management version 2 205 + 00:0a.0 0480: 1131:7133 (rev d1) 206 + Subsystem: 1461:f01d 207 + Flags: bus master, medium devsel, latency 32, IRQ 209 208 + Memory at e2002000 (32-bit, non-prefetchable) [size=2K] 209 + Capabilities: [40] Power Management version 2 213 210 ... 214 211 215 - Unfortunately, sometimes the same PCI ID is used by different products. 216 - So, several media drivers allow passing a ``card=`` parameter, in order 217 - to setup a card number that would match the correct settings for an 218 - specific board. 212 + At the above example, the first card uses the ``saa7134`` driver, and 213 + has a vendor/device PCI ID equal to ``1131:7133`` and a PCI subsystem 214 + ID equal to ``1461:f01d``. 215 + 216 + Unfortunately, sometimes the same PCI subsystem ID is used by different 217 + products. So, several media drivers allow passing a ``card=`` parameter, 218 + in order to setup a card number that would match the correct settings for 219 + an specific board. 219 220 220 221 The current supported PCI/PCIe cards (not including staging drivers) are 221 222 listed below\ [#]_.
+1 -1
Documentation/admin-guide/media/cx23885-cardlist.rst
··· 12 12 13 13 * - Card number 14 14 - Card name 15 - - PCI IDs 15 + - PCI subsystem IDs 16 16 17 17 * - 0 18 18 - UNKNOWN/GENERIC
+1 -1
Documentation/admin-guide/media/cx88-cardlist.rst
··· 12 12 13 13 * - Card number 14 14 - Card name 15 - - PCI IDs 15 + - PCI subsystem IDs 16 16 17 17 * - 0 18 18 - UNKNOWN/GENERIC
+1 -1
Documentation/admin-guide/media/ivtv-cardlist.rst
··· 12 12 13 13 * - Card number 14 14 - Card name 15 - - PCI IDs 15 + - PCI subsystem IDs 16 16 17 17 * - 0 18 18 - Hauppauge WinTV PVR-250
+1 -1
Documentation/admin-guide/media/saa7134-cardlist.rst
··· 12 12 13 13 * - Card number 14 14 - Card name 15 - - PCI IDs 15 + - PCI subsystem IDs 16 16 17 17 * - 0 18 18 - UNKNOWN/GENERIC
+1 -1
Documentation/admin-guide/media/saa7164-cardlist.rst
··· 12 12 13 13 * - Card number 14 14 - Card name 15 - - PCI IDs 15 + - PCI subsystem IDs 16 16 17 17 * - 0 18 18 - Unknown