diff --git a/data/registers/aes_f7.yaml b/data/registers/aes_f7.yaml
index 98a0012..b2bffb8 100644
--- a/data/registers/aes_f7.yaml
+++ b/data/registers/aes_f7.yaml
@@ -18,86 +18,34 @@ block/AES:
       description: Data output register
       byte_offset: 12
       fieldset: DOUTR
-    - name: KEYR0
-      description: Key register 0
+    - name: KEYR
+      description: Key register
+      array:
+        offsets:
+          - 0
+          - 4
+          - 8
+          - 12
+          - 32
+          - 36
+          - 40
+          - 44
       byte_offset: 16
-      fieldset: KEYR0
-    - name: KEYR1
-      description: Key register 1
-      byte_offset: 20
-      fieldset: KEYR1
-    - name: KEYR2
-      description: Key register 2
-      byte_offset: 24
-      fieldset: KEYR2
-    - name: KEYR3
-      description: Key register 3
-      byte_offset: 28
-      fieldset: KEYR3
-    - name: IVR0
-      description: Initialization vector register 0
+      fieldset: KEYR
+    - name: IVR
+      description: Initialization vector register
+      array:
+        len: 4
+        stride: 4
       byte_offset: 32
-      fieldset: IVR0
-    - name: IVR1
-      description: Initialization vector register 1
-      byte_offset: 36
-      fieldset: IVR1
-    - name: IVR2
-      description: Initialization vector register 2
-      byte_offset: 40
-      fieldset: IVR2
-    - name: IVR3
-      description: Initialization vector register 3
-      byte_offset: 44
-      fieldset: IVR3
-    - name: KEYR4
-      description: Key register 4
-      byte_offset: 48
-      fieldset: KEYR4
-    - name: KEYR5
-      description: Key register 5
-      byte_offset: 52
-      fieldset: KEYR5
-    - name: KEYR6
-      description: Key register 6
-      byte_offset: 56
-      fieldset: KEYR6
-    - name: KEYR7
-      description: Key register 7
-      byte_offset: 60
-      fieldset: KEYR7
-    - name: SUSP0R
-      description: Suspend register 0
+      fieldset: IVR
+    - name: SUSPR
+      description: Suspend register
+      array:
+        len: 8
+        stride: 4
       byte_offset: 64
-      fieldset: SUSP0R
-    - name: SUSP1R
-      description: Suspend register 1
-      byte_offset: 68
-      fieldset: SUSP1R
-    - name: SUSP2R
-      description: Suspend register 2
-      byte_offset: 72
-      fieldset: SUSP2R
-    - name: SUSP3R
-      description: Suspend register 3
-      byte_offset: 76
-      fieldset: SUSP3R
-    - name: SUSP4R
-      description: Suspend register 4
-      byte_offset: 80
-      fieldset: SUSP4R
-    - name: SUSP5R
-      description: Suspend register 5
-      byte_offset: 84
-      fieldset: SUSP5R
-    - name: SUSP6R
-      description: Suspend register 6
-      byte_offset: 88
-      fieldset: SUSP6R
-    - name: SUSP7R
-      description: Suspend register 7
-      byte_offset: 92
-      fieldset: SUSP7R
+      fieldset: SUSPR
 fieldset/CR:
   description: Control register
   fields:
@@ -170,88 +118,18 @@ fieldset/DOUTR:
       description: Output data word
       bit_offset: 0
       bit_size: 32
-fieldset/IVR0:
-  description: Initialization vector register 0
+fieldset/IVR:
+  description: Initialization vector register
   fields:
     - name: IVI
-      description: Initialization vector input, bits [31:0]
+      description: Initialization vector input
       bit_offset: 0
       bit_size: 32
-fieldset/IVR1:
-  description: Initialization vector register 1
-  fields:
-    - name: IVI
-      description: Initialization vector input, bits [63:32]
-      bit_offset: 0
-      bit_size: 32
-fieldset/IVR2:
-  description: Initialization vector register 2
-  fields:
-    - name: IVI
-      description: Initialization vector input, bits [95:64]
-      bit_offset: 0
-      bit_size: 32
-fieldset/IVR3:
-  description: Initialization vector register 3
-  fields:
-    - name: IVI
-      description: Initialization vector input, bits [127:96]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR0:
-  description: Key register 0
+fieldset/KEYR:
+  description: Key register
   fields:
     - name: KEY
