PCRYPT2 -> PCIPHER

8 files changed, 22 insertions, 22 deletions

diff --git a/docs/glossary.txt b/docs/glossary.txt
index 4340d0f4..817976ac 100644
--- a/docs/glossary.txt
+++ b/docs/glossary.txt
@@ -69,7 +69,7 @@ P
 PFIFO: command stream processing engine. Gathers FIFO commands from user
 buffers and direct submission, sorting them out and sending them to execution
 engines, which [depending on GPU] may include: PGRAPH, PMPEG, PME, PVP1,
-PVP2, PBSP, PCRYPT2, PVLD, PPDEC, PPPP, PSEC, PVCOMP, PCOPY, PVENC, PVDEC.
+PVP2, PBSP, PCIPHER, PVLD, PPDEC, PPPP, PSEC, PVCOMP, PCOPY, PVENC, PVDEC.
 
 
 R
diff --git a/docs/hw/bus/pmc.rst b/docs/hw/bus/pmc.rst
index ec8f893b..4f63855e 100644
--- a/docs/hw/bus/pmc.rst
+++ b/docs/hw/bus/pmc.rst
@@ -213,7 +213,7 @@ On G80:GF100, the bits are:
 - 8: :ref:`PFIFO <g80-pfifo>`
 - 12: :ref:`PGRAPH <g80-pgraph>`
 - 13: :ref:`PCOPY <pcopy>` [GT215-]
-- 14: :ref:`PCRYPT2 <pcrypt2>` [G84:G98 G200:MCP77]
+- 14: :ref:`PCIPHER <pcipher>` [G84:G98 G200:MCP77]
 - 14: :ref:`PSEC <psec>` [G98:G200 MCP77:GT215]
 - 14: :ref:`PVCOMP <pvcomp>` [MCP89]
 - 15: :ref:`PBSP <pbsp>` [G84:G98 G200:MCP77]
@@ -227,7 +227,7 @@ On G80:GF100, the bits are:
 - 23: :ref:`PCOPY CHSW <g80-pfifo-chsw>` [GT215-]
 - 24: :ref:`PVP2 CHSW <g80-pfifo-chsw>` [G84:G98 G200:MCP77]
 - 24: :ref:`PPDEC CHSW <g80-pfifo-chsw>` [G98:G200 MCP77-]
-- 25: :ref:`PCRYPT2 CHSW <g80-pfifo-chsw>` [G84:G98 G200:MCP77]
+- 25: :ref:`PCIPHER CHSW <g80-pfifo-chsw>` [G84:G98 G200:MCP77]
 - 25: :ref:`PSEC CHSW <g80-pfifo-chsw>` [G98:G200 MCP77:GT215]
 - 25: :ref:`PVCOMP CHSW <g80-pfifo-chsw>` [MCP89]
 - 26: :ref:`PBSP CHSW <g80-pfifo-chsw>` [G84:G98 G200:MCP77]
@@ -446,7 +446,7 @@ For G80:GF100:
 - 11: ??? [GT215?-]
 - 12: :ref:`PGRAPH <g80-pgraph-intr>`
 - 13: ??? [GT215?-]
-- 14: :ref:`PCRYPT2 <pcrypt2-intr>` [G84:G98 G200:MCP77]
+- 14: :ref:`PCIPHER <pcipher-intr>` [G84:G98 G200:MCP77]
 - 14: :ref:`PSEC <psec-falcon>` [G98:G200 MCP77:GT215]
 - 14: :ref:`PVCOMP <pvcomp-falcon>` [MCP89-]
 - 15: :ref:`PBSP <pbsp-intr>` [G84:G98 G200:MCP77]
diff --git a/docs/hw/fifo/intro.rst b/docs/hw/fifo/intro.rst
index f2368270..ff41233f 100644
--- a/docs/hw/fifo/intro.rst
+++ b/docs/hw/fifo/intro.rst
@@ -49,7 +49,7 @@ Id Present on  Name                        Description
 3  NV40:G84    :ref:`PME <me-fifo>`        VPE motion estimation engine.
 4  NV41:G84    :ref:`PVP1 <pvp1>`          VPE microcoded vector processor.
 4  VP2         :ref:`PVP2 <pvp2>`          xtensa-microcoded vector processor.
-5  VP2         :ref:`PCRYPT2 <pcrypt2>`    AES cryptography and copy engine.
+5  VP2         :ref:`PCIPHER <pcipher>`    AES cryptography and copy engine.
 6  VP2         :ref:`PBSP <pbsp>`          xtensa-microcoded bitstream processor.
 2  VP3-        :ref:`PPPP <pppp>`          falcon-based video post-processor.
 4  VP3-        :ref:`PPDEC <ppdec>`        falcon-based microcoded video decoder.
diff --git a/docs/hw/memory/g80-vm.rst b/docs/hw/memory/g80-vm.rst
index 7c59ff7b..9a7f108b 100644
--- a/docs/hw/memory/g80-vm.rst
+++ b/docs/hw/memory/g80-vm.rst
@@ -160,9 +160,9 @@ VM is used by several clients, which are identified by VM client id:
       :engine: PVLD
       :ref: pvld
 
