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>

diff --git a/Documentation/admin-guide/media/bt8xx.rst b/Documentation/admin-guide/media/bt8xx.rst
index d6cf81d83d61a125752543a0b949e0cb390285d9..1382ada1e38eb9ecb43c681a820679ada6bb3912 100644 (file)
--- a/Documentation/admin-guide/media/bt8xx.rst
+++ b/Documentation/admin-guide/media/bt8xx.rst
@@ -70,7 +70,7 @@ frontend and backend modules will be loaded automatically.
 
 Exceptions are:
 
-- Old TV cards without EEPROMs, sharing a common PCI ID;
+- Old TV cards without EEPROMs, sharing a common PCI subsystem ID;
 - Old TwinHan DST cards or clones with or without CA slot and not
   containing an Eeprom.
 

diff --git a/Documentation/admin-guide/media/bttv-cardlist.rst b/Documentation/admin-guide/media/bttv-cardlist.rst
index f5806856b5a197183d7beb8f4aa724c8d9970b1e..8671d4f7ba7b5f18a609715d14cb7b2f30b57340 100644 (file)
--- a/Documentation/admin-guide/media/bttv-cardlist.rst
+++ b/Documentation/admin-guide/media/bttv-cardlist.rst
@@ -12,7 +12,7 @@ BTTV cards list
 
    * - Card number
      - Card name
-     - PCI IDs
+     - PCI subsystem IDs
 
    * - 0
      -  *** UNKNOWN/GENERIC ***

diff --git a/Documentation/admin-guide/media/cardlist.rst b/Documentation/admin-guide/media/cardlist.rst
index 8cdb9d4ca7d6fcebbb5ec5d1013af7aa6e2820af..678765f6e9f10bfb2c6d3cb2f4389cf5ae8de2df 100644 (file)
--- a/Documentation/admin-guide/media/cardlist.rst
+++ b/Documentation/admin-guide/media/cardlist.rst
@@ -183,13 +183,16 @@ is actually composed by two parts:
        - Vendor ID and device ID;
        - Subsystem ID and Subsystem device ID;
 
-The ``lspci -nn`` command allows identifying the vendor/device PCI IDs::
+The ``lspci -nn`` command allows identifying the vendor/device PCI IDs:
+
+.. code-block:: none
+   :emphasize-lines: 4
 
     $ lspci -nn
     ...
+    00:0a.0 Multimedia controller [0480]: Philips Semiconductors SAA7131/SAA7133/SAA7135 Video Broadcast Decoder [1131:7133] (rev d1)
     00:0b.0 Multimedia controller [0480]: Brooktree Corporation Bt878 Audio Capture [109e:0878] (rev 11)
     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)
-    01:01.0 Multimedia controller [0480]: Philips Semiconductors SAA7131/SAA7133/SAA7135 Video Broadcast Decoder [1131:7133] (rev d1)
     02:01.0 Multimedia video controller [0400]: Internext Compression Inc iTVC15 (CX23415) Video Decoder [4444:0803] (rev 01)
     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]
     02:03.0 Multimedia video controller [0400]: Brooktree Corporation Bt878 Video Capture [109e:036e] (rev 11)
@@ -202,17 +205,21 @@ The subsystem IDs can be obtained using ``lspci -vn``
 
     $ lspci -vn
     ...
-       01:01.0 0480: 1131:7133 (rev d1)
-               Subsystem: 1461:f01d
-               Flags: bus master, medium devsel, latency 32, IRQ 209
-               Memory at e2002000 (32-bit, non-prefetchable) [size=2K]
-               Capabilities: [40] Power Management version 2
+       00:0a.0 0480: 1131:7133 (rev d1)
+               Subsystem: 1461:f01d
+               Flags: bus master, medium devsel, latency 32, IRQ 209
+               Memory at e2002000 (32-bit, non-prefetchable) [size=2K]
+               Capabilities: [40] Power Management version 2
     ...
 