-      description: Cryptographic key, bits [31:0]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR1:
-  description: Key register 1
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [63:32]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR2:
-  description: Key register 2
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [95:64]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR3:
-  description: Key register 3
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [127:96]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR4:
-  description: Key register 4
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [159:128]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR5:
-  description: Key register 5
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [191:160]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR6:
-  description: Key register 6
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [223:192]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR7:
-  description: Key register 7
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [255:224]
+      description: Cryptographic key
       bit_offset: 0
       bit_size: 32
 fieldset/SR:
@@ -273,77 +151,13 @@ fieldset/SR:
       description: Busy flag
       bit_offset: 3
       bit_size: 1
-fieldset/SUSP0R:
-  description: Suspend register 0
+fieldset/SUSPR:
+  description: Suspend register
   fields:
     - name: SUSP
       description: AES suspend
       bit_offset: 0
       bit_size: 32
-fieldset/SUSP1R:
-  description: Suspend register 1
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP2R:
-  description: Suspend register 2
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP3R:
-  description: Suspend register 3
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP4R:
-  description: Suspend register 4
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP5R:
-  description: Suspend register 5
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP6R:
-  description: Suspend register 6
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP7R:
-  description: Suspend register 7
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-enum/GCMPH:
-  bit_size: 2
-  variants:
-    - name: Init phase
-      description: Init phase
-      value: 0
-    - name: Header phase
-      description: Header phase
-      value: 1
-    - name: Payload phase
-      description: Payload phase
-      value: 2
-    - name: Final phase
-      description: Final phase
-      value: 3
 enum/DATATYPE:
   bit_size: 2
   variants:
@@ -359,18 +173,33 @@ enum/DATATYPE:
     - name: Bit
       description: Bit
       value: 3
+enum/GCMPH:
+  bit_size: 2
+  variants:
+    - name: Init phase
+      description: Init phase
+      value: 0
+    - name: Header phase
+      description: Header phase
+      value: 1
+    - name: Payload phase
+      description: Payload phase
+      value: 2
+    - name: Final phase
+      description: Final phase
+      value: 3
 enum/MODE:
   bit_size: 2
   variants:
     - name: Mode1
-      description: "Mode 1: encryption"
+      description: "Encryption"
       value: 0
     - name: Mode2
-      description: "Mode 2: key derivation (or key preparation for ECB/CBC decryption)"
+      description: "Key derivation (or key preparation for ECB/CBC decryption)"
       value: 1
     - name: Mode3
-      description: "Mode 3: decryption"
+      description: "Decryption"
       value: 2
     - name: Mode4
-      description: "Mode 4: key derivation then single decryption"
+      description: "Key derivation then single decryption"
       value: 3
diff --git a/data/registers/aes_u5.yaml b/data/registers/aes_u5.yaml
index 3f0ed12..fc2b46f 100644
--- a/data/registers/aes_u5.yaml
+++ b/data/registers/aes_u5.yaml
@@ -18,86 +18,6 @@ block/AES:
       description: Data output register
       byte_offset: 12
       fieldset: DOUTR