-   .. value:: 0x0e PCRYPT2 VP2
-      :engine: PCRYPT2
-      :ref: g80-vm-client-pcrypt2
+   .. value:: 0x0e PCIPHER VP2
+      :engine: PCIPHER
+      :ref: g80-vm-client-pcipher
       
    .. value:: 0x0e PSEC VP3
       :engine: PSEC
@@ -229,8 +229,8 @@ to be part of several VM engines. The engines are:
    .. value:: 0x9 PVLD VP3,VP4
       :ref: pvld
 
-   .. value:: 0xa PCRYPT2 VP2
-      :ref: pcrypt2
+   .. value:: 0xa PCIPHER VP2
+      :ref: pcipher
 
    .. value:: 0xa PSEC VP3
       :ref: psec
@@ -294,10 +294,10 @@ ids depends on both engine and client id. The DMA slots are
 - b/f/0: PCOUNTER record buffer [G84:GF100]
 - 1/c/0-f: PVP2 DMA ports 0-0xf [G84:G98 G200:MCP77]
 - 9/d/0-f: PBSP DMA ports 0-0xf [G84:G98 G200:MCP77]
-- a/e/0: PCRYPT2 context [G84:G98 G200:MCP77]
-- a/e/1: PCRYPT2 SRC [G84:G98 G200:MCP77]
-- a/e/2: PCRYPT2 DST [G84:G98 G200:MCP77]
-- a/e/3: PCRYPT2 QUERY [G84:G98 G200:MCP77]
+- a/e/0: PCIPHER context [G84:G98 G200:MCP77]
+- a/e/1: PCIPHER SRC [G84:G98 G200:MCP77]
+- a/e/2: PCIPHER DST [G84:G98 G200:MCP77]
+- a/e/3: PCIPHER QUERY [G84:G98 G200:MCP77]
 - 1/c/0-7: PPDEC falcon ports 0-7 [G98:G200 MCP77-]
 - 8/6/0-7: PPPP falcon ports 0-7 [G98:G200 MCP77-]
 - 9/d/0-7: PVLD falcon ports 0-7 [G98:G200 MCP77-]
@@ -490,7 +490,7 @@ Selector Address Present on Engine
  0x0006  0x00060 VP3-       :ref:`PPPP <pppp>`
  0x0008  0x00080 VP2        :ref:`PBSP <pbsp>`
  0x0008  0x00080 VP3-       :ref:`PVLD <pvld>`
- 0x000a  0x000a0 VP2        :ref:`PCRYPT2 <pcrypt2>`
+ 0x000a  0x000a0 VP2        :ref:`PCIPHER <pcipher>`
  0x000a  0x000a0 VP3        :ref:`PSEC <psec>`
  0x000a  0x000a0 MCP89-     :ref:`PVCOMP <pvcomp>`
  0x000c  0x000c0 GT215-     :ref:`PCOPY <pcopy>`
diff --git a/docs/hw/mmio.rst b/docs/hw/mmio.rst
index 426e8e02..94f85192 100644
--- a/docs/hw/mmio.rst
+++ b/docs/hw/mmio.rst
@@ -185,7 +185,7 @@ G80:GF100 MMIO map
    0x0a0000 PRMFB g80-prmfb * ROOT
    0x100000 PFB g80-pfb * IBUS
    0x101000 PSTRAPS nv3-pstraps * IBUS
-   0x102000 PCRYPT2 pcrypt2 VP2 IBUS
+   0x102000 PCIPHER pcipher VP2 IBUS
    0x102000 UNK102000 unk102000 IGP ROOT
    0x103000 PBSP pbsp VP2 IBUS
    0x104000 PCOPY pcopy GT215:GF100 IBUS
diff --git a/docs/hw/vdec/vp2/index.rst b/docs/hw/vdec/vp2/index.rst
index 9ff960b9..9115db95 100644
--- a/docs/hw/vdec/vp2/index.rst
+++ b/docs/hw/vdec/vp2/index.rst
@@ -13,7 +13,7 @@ Contents:
    vld
    mbring
    macro
-   pcrypt2
+   pcipher
 
 
 Introduction
diff --git a/docs/hw/vdec/vp2/pcrypt2.rst b/docs/hw/vdec/vp2/pcipher.rst
index 71ca6268..e308186e 100644
--- a/docs/hw/vdec/vp2/pcrypt2.rst
+++ b/docs/hw/vdec/vp2/pcipher.rst
@@ -1,7 +1,7 @@
-.. _pcrypt2:
+.. _pcipher:
 
 ==============================
-PCRYPT2: AES encryption engine
+PCIPHER: AES encryption engine
 ==============================
 
 .. contents::
@@ -18,12 +18,12 @@ Introduction
 MMIO registers
 ==============
 
-.. space:: 8 pcrypt2 0x1000 VP2 cryptography engine
+.. space:: 8 pcipher 0x1000 VP2 cryptography engine
 
    .. todo:: write me
 
 
-.. _pcrypt2-intr:
+.. _pcipher-intr:
 
 Interrupts
 ==========
diff --git a/docs/hw/vdec/vp3/index.rst b/docs/hw/vdec/vp3/index.rst
index 25a83bb6..7c8ef159 100644
--- a/docs/hw/vdec/vp3/index.rst
+++ b/docs/hw/vdec/vp3/index.rst
@@ -10,7 +10,7 @@ Contents:
    pvld
    ppdec
    pppp
-   pcrypt3
+   psec
    mbring
    pvdec