-Unfortunately, sometimes the same PCI ID is used by different products.
-So, several media drivers allow passing a ``card=`` parameter, in order
-to setup a card number that would match the correct settings for an
-specific board.
+At the above example, the first card uses the ``saa7134`` driver, and
+has a vendor/device PCI ID equal to ``1131:7133`` and a PCI subsystem
+ID equal to ``1461:f01d``.
+
+Unfortunately, sometimes the same PCI subsystem ID is used by different
+products. So, several media drivers allow passing a ``card=`` parameter,
+in order to setup a card number that would match the correct settings for
+an specific board.
 
 The current supported PCI/PCIe cards (not including staging drivers) are
 listed below\ [#]_.

diff --git a/Documentation/admin-guide/media/cx23885-cardlist.rst b/Documentation/admin-guide/media/cx23885-cardlist.rst
index 0415b8e0be6fa6f936ba4a873fe20ff991341a03..c47514fead334dfa040ba19a38b6848082d48781 100644 (file)
--- a/Documentation/admin-guide/media/cx23885-cardlist.rst
+++ b/Documentation/admin-guide/media/cx23885-cardlist.rst
@@ -12,7 +12,7 @@ cx23885 cards list
 
    * - Card number
      - Card name
-     - PCI IDs
+     - PCI subsystem IDs
 
    * - 0
      - UNKNOWN/GENERIC

diff --git a/Documentation/admin-guide/media/cx88-cardlist.rst b/Documentation/admin-guide/media/cx88-cardlist.rst
index 4524dfb13d18fe066b9d69a7295f324121b3f05c..76dc9a14cf91bd4d1285def44b3fe2e323010a95 100644 (file)
--- a/Documentation/admin-guide/media/cx88-cardlist.rst
+++ b/Documentation/admin-guide/media/cx88-cardlist.rst
@@ -12,7 +12,7 @@ CX88 cards list
 
    * - Card number
      - Card name
-     - PCI IDs
+     - PCI subsystem IDs
 
    * - 0
      - UNKNOWN/GENERIC

diff --git a/Documentation/admin-guide/media/ivtv-cardlist.rst b/Documentation/admin-guide/media/ivtv-cardlist.rst
index c34a9ebc9ac2f40d93e9fca647c0fb3ba58dcff2..0ffc3b71ae60dc2b1475fd0b1299d4482d8f0d10 100644 (file)
--- a/Documentation/admin-guide/media/ivtv-cardlist.rst
+++ b/Documentation/admin-guide/media/ivtv-cardlist.rst
@@ -12,7 +12,7 @@ IVTV cards list
 
    * - Card number
      - Card name
-     - PCI IDs
+     - PCI subsystem IDs
 
    * - 0
      - Hauppauge WinTV PVR-250

diff --git a/Documentation/admin-guide/media/saa7134-cardlist.rst b/Documentation/admin-guide/media/saa7134-cardlist.rst
index afb0e2fb52b05b9f6256111f23fc4869703b0571..3ef8fab6bcadfbcd79c899782b5d8249e2c8afd1 100644 (file)
--- a/Documentation/admin-guide/media/saa7134-cardlist.rst
+++ b/Documentation/admin-guide/media/saa7134-cardlist.rst
@@ -12,7 +12,7 @@ SAA7134 cards list
 
    * - Card number
      - Card name
-     - PCI IDs
+     - PCI subsystem IDs
 
    * - 0
      - UNKNOWN/GENERIC

diff --git a/Documentation/admin-guide/media/saa7164-cardlist.rst b/Documentation/admin-guide/media/saa7164-cardlist.rst
index e8f36e084537cd1177312f86ae9cd01c4ba51a58..7949c09aa900a492a59f85c77fe0dd0ae02a01d4 100644 (file)
--- a/Documentation/admin-guide/media/saa7164-cardlist.rst
+++ b/Documentation/admin-guide/media/saa7164-cardlist.rst
@@ -12,7 +12,7 @@ SAA7164 cards list
 
    * - Card number
      - Card name
-     - PCI IDs
+     - PCI subsystem IDs
 
    * - 0
      - Unknown