-    - name: KEYR0
-      description: Key register 0
-      byte_offset: 16
-      fieldset: KEYR0
-    - name: KEYR1
-      description: Key register 1
-      byte_offset: 20
-      fieldset: KEYR1
-    - name: KEYR2
-      description: Key register 2
-      byte_offset: 24
-      fieldset: KEYR2
-    - name: KEYR3
-      description: Key register 3
-      byte_offset: 28
-      fieldset: KEYR3
-    - name: IVR0
-      description: Initialization vector register 0
-      byte_offset: 32
-      fieldset: IVR0
-    - name: IVR1
-      description: Initialization vector register 1
-      byte_offset: 36
-      fieldset: IVR1
-    - name: IVR2
-      description: Initialization vector register 2
-      byte_offset: 40
-      fieldset: IVR2
-    - name: IVR3
-      description: Initialization vector register 3
-      byte_offset: 44
-      fieldset: IVR3
-    - name: KEYR4
-      description: Key register 4
-      byte_offset: 48
-      fieldset: KEYR4
-    - name: KEYR5
-      description: Key register 5
-      byte_offset: 52
-      fieldset: KEYR5
-    - name: KEYR6
-      description: Key register 6
-      byte_offset: 56
-      fieldset: KEYR6
-    - name: KEYR7
-      description: Key register 7
-      byte_offset: 60
-      fieldset: KEYR7
-    - name: SUSP0R
-      description: Suspend register 0
-      byte_offset: 64
-      fieldset: SUSP0R
-    - name: SUSP1R
-      description: Suspend register 1
-      byte_offset: 68
-      fieldset: SUSP1R
-    - name: SUSP2R
-      description: Suspend register 2
-      byte_offset: 72
-      fieldset: SUSP2R
-    - name: SUSP3R
-      description: Suspend register 3
-      byte_offset: 76
-      fieldset: SUSP3R
-    - name: SUSP4R
-      description: Suspend register 4
-      byte_offset: 80
-      fieldset: SUSP4R
-    - name: SUSP5R
-      description: Suspend register 5
-      byte_offset: 84
-      fieldset: SUSP5R
-    - name: SUSP6R
-      description: Suspend register 6
-      byte_offset: 88
-      fieldset: SUSP6R
-    - name: SUSP7R
-      description: Suspend register 7
-      byte_offset: 92
-      fieldset: SUSP7R
     - name: IER
       description: interrupt enable register
       byte_offset: 768
@@ -110,6 +30,34 @@ block/AES:
       description: interrupt clear register
       byte_offset: 776
       fieldset: ICR
+    - name: KEYR
+      description: Key register
+      array:
+        offsets:
+          - 0
+          - 4
+          - 8
+          - 12
+          - 32
+          - 36
+          - 40
+          - 44
+      byte_offset: 16
+      fieldset: KEYR
+    - name: IVR
+      description: Initialization vector register
+      array:
+        len: 4
+        stride: 4
+      byte_offset: 32
+      fieldset: IVR
+    - name: SUSPR
+      description: Suspend register
+      array:
+        len: 8
+        stride: 4
+      byte_offset: 64
+      fieldset: SUSPR
 fieldset/CR:
   description: Control register
   fields:
@@ -223,88 +171,18 @@ fieldset/ISR:
       description: Key error interrupt flag
       bit_offset: 2
       bit_size: 1
-fieldset/IVR0:
-  description: Initialization vector register 0
+fieldset/IVR:
+  description: Initialization vector register
   fields:
     - name: IVI
-      description: Initialization vector input, bits [31:0]
+      description: Initialization vector input
       bit_offset: 0
       bit_size: 32
-fieldset/IVR1:
-  description: Initialization vector register 1
-  fields:
-    - name: IVI
-      description: Initialization vector input, bits [63:32]
-      bit_offset: 0
-      bit_size: 32
-fieldset/IVR2:
-  description: Initialization vector register 2
-  fields:
-    - name: IVI
-      description: Initialization vector input, bits [95:64]
-      bit_offset: 0
-      bit_size: 32
-fieldset/IVR3:
-  description: Initialization vector register 3
-  fields:
-    - name: IVI
-      description: Initialization vector input, bits [127:96]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR0:
-  description: Key register 0
+fieldset/KEYR:
+  description: Key register
   fields:
     - name: KEY
-      description: Cryptographic key, bits [31:0]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR1:
-  description: Key register 1
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [63:32]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR2:
-  description: Key register 2
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [95:64]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR3:
-  description: Key register 3
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [127:96]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR4:
-  description: Key register 4
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [159:128]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR5:
-  description: Key register 5
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [191:160]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR6:
-  description: Key register 6
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [223:192]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR7:
-  description: Key register 7
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [255:224]
+      description: Cryptographic key
       bit_offset: 0
       bit_size: 32
 fieldset/SR:
@@ -330,77 +208,13 @@ fieldset/SR:
       description: Key valid flag
       bit_offset: 7
       bit_size: 1
-fieldset/SUSP0R:
-  description: Suspend register 0
+fieldset/SUSPR:
+  description: Suspend register
   fields:
     - name: SUSP
       description: AES suspend
       bit_offset: 0
       bit_size: 32
-fieldset/SUSP1R:
-  description: Suspend register 1
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP2R:
-  description: Suspend register 2
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP3R:
-  description: Suspend register 3
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP4R:
-  description: Suspend register 4
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP5R:
-  description: Suspend register 5
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP6R:
-  description: Suspend register 6
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP7R:
-  description: Suspend register 7
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-enum/GCMPH:
-  bit_size: 2
-  variants:
-    - name: Init phase
-      description: Init phase
-      value: 0
-    - name: Header phase
-      description: Header phase
-      value: 1
-    - name: Payload phase
-      description: Payload phase
-      value: 2
-    - name: Final phase
-      description: Final phase
-      value: 3
 enum/DATATYPE:
   bit_size: 2
   variants:
@@ -416,15 +230,30 @@ enum/DATATYPE:
     - name: Bit
       description: Bit
       value: 3
+enum/GCMPH:
+  bit_size: 2
+  variants:
+    - name: Init phase
+      description: Init phase
+      value: 0
+    - name: Header phase
+      description: Header phase
+      value: 1
+    - name: Payload phase
+      description: Payload phase
+      value: 2
+    - name: Final phase
+      description: Final phase
+      value: 3
 enum/MODE:
   bit_size: 2
   variants:
     - name: Mode1
-      description: "Mode 1: encryption"
+      description: "Encryption"
       value: 0
     - name: Mode2
-      description: "Mode 2: key derivation (or key preparation for ECB/CBC decryption)"
+      description: "Key derivation (or key preparation for ECB/CBC decryption)"
       value: 1
     - name: Mode3
-      description: "Mode 3: decryption"
+      description: "Decryption"
       value: 2
diff --git a/data/registers/aes_v1.yaml b/data/registers/aes_v1.yaml
index de814d1..fda80c5 100644
--- a/data/registers/aes_v1.yaml
+++ b/data/registers/aes_v1.yaml
@@ -18,38 +18,20 @@ block/AES:
       description: Data output register
       byte_offset: 12
       fieldset: DOUTR
-    - name: KEYR0
-      description: Key register 0
+    - name: KEYR
+      description: Key register
+      array:
+        len: 4
+        stride: 4
       byte_offset: 16
-      fieldset: KEYR0
-    - name: KEYR1
-      description: Key register 1
-      byte_offset: 20
-      fieldset: KEYR1
-    - name: KEYR2
-      description: Key register 2
-      byte_offset: 24
-      fieldset: KEYR2
-    - name: KEYR3
-      description: Key register 3
-      byte_offset: 28
-      fieldset: KEYR3
-    - name: IVR0
-      description: Initialization vector register 0
+      fieldset: KEYR
+    - name: IVR
+      description: Initialization vector register
+      array:
+        len: 4
+        stride: 4
       byte_offset: 32
-      fieldset: IVR0
-    - name: IVR1
-      description: Initialization vector register 1
-      byte_offset: 36
-      fieldset: IVR1
-    - name: IVR2
-      description: Initialization vector register 2
-      byte_offset: 40
-      fieldset: IVR2
-    - name: IVR3
-      description: Initialization vector register 3
-      byte_offset: 44
-      fieldset: IVR3
+      fieldset: IVR
 fieldset/CR:
   description: Control register
   fields:
@@ -109,60 +91,18 @@ fieldset/DOUTR:
       description: Output data word
       bit_offset: 0
       bit_size: 32
-fieldset/IVR0:
-  description: Initialization vector register 0
+fieldset/IVR:
+  description: Initialization vector register
   fields:
     - name: IVI
-      description: Initialization vector input, bits [31:0]
+      description: "Initialization vector input"
       bit_offset: 0
       bit_size: 32
-fieldset/IVR1:
-  description: Initialization vector register 1
-  fields:
-    - name: IVI
-      description: Initialization vector input, bits [63:32]
-      bit_offset: 0
-      bit_size: 32
-fieldset/IVR2:
-  description: Initialization vector register 2
-  fields:
-    - name: IVI
-      description: Initialization vector input, bits [95:64]
-      bit_offset: 0
-      bit_size: 32
-fieldset/IVR3:
-  description: Initialization vector register 3
-  fields:
-    - name: IVI
-      description: Initialization vector input, bits [127:96]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR0:
-  description: Key register 0
+fieldset/KEYR:
+  description: Key register
   fields:
     - name: KEY
-      description: Cryptographic key, bits [31:0]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR1:
-  description: Key register 1
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [63:32]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR2:
-  description: Key register 2
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [95:64]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR3:
-  description: Key register 3
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [127:96]
+      description: Cryptographic key
       bit_offset: 0
       bit_size: 32
 fieldset/SR:
@@ -199,14 +139,14 @@ enum/MODE:
   bit_size: 2
   variants:
     - name: Mode1
-      description: "Mode 1: encryption"
+      description: "Encryption"
       value: 0
     - name: Mode2
-      description: "Mode 2: key derivation (or key preparation for ECB/CBC decryption)"
+      description: "Key derivation (or key preparation for ECB/CBC decryption)"
       value: 1
     - name: Mode3
-      description: "Mode 3: decryption"
+      description: "Decryption"
       value: 2
     - name: Mode4
-      description: "Mode 4: key derivation then single decryption"
+      description: "Key derivation then single decryption"
       value: 3
diff --git a/data/registers/aes_v2.yaml b/data/registers/aes_v2.yaml
index 1522d8f..a9846bf 100644
--- a/data/registers/aes_v2.yaml
+++ b/data/registers/aes_v2.yaml
@@ -18,86 +18,34 @@ block/AES:
       description: Data output register
       byte_offset: 12
       fieldset: DOUTR
-    - name: KEYR0
-      description: Key register 0
+    - name: KEYR
+      description: Key register
+      array:
+        offsets:
+          - 0
+          - 4
+          - 8
+          - 12
+          - 32
+          - 36
+          - 40
+          - 44
       byte_offset: 16
-      fieldset: KEYR0
-    - name: KEYR1
-      description: Key register 1
-      byte_offset: 20
-      fieldset: KEYR1
-    - name: KEYR2
-      description: Key register 2
-      byte_offset: 24
-      fieldset: KEYR2
-    - name: KEYR3
-      description: Key register 3
-      byte_offset: 28
-      fieldset: KEYR3
-    - name: IVR0
-      description: Initialization vector register 0
+      fieldset: KEYR
+    - name: IVR
+      description: Initialization vector register
+      array:
+        len: 4
+        stride: 4
       byte_offset: 32
-      fieldset: IVR0
-    - name: IVR1
-      description: Initialization vector register 1
-      byte_offset: 36
-      fieldset: IVR1
-    - name: IVR2
-      description: Initialization vector register 2
-      byte_offset: 40
-      fieldset: IVR2
-    - name: IVR3
-      description: Initialization vector register 3
-      byte_offset: 44
-      fieldset: IVR3
-    - name: KEYR4
-      description: Key register 4
-      byte_offset: 48
-      fieldset: KEYR4
-    - name: KEYR5
-      description: Key register 5
-      byte_offset: 52
-      fieldset: KEYR5
-    - name: KEYR6
-      description: Key register 6
-      byte_offset: 56
-      fieldset: KEYR6
-    - name: KEYR7
-      description: Key register 7
-      byte_offset: 60
-      fieldset: KEYR7
-    - name: SUSP0R
-      description: Suspend register 0
+      fieldset: IVR
+    - name: SUSPR
+      description: Suspend register
+      array:
+        len: 8
+        stride: 4
       byte_offset: 64
-      fieldset: SUSP0R
-    - name: SUSP1R
-      description: Suspend register 1
-      byte_offset: 68
-      fieldset: SUSP1R
-    - name: SUSP2R
-      description: Suspend register 2
-      byte_offset: 72
-      fieldset: SUSP2R
-    - name: SUSP3R
-      description: Suspend register 3
-      byte_offset: 76
-      fieldset: SUSP3R
-    - name: SUSP4R
-      description: Suspend register 4
-      byte_offset: 80
-      fieldset: SUSP4R
-    - name: SUSP5R
-      description: Suspend register 5
-      byte_offset: 84
-      fieldset: SUSP5R
-    - name: SUSP6R
-      description: Suspend register 6
-      byte_offset: 88
-      fieldset: SUSP6R
-    - name: SUSP7R
-      description: Suspend register 7
-      byte_offset: 92
-      fieldset: SUSP7R
+      fieldset: SUSPR
 fieldset/CR:
   description: Control register
   fields:
@@ -174,88 +122,18 @@ fieldset/DOUTR:
       description: Output data word
       bit_offset: 0
       bit_size: 32
-fieldset/IVR0:
-  description: Initialization vector register 0
+fieldset/IVR:
+  description: Initialization vector register
   fields:
     - name: IVI
-      description: Initialization vector input, bits [31:0]
+      description: Initialization vector input
       bit_offset: 0
       bit_size: 32
-fieldset/IVR1:
-  description: Initialization vector register 1
-  fields:
-    - name: IVI
-      description: Initialization vector input, bits [63:32]
-      bit_offset: 0
-      bit_size: 32
-fieldset/IVR2:
-  description: Initialization vector register 2
-  fields:
-    - name: IVI
-      description: Initialization vector input, bits [95:64]
-      bit_offset: 0
-      bit_size: 32
-fieldset/IVR3:
-  description: Initialization vector register 3
-  fields:
-    - name: IVI
-      description: Initialization vector input, bits [127:96]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR0:
-  description: Key register 0
+fieldset/KEYR:
+  description: Key register
   fields:
     - name: KEY
-      description: Cryptographic key, bits [31:0]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR1:
-  description: Key register 1
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [63:32]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR2:
-  description: Key register 2
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [95:64]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR3:
-  description: Key register 3
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [127:96]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR4:
-  description: Key register 4
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [159:128]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR5:
-  description: Key register 5
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [191:160]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR6:
-  description: Key register 6
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [223:192]
-      bit_offset: 0
-      bit_size: 32
-fieldset/KEYR7:
-  description: Key register 7
-  fields:
-    - name: KEY
-      description: Cryptographic key, bits [255:224]
+      description: Cryptographic key
       bit_offset: 0
       bit_size: 32
 fieldset/SR:
@@ -277,77 +155,13 @@ fieldset/SR:
       description: Busy flag
       bit_offset: 3
       bit_size: 1
-fieldset/SUSP0R:
-  description: Suspend register 0
+fieldset/SUSPR:
+  description: Suspend register
   fields:
     - name: SUSP
       description: AES suspend
       bit_offset: 0
       bit_size: 32
-fieldset/SUSP1R:
-  description: Suspend register 1
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP2R:
-  description: Suspend register 2
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP3R:
-  description: Suspend register 3
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP4R:
-  description: Suspend register 4
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP5R:
-  description: Suspend register 5
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP6R:
-  description: Suspend register 6
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-fieldset/SUSP7R:
-  description: Suspend register 7
-  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
-enum/GCMPH:
-  bit_size: 2
-  variants:
-    - name: Init phase
-      description: Init phase
-      value: 0
-    - name: Header phase
-      description: Header phase
-      value: 1
-    - name: Payload phase
-      description: Payload phase
-      value: 2
-    - name: Final phase
-      description: Final phase
-      value: 3
 enum/DATATYPE:
   bit_size: 2
   variants:
@@ -363,18 +177,33 @@ enum/DATATYPE:
     - name: Bit
       description: Bit
       value: 3
+enum/GCMPH:
+  bit_size: 2
+  variants:
+    - name: Init phase
+      description: Init phase
+      value: 0
+    - name: Header phase
+      description: Header phase
+      value: 1
+    - name: Payload phase
+      description: Payload phase
+      value: 2
+    - name: Final phase
+      description: Final phase
+      value: 3
 enum/MODE:
   bit_size: 2
   variants:
     - name: Mode1
-      description: "Mode 1: encryption"
+      description: "Encryption"
       value: 0
     - name: Mode2
-      description: "Mode 2: key derivation (or key preparation for ECB/CBC decryption)"
+      description: "Key derivation (or key preparation for ECB/CBC decryption)"
       value: 1
     - name: Mode3
-      description: "Mode 3: decryption"
+      description: "Decryption"
       value: 2
     - name: Mode4
-      description: "Mode 4: key derivation then single decryption"
+      description: "Key derivation then single decryption"
       value: 3