clean up TAMP registers

Remove obvious 1 bit enums and make arrays of repeated fields.
2023-09-30 16:56:34 +02:00 · 2023-09-30 16:56:34 +02:00 · 00894c8e3d
commit 00894c8e3d
parent e7de675353
5 changed files with 490 additions and 2379 deletions
--- a/data/registers/tamp_g0.yaml
+++ b/data/registers/tamp_g0.yaml
@ -74,78 +74,61 @@ fieldset/BKPR:
 fieldset/CR1:
  description: control register 1
  fields:
-    - name: TAMP1E
-      description: TAMP1E
+    - name: TAMPE
+      description: Tamper detection on IN X enable
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2E
-      description: TAMP2E
-      bit_offset: 1
-      bit_size: 1
-    - name: ITAMP1E
-      description: ITAMP1E
+      array:
+        len: 2
+        stride: 1
+    - name: ITAMPE
+      description: Internal tamper X enable
      bit_offset: 16
      bit_size: 1
-    - name: ITAMP3E
-      description: ITAMP3E
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP4E
-      description: ITAMP4E
-      bit_offset: 19
-      bit_size: 1
-    - name: ITAMP5E
-      description: ITAMP5E
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP6E
-      description: ITAMP6E
-      bit_offset: 21
-      bit_size: 1
+      array:
+        len: 6
+        stride: 1
 fieldset/CR2:
  description: control register 2
  fields:
-    - name: TAMP1NOER
-      description: TAMP1NOER
+    - name: TAMPNOER
+      description: Tamper X no erase
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2NOER
-      description: TAMP2NOER
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP1MSK
-      description: TAMP1MSK
+      array:
+        len: 2
+        stride: 1
+    - name: TAMPMSK
+      description: Tamper X mask
      bit_offset: 16
      bit_size: 1
-    - name: TAMP2MSK
-      description: TAMP2MSK
-      bit_offset: 17
-      bit_size: 1
-    - name: TAMP1TRG
-      description: TAMP1TRG
+      array:
+        len: 2
+        stride: 1
+    - name: TAMPTRG
+      description: Active level for tamper X input
      bit_offset: 24
      bit_size: 1
-    - name: TAMP2TRG
-      description: TAMP2TRG
-      bit_offset: 25
-      bit_size: 1
+      array:
+        len: 2
+        stride: 1
 fieldset/FLTCR:
  description: TAMP filter control register
  fields:
    - name: TAMPFREQ
-      description: TAMPFREQ
+      description: "Tamper sampling frequency. Determines the frequency at which each of the INx inputs are sampled."
      bit_offset: 0
      bit_size: 3
    - name: TAMPFLT
-      description: TAMPFLT
+      description: "INx filter count. These bits determines the number of consecutive samples at the specified level (TAMP*TRG) needed to activate a tamper event. TAMPFLT is valid for each of the INx inputs."
      bit_offset: 3
      bit_size: 2
    - name: TAMPPRCH
-      description: TAMPPRCH
+      description: "INx precharge duration. These bit determines the duration of time during which the pull-up/is activated before each sample. TAMPPRCH is valid for each of the INx inputs."
      bit_offset: 5
      bit_size: 2
    - name: TAMPPUDIS
-      description: TAMPPUDIS
+      description: "INx pull-up disable. This bit determines if each of the TAMPx pins are precharged before each sample."
      bit_offset: 7
      bit_size: 1
 fieldset/HWCFGR1:
@ -181,34 +164,20 @@ fieldset/HWCFGR2:
 fieldset/IER:
  description: TAMP interrupt enable register
  fields:
-    - name: TAMP1IE
-      description: TAMP1IE
+    - name: TAMPIE
+      description: Tamper X interrupt enable
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2IE
-      description: TAMP2IE
-      bit_offset: 1
-      bit_size: 1
-    - name: ITAMP1IE
-      description: ITAMP1IE
+      array:
+        len: 2
+        stride: 1
+    - name: ITAMPIE
+      description: Internal tamper X interrupt enable
      bit_offset: 16
      bit_size: 1
-    - name: ITAMP3IE
-      description: ITAMP3IE
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP4IE
-      description: ITAMP4IE
-      bit_offset: 19
-      bit_size: 1
-    - name: ITAMP5IE
-      description: ITAMP5IE
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP6IE
-      description: ITAMP6IE
-      bit_offset: 21
-      bit_size: 1
+      array:
+        len: 6
+        stride: 1
 fieldset/IPIDR:
  description: EXTI Identification register
  fields:
@ -219,69 +188,37 @@ fieldset/IPIDR:
 fieldset/MISR:
  description: TAMP masked interrupt status register
  fields:
-    - name: TAMP1MF
-      description: "TAMP1MF:"
+    - name: TAMPMF
+      description: Tamper X interrupt masked flag
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2MF
-      description: TAMP2MF
-      bit_offset: 1
-      bit_size: 1
-    - name: ITAMP1MF
-      description: ITAMP1MF
+      array:
+        len: 2
+        stride: 1
+    - name: ITAMPMF
+      description: Internal tamper X interrupt masked flag
      bit_offset: 16
      bit_size: 1
-    - name: ITAMP3MF
-      description: ITAMP3MF
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP4MF
-      description: ITAMP4MF
-      bit_offset: 19
-      bit_size: 1
-    - name: ITAMP5MF
-      description: ITAMP5MF
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP6MF
-      description: ITAMP6MF
-      bit_offset: 21
-      bit_size: 1
+      array:
+        len: 6
+        stride: 1
 fieldset/SCR:
  description: TAMP status clear register
  fields:
-    - name: CTAMP1F
-      description: CTAMP1F
+    - name: CTAMPF
+      description: Clear tamper X detection flag
      bit_offset: 0
      bit_size: 1
-    - name: CTAMP2F
-      description: CTAMP2F
-      bit_offset: 1
-      bit_size: 1
-    - name: CITAMP1F
-      description: CITAMP1F
+      array:
+        len: 2
+        stride: 1
+    - name: CITAMPF
+      description: Clear internal tamper X detection flag
      bit_offset: 16
      bit_size: 1
-    - name: CITAMP3F
-      description: CITAMP3F
-      bit_offset: 18
-      bit_size: 1
-    - name: CITAMP4F
-      description: CITAMP4F
-      bit_offset: 19
-      bit_size: 1
-    - name: CITAMP5F
-      description: CITAMP5F
-      bit_offset: 20
-      bit_size: 1
-    - name: CITAMP6F
-      description: CITAMP6F
-      bit_offset: 21
-      bit_size: 1
-    - name: CITAMP7F
-      description: CITAMP7F
-      bit_offset: 22
-      bit_size: 1
+      array:
+        len: 7
+        stride: 1
 fieldset/SIDR:
  description: EXTI Size ID register
  fields:
@ -292,38 +229,20 @@ fieldset/SIDR:
 fieldset/SR:
  description: TAMP status register
  fields:
-    - name: TAMP1F
-      description: TAMP1F
+    - name: TAMPF
+      description: Tamper X detection flag
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2F
-      description: TAMP2F
-      bit_offset: 1
-      bit_size: 1
-    - name: ITAMP1F
-      description: ITAMP1F
+      array:
+        len: 2
+        stride: 1
+    - name: ITAMPF
+      description: Internal tamper X detection flag
      bit_offset: 16
      bit_size: 1
-    - name: ITAMP3F
-      description: ITAMP3F
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP4F
-      description: ITAMP4F
-      bit_offset: 19
-      bit_size: 1
-    - name: ITAMP5F
-      description: ITAMP5F
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP6F
-      description: ITAMP6F
-      bit_offset: 21
-      bit_size: 1
-    - name: ITAMP7F
-      description: ITAMP7F
-      bit_offset: 22
-      bit_size: 1
+      array:
+        len: 7
+        stride: 1
 fieldset/VERR:
  description: EXTI IP Version register
  fields:
--- a/data/registers/tamp_g4.yaml
+++ b/data/registers/tamp_g4.yaml
@ -48,213 +48,128 @@ fieldset/BKPR:
 fieldset/CR1:
  description: control register 1
  fields:
-    - name: TAMP1E
-      description: TAMP1E
+    - name: TAMPE
+      description: Tamper detection on IN X enable
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2E
-      description: TAMP2E
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3E
-      description: TAMP2E
-      bit_offset: 2
-      bit_size: 1
-    - name: ITAMP3E
-      description: ITAMP3E
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP4E
-      description: ITAMP4E
-      bit_offset: 19
-      bit_size: 1
-    - name: ITAMP5E
-      description: ITAMP5E
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP6E
-      description: ITAMP6E
-      bit_offset: 21
+      array:
+        len: 3
+        stride: 1
+    - name: ITAMPE
+      description: Internal tamper X enable
+      bit_offset: 16
      bit_size: 1
+      array:
+        len: 6
+        stride: 1
 fieldset/CR2:
  description: control register 2
  fields:
-    - name: TAMP1NOER
-      description: TAMP1NOER
+    - name: TAMPNOER
+      description: Tamper X no erase
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2NOER
-      description: TAMP2NOER
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3NOER
-      description: TAMP3NOER
-      bit_offset: 2
-      bit_size: 1
-    - name: TAMP1MSK
-      description: TAMP1MSK
+      array:
+        len: 3
+        stride: 1
+    - name: TAMPMSK
+      description: Tamper X mask.
      bit_offset: 16
      bit_size: 1
-    - name: TAMP2MSK
-      description: TAMP2MSK
-      bit_offset: 17
-      bit_size: 1
-    - name: TAMP3MSK
-      description: TAMP3MSK
-      bit_offset: 18
-      bit_size: 1
-    - name: TAMP1TRG
-      description: TAMP1TRG
+      array:
+        len: 3
+        stride: 1
+    - name: TAMPTRG
+      description: Active level for tamper X input.
      bit_offset: 24
      bit_size: 1
-    - name: TAMP2TRG
-      description: TAMP2TRG
-      bit_offset: 25
-      bit_size: 1
-    - name: TAMP3TRG
-      description: TAMP3TRG
-      bit_offset: 26
-      bit_size: 1
+      array:
+        len: 3
+        stride: 1
 fieldset/FLTCR:
  description: TAMP filter control register
  fields:
    - name: TAMPFREQ
-      description: TAMPFREQ
+      description: "Tamper sampling frequency. Determines the frequency at which each of the INx inputs are sampled."
      bit_offset: 0
      bit_size: 3
    - name: TAMPFLT
-      description: TAMPFLT
+      description: "INx filter count. These bits determines the number of consecutive samples at the specified level (TAMP*TRG) needed to activate a tamper event. TAMPFLT is valid for each of the INx inputs."
      bit_offset: 3
      bit_size: 2
    - name: TAMPPRCH
-      description: TAMPPRCH
+      description: "INx precharge duration. These bit determines the duration of time during which the pull-up/is activated before each sample. TAMPPRCH is valid for each of the INx inputs."
      bit_offset: 5
      bit_size: 2
    - name: TAMPPUDIS
-      description: TAMPPUDIS
+      description: "INx pull-up disable. This bit determines if each of the TAMPx pins are precharged before each sample."
      bit_offset: 7
      bit_size: 1
 fieldset/IER:
  description: TAMP interrupt enable register
  fields:
-    - name: TAMP1IE
-      description: TAMP1IE
+    - name: TAMPIE
+      description: Tamper X interrupt enable
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2IE
-      description: TAMP2IE
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3IE
-      description: TAMP3IE
-      bit_offset: 2
-      bit_size: 1
-    - name: ITAMP3IE
-      description: ITAMP3IE
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP4IE
-      description: ITAMP4IE
-      bit_offset: 19
-      bit_size: 1
-    - name: ITAMP5IE
-      description: ITAMP5IE
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP6IE
-      description: ITAMP6IE
-      bit_offset: 21
+      array:
+        len: 3
+        stride: 1
+    - name: ITAMPIE
+      description: Internal tamper X interrupt enable
+      bit_offset: 16
      bit_size: 1
+      array:
+        len: 6
+        stride: 1
 fieldset/MISR:
  description: TAMP masked interrupt status register
  fields:
-    - name: TAMP1MF
-      description: "TAMP1MF:"
+    - name: TAMPMF
+      description: Tamper X interrupt masked flag
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2MF
-      description: TAMP2MF
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3MF
-      description: TAMP3MF
-      bit_offset: 2
-      bit_size: 1
-    - name: ITAMP3MF
-      description: ITAMP3MF
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP4MF
-      description: ITAMP4MF
-      bit_offset: 19
-      bit_size: 1
-    - name: ITAMP5MF
-      description: ITAMP5MF
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP6MF
-      description: ITAMP6MF
-      bit_offset: 21
+      array:
+        len: 3
+        stride: 1
+    - name: ITAMPMF
+      description: Internal tamper X interrupt masked flag
+      bit_offset: 16
      bit_size: 1
+      array:
+        len: 6
+        stride: 1
 fieldset/SCR:
  description: TAMP status clear register
  fields:
-    - name: CTAMP1F
-      description: CTAMP1F
+    - name: CTAMPF
+      description: Clear tamper X detection flag
      bit_offset: 0
      bit_size: 1
-    - name: CTAMP2F
-      description: CTAMP2F
-      bit_offset: 1
-      bit_size: 1
-    - name: CTAMP3F
-      description: CTAMP3F
-      bit_offset: 2
-      bit_size: 1
-    - name: CITAMP3F
-      description: CITAMP3F
-      bit_offset: 18
-      bit_size: 1
-    - name: CITAMP4F
-      description: CITAMP4F
-      bit_offset: 19
-      bit_size: 1
-    - name: CITAMP5F
-      description: CITAMP5F
-      bit_offset: 20
-      bit_size: 1
-    - name: CITAMP6F
-      description: CITAMP6F
-      bit_offset: 21
+      array:
+        len: 3
+        stride: 1
+    - name: CITAMPF
+      description: Clear internal tamper X detection flag
+      bit_offset: 16
      bit_size: 1
+      array:
+        len: 6
+        stride: 1
 fieldset/SR:
  description: TAMP status register
  fields:
-    - name: TAMP1F
-      description: TAMP1F
+    - name: TAMPF
+      description: Tamper X detection flag
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2F
-      description: TAMP2F
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3F
-      description: TAMP3F
-      bit_offset: 2
-      bit_size: 1
-    - name: ITAMP3F
-      description: ITAMP3F
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP4F
-      description: ITAMP4F
-      bit_offset: 19
-      bit_size: 1
-    - name: ITAMP5F
-      description: ITAMP5F
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP6F
-      description: ITAMP6F
-      bit_offset: 21
+      array:
+        len: 3
+        stride: 1
+    - name: ITAMPF
+      description: Internal tamper X detection flag
+      bit_offset: 16
      bit_size: 1
+      array:
+        len: 6
+        stride: 1
--- a/data/registers/tamp_l5.yaml
+++ b/data/registers/tamp_l5.yaml
@ -86,54 +86,20 @@ block/TAMP:
 fieldset/ATCR1:
  description: TAMP active tamper control register 1
  fields:
-    - name: TAMP1AM
-      description: TAMP1AM
+    - name: TAMPAM
+      description: TAMPAM
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2AM
-      description: TAMP2AM
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3AM
-      description: TAMP3AM
-      bit_offset: 2
-      bit_size: 1
-    - name: TAMP4AM
-      description: TAMP4AM
-      bit_offset: 3
-      bit_size: 1
-    - name: TAMP5AM
-      description: TAMP5AM
-      bit_offset: 4
-      bit_size: 1
-    - name: TAMP6AM
-      description: TAMP6AM
-      bit_offset: 5
-      bit_size: 1
-    - name: TAMP7AM
-      description: TAMP7AM
-      bit_offset: 6
-      bit_size: 1
-    - name: TAMP8AM
-      description: TAMP8AM
-      bit_offset: 7
-      bit_size: 1
-    - name: ATOSEL1
-      description: ATOSEL1
+      array:
+        len: 8
+        stride: 1
+    - name: ATOSEL
+      description: ATOSEL
      bit_offset: 8
      bit_size: 2
-    - name: ATOSEL2
-      description: ATOSEL2
-      bit_offset: 10
-      bit_size: 2
-    - name: ATOSEL3
-      description: ATOSEL3
-      bit_offset: 12
-      bit_size: 2
-    - name: ATOSEL4
-      description: ATOSEL4
-      bit_offset: 14
-      bit_size: 2
+      array:
+        len: 4
+        stride: 2
    - name: ATCKSEL
      description: ATCKSEL
      bit_offset: 16
@ -153,38 +119,13 @@ fieldset/ATCR1:
 fieldset/ATCR2:
  description: TAMP active tamper control register 2
  fields:
-    - name: ATOSEL1
-      description: ATOSEL1
+    - name: ATOSEL
+      description: ATOSEL
      bit_offset: 8
      bit_size: 3
-    - name: ATOSEL2
-      description: ATOSEL2
-      bit_offset: 11
-      bit_size: 3
-    - name: ATOSEL3
-      description: ATOSEL3
-      bit_offset: 14
-      bit_size: 3
-    - name: ATOSEL4
-      description: ATOSEL4
-      bit_offset: 17
-      bit_size: 3
-    - name: ATOSEL5
-      description: ATOSEL5
-      bit_offset: 20
-      bit_size: 3
-    - name: ATOSEL6
-      description: ATOSEL6
-      bit_offset: 23
-      bit_size: 3
-    - name: ATOSEL7
-      description: ATOSEL7
-      bit_offset: 26
-      bit_size: 3
-    - name: ATOSEL8
-      description: ATOSEL8
-      bit_offset: 29
-      bit_size: 3
+      array:
+        len: 8
+        stride: 3
 fieldset/ATOR:
  description: TAMP active tamper output register
  fields:
@ -239,164 +180,58 @@ fieldset/COUNTR:
 fieldset/CR1:
  description: control register 1
  fields:
-    - name: TAMP1E
-      description: TAMP1E
+    - name: TAMPE
+      description: TAMPE
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2E
-      description: TAMP2E
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3E
-      description: TAMP3E
-      bit_offset: 2
-      bit_size: 1
-    - name: TAMP4E
-      description: TAMP4E
-      bit_offset: 3
-      bit_size: 1
-    - name: TAMP5E
-      description: TAMP5E
-      bit_offset: 4
-      bit_size: 1
-    - name: TAMP6E
-      description: TAMP6E
-      bit_offset: 5
-      bit_size: 1
-    - name: TAMP7E
-      description: TAMP7E
-      bit_offset: 6
-      bit_size: 1
-    - name: TAMP8E
-      description: TAMP8E
-      bit_offset: 7
-      bit_size: 1
-    - name: ITAMP1E
-      description: ITAMP1E
+      array:
+        len: 8
+        stride: 1
+    - name: ITAMPE
+      description: ITAMPE
      bit_offset: 16
      bit_size: 1
-    - name: ITAMP2E
-      description: ITAMP2E
-      bit_offset: 17
-      bit_size: 1
-    - name: ITAMP3E
-      description: ITAMP3E
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP5E
-      description: ITAMP5E
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP8E
-      description: ITAMP5E
-      bit_offset: 23
-      bit_size: 1
+      array:
+        len: 8
+        stride: 1
 fieldset/CR2:
  description: control register 2
  fields:
-    - name: TAMP1NOER
-      description: TAMP1NOER
+    - name: TAMPNOER
+      description: Tamper X no erase
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2NOER
-      description: TAMP2NOER
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3NOER
-      description: TAMP3NOER
-      bit_offset: 2
-      bit_size: 1
-    - name: TAMP4NOER
-      description: TAMP4NOER
-      bit_offset: 3
-      bit_size: 1
-    - name: TAMP5NOER
-      description: TAMP5NOER
-      bit_offset: 4
-      bit_size: 1
-    - name: TAMP6NOER
-      description: TAMP6NOER
-      bit_offset: 5
-      bit_size: 1
-    - name: TAMP7NOER
-      description: TAMP7NOER
-      bit_offset: 6
-      bit_size: 1
-    - name: TAMP8NOER
-      description: TAMP8NOER
-      bit_offset: 7
-      bit_size: 1
-    - name: TAMP1MSK
-      description: TAMP1MSK
+      array:
+        len: 8
+        stride: 1
+    - name: TAMPMSK
+      description: Tamper X mask
      bit_offset: 16
      bit_size: 1
-    - name: TAMP2MSK
-      description: TAMP2MSK
-      bit_offset: 17
-      bit_size: 1
-    - name: TAMP3MSK
-      description: TAMP3MSK
-      bit_offset: 18
-      bit_size: 1
+      array:
+        len: 3
+        stride: 1
    - name: BKERASE
      description: BKERASE
      bit_offset: 23
      bit_size: 1
-    - name: TAMP1TRG
-      description: TAMP1TRG
+    - name: TAMPTRG
+      description: Active level for tamper X input
      bit_offset: 24
      bit_size: 1
-    - name: TAMP2TRG
-      description: TAMP2TRG
-      bit_offset: 25
-      bit_size: 1
-    - name: TAMP3TRG
-      description: TAMP3TRG
-      bit_offset: 26
-      bit_size: 1
-    - name: TAMP4TRG
-      description: TAMP4TRG
-      bit_offset: 27
-      bit_size: 1
-    - name: TAMP5TRG
-      description: TAMP5TRG
-      bit_offset: 28
-      bit_size: 1
-    - name: TAMP6TRG
-      description: TAMP6TRG
-      bit_offset: 29
-      bit_size: 1
-    - name: TAMP7TRG
-      description: TAMP7TRG
-      bit_offset: 30
-      bit_size: 1
-    - name: TAMP8TRG
-      description: TAMP8TRG
-      bit_offset: 31
-      bit_size: 1
+      array:
+        len: 8
+        stride: 1
 fieldset/CR3:
  description: control register 3
  fields:
-    - name: ITAMP1NOER
-      description: ITAMP1NOER
+    - name: ITAMPNOER
+      description: Internal Tamper X no erase
      bit_offset: 0
      bit_size: 1
-    - name: ITAMP2NOER
-      description: ITAMP2NOER
-      bit_offset: 1
-      bit_size: 1
-    - name: ITAMP3NOER
-      description: ITAMP3NOER
-      bit_offset: 2
-      bit_size: 1
-    - name: ITAMP5NOER
-      description: ITAMP5NOER
-      bit_offset: 4
-      bit_size: 1
-    - name: ITAMP8NOER
-      description: ITAMP8NOER
-      bit_offset: 7
-      bit_size: 1
+      array:
+        len: 8
+        stride: 1
 fieldset/FLTCR:
  description: TAMP filter control register
  fields:
@ -419,113 +254,37 @@ fieldset/FLTCR:
 fieldset/IER:
  description: TAMP interrupt enable register
  fields:
-    - name: TAMP1IE
-      description: TAMP1IE
+    - name: TAMPIE
+      description: Tamper X interrupt enable
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2IE
-      description: TAMP2IE
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3IE
-      description: TAMP3IE
-      bit_offset: 2
-      bit_size: 1
-    - name: TAMP4IE
-      description: TAMP4IE
-      bit_offset: 3
-      bit_size: 1
-    - name: TAMP5IE
-      description: TAMP5IE
-      bit_offset: 4
-      bit_size: 1
-    - name: TAMP6IE
-      description: TAMP6IE
-      bit_offset: 5
-      bit_size: 1
-    - name: TAMP7IE
-      description: TAMP7IE
-      bit_offset: 6
-      bit_size: 1
-    - name: TAMP8IE
-      description: TAMP8IE
-      bit_offset: 7
-      bit_size: 1
-    - name: ITAMP1IE
-      description: ITAMP1IE
+      array:
+        len: 8
+        stride: 1
+    - name: ITAMPIE
+      description: Internal tamper X interrupt enable
      bit_offset: 16
      bit_size: 1
-    - name: ITAMP2IE
-      description: ITAMP2IE
-      bit_offset: 17
-      bit_size: 1
-    - name: ITAMP3IE
-      description: ITAMP3IE
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP5IE
-      description: ITAMP5IE
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP8IE
-      description: ITAMP8IE
-      bit_offset: 23
-      bit_size: 1
+      array:
+        len: 8
+        stride: 1
 fieldset/MISR:
  description: " TAMP masked interrupt status register "
  fields:
-    - name: TAMP1MF
-      description: "TAMP1MF:"
+    - name: TAMPMF
+      description: Tamper X interrupt masked flag
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2MF
-      description: TAMP2MF
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3MF
-      description: TAMP3MF
-      bit_offset: 2
-      bit_size: 1
-    - name: TAMP4MF
-      description: TAMP4MF
-      bit_offset: 3
-      bit_size: 1
-    - name: TAMP5MF
-      description: TAMP5MF
-      bit_offset: 4
-      bit_size: 1
-    - name: TAMP6MF
-      description: TAMP6MF
-      bit_offset: 5
-      bit_size: 1
-    - name: TAMP7MF
-      description: "TAMP7MF:"
-      bit_offset: 6
-      bit_size: 1
-    - name: TAMP8MF
-      description: TAMP8MF
-      bit_offset: 7
-      bit_size: 1
-    - name: ITAMP1MF
-      description: ITAMP1MF
+      array:
+        len: 8
+        stride: 1
+    - name: ITAMPMF
+      description: Internal tamper X interrupt masked flag
      bit_offset: 16
      bit_size: 1
-    - name: ITAMP2MF
-      description: ITAMP2MF
-      bit_offset: 17
-      bit_size: 1
-    - name: ITAMP3MF
-      description: ITAMP3MF
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP5MF
-      description: ITAMP5MF
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP8MF
-      description: ITAMP8MF
-      bit_offset: 23
-      bit_size: 1
+      array:
+        len: 8
+        stride: 1
 fieldset/PRIVCR:
  description: TAMP privilege mode control register
  fields:
@ -544,58 +303,20 @@ fieldset/PRIVCR:
 fieldset/SCR:
  description: TAMP status clear register
  fields:
-    - name: CTAMP1F
-      description: CTAMP1F
+    - name: CTAMPF
+      description: Clear tamper X detection flag
      bit_offset: 0
      bit_size: 1
-    - name: CTAMP2F
-      description: CTAMP2F
-      bit_offset: 1
-      bit_size: 1
-    - name: CTAMP3F
-      description: CTAMP3F
-      bit_offset: 2
-      bit_size: 1
-    - name: CTAMP4F
-      description: CTAMP4F
-      bit_offset: 3
-      bit_size: 1
-    - name: CTAMP5F
-      description: CTAMP5F
-      bit_offset: 4
-      bit_size: 1
-    - name: CTAMP6F
-      description: CTAMP6F
-      bit_offset: 5
-      bit_size: 1
-    - name: CTAMP7F
-      description: CTAMP7F
-      bit_offset: 6
-      bit_size: 1
-    - name: CTAMP8F
-      description: CTAMP8F
-      bit_offset: 7
-      bit_size: 1
-    - name: CITAMP1F
-      description: CITAMP1F
+      array:
+        len: 8
+        stride: 1
+    - name: CITAMPF
+      description: Clear internal tamper X detection flag
      bit_offset: 16
      bit_size: 1
-    - name: CITAMP2F
-      description: CITAMP2F
-      bit_offset: 17
-      bit_size: 1
-    - name: CITAMP3F
-      description: CITAMP3F
-      bit_offset: 18
-      bit_size: 1
-    - name: CITAMP5F
-      description: CITAMP5F
-      bit_offset: 20
-      bit_size: 1
-    - name: CITAMP8F
-      description: CITAMP8F
-      bit_offset: 23
-      bit_size: 1
+      array:
+        len: 8
+        stride: 1
 fieldset/SMCR:
  description: TAMP secure mode register
  fields:
@ -614,110 +335,34 @@ fieldset/SMCR:
 fieldset/SMISR:
  description: TAMP secure masked interrupt status register
  fields:
-    - name: TAMP1MF
-      description: "TAMP1MF:"
+    - name: TAMPMF
+      description: Tamper X interrupt masked flag
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2MF
-      description: TAMP2MF
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3MF
-      description: TAMP3MF
-      bit_offset: 2
-      bit_size: 1
-    - name: TAMP4MF
-      description: TAMP4MF
-      bit_offset: 3
-      bit_size: 1
-    - name: TAMP5MF
-      description: TAMP5MF
-      bit_offset: 4
-      bit_size: 1
-    - name: TAMP6MF
-      description: TAMP6MF
-      bit_offset: 5
-      bit_size: 1
-    - name: TAMP7MF
-      description: "TAMP7MF:"
-      bit_offset: 6
-      bit_size: 1
-    - name: TAMP8MF
-      description: TAMP8MF
-      bit_offset: 7
-      bit_size: 1
-    - name: ITAMP1MF
-      description: ITAMP1MF
+      array:
+        len: 8
+        stride: 1
+    - name: ITAMPMF
+      description: Internal tamper X interrupt masked flag
      bit_offset: 16
      bit_size: 1
-    - name: ITAMP2MF
-      description: ITAMP2MF
-      bit_offset: 17
-      bit_size: 1
-    - name: ITAMP3MF
-      description: ITAMP3MF
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP5MF
-      description: ITAMP5MF
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP8MF
-      description: ITAMP8MF
-      bit_offset: 23
-      bit_size: 1
+      array:
+        len: 8
+        stride: 1
 fieldset/SR:
  description: TAMP status register
  fields:
-    - name: TAMP1F
-      description: TAMP1F
+    - name: TAMPF
+      description: Tamper X detection flag
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2F
-      description: TAMP2F
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3F
-      description: TAMP3F
-      bit_offset: 2
-      bit_size: 1
-    - name: TAMP4F
-      description: TAMP4F
-      bit_offset: 3
-      bit_size: 1
-    - name: TAMP5F
-      description: TAMP5F
-      bit_offset: 4
-      bit_size: 1
-    - name: TAMP6F
-      description: TAMP6F
-      bit_offset: 5
-      bit_size: 1
-    - name: TAMP7F
-      description: TAMP7F
-      bit_offset: 6
-      bit_size: 1
-    - name: TAMP8F
-      description: TAMP8F
-      bit_offset: 7
-      bit_size: 1
-    - name: ITAMP1F
-      description: ITAMP1F
+      array:
+        len: 8
+        stride: 1
+    - name: ITAMPF
+      description: Internal tamper X detection flag
      bit_offset: 16
      bit_size: 1
-    - name: ITAMP2F
-      description: ITAMP2F
-      bit_offset: 17
-      bit_size: 1
-    - name: ITAMP3F
-      description: ITAMP3F
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP5F
-      description: ITAMP5F
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP8F
-      description: ITAMP8F
-      bit_offset: 23
-      bit_size: 1
+      array:
+        len: 8
+        stride: 1
--- a/data/registers/tamp_u5.yaml
+++ b/data/registers/tamp_u5.yaml
--- a/data/registers/tamp_wl.yaml
+++ b/data/registers/tamp_wl.yaml
@ -65,110 +65,61 @@ fieldset/COUNTR:
 fieldset/CR1:
  description: control register 1
  fields:
-    - name: TAMP1E
-      description: Tamper detection on IN1 enable
+    - name: TAMPE
+      description: Tamper detection on IN X enable
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2E
-      description: Tamper detection on IN2 enable
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3E
-      description: Tamper detection on IN3 enable
-      bit_offset: 2
-      bit_size: 1
-    - name: ITAMP3E
-      description: Internal tamper 3 enable
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP5E
-      description: Internal tamper 5 enable
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP6E
-      description: Internal tamper 6 enable
-      bit_offset: 21
-      bit_size: 1
-    - name: ITAMP8E
-      description: Internal tamper 8 enable
-      bit_offset: 23
+      array:
+        len: 3
+        stride: 1
+    - name: ITAMPE
+      description: Internal tamper X enable
+      bit_offset: 16
      bit_size: 1
+      array:
+        len: 8
+        stride: 1
 fieldset/CR2:
  description: control register 2
  fields:
-    - name: TAMP1NOER
-      description: Tamper 1 no erase
+    - name: TAMPNOER
+      description: Tamper X no erase
      bit_offset: 0
      bit_size: 1
-      enum: TAMPNOER
-    - name: TAMP2NOER
-      description: Tamper 2 no erase
-      bit_offset: 1
-      bit_size: 1
-      enum: TAMPNOER
-    - name: TAMP3NOER
-      description: Tamper 3 no erase
-      bit_offset: 2
-      bit_size: 1
-      enum: TAMPNOER
-    - name: TAMP1MSK
-      description: Tamper 1 mask. The tamper 1 interrupt must not be enabled when TAMP1MSK is set.
+      array:
+        len: 3
+        stride: 1
+    - name: TAMPMSK
+      description: Tamper X mask. The tamper X interrupt must not be enabled when TAMPMSK is set.
      bit_offset: 16
      bit_size: 1
-      enum: TAMPMSK
-    - name: TAMP2MSK
-      description: Tamper 2 mask. The tamper 2 interrupt must not be enabled when TAMP1MSK is set.
-      bit_offset: 17
-      bit_size: 1
-      enum: TAMPMSK
-    - name: TAMP3MSK
-      description: Tamper 3 mask. The tamper 3 interrupt must not be enabled when TAMP1MSK is set.
-      bit_offset: 18
-      bit_size: 1
+      array:
+        len: 3
+        stride: 1
      enum: TAMPMSK
    - name: BKERASE
      description: Backup registers erase
      bit_offset: 23
      bit_size: 1
      enum: BKERASE
-    - name: TAMP1TRG
-      description: Active level for tamper 1 input.
+    - name: TAMPTRG
+      description: Active level for tamper X input
      bit_offset: 24
      bit_size: 1
-      enum: TAMPTRG
-    - name: TAMP2TRG
-      description: Active level for tamper 2 input.
-      bit_offset: 25
-      bit_size: 1
-      enum: TAMPTRG
-    - name: TAMP3TRG
-      description: Active level for tamper 3 input.
-      bit_offset: 26
-      bit_size: 1
+      array:
+        len: 3
+        stride: 1
      enum: TAMPTRG
 fieldset/CR3:
  description: TAMP control register 3
  fields:
-    - name: ITAMP3NOER
-      description: Internal Tamper 3 no erase
-      bit_offset: 2
+    - name: ITAMPNOER
+      description: Internal Tamper X no erase
+      bit_offset: 0
      bit_size: 1
-      enum: ITAMPNOER
-    - name: ITAMP5NOER
-      description: Internal Tamper 5 no erase
-      bit_offset: 4
-      bit_size: 1
-      enum: ITAMPNOER
-    - name: ITAMP6NOER
-      description: Internal Tamper 6 no erase
-      bit_offset: 5
-      bit_size: 1
-      enum: ITAMPNOER
-    - name: ITAMP8NOER
-      description: Internal Tamper 8 no erase
-      bit_offset: 7
-      bit_size: 1
-      enum: ITAMPNOER
+      array:
+        len: 8
+        stride: 1
 fieldset/FLTCR:
  description: TAMP filter control register
  fields:
@ -194,180 +145,77 @@ fieldset/FLTCR:
 fieldset/IER:
  description: TAMP interrupt enable register
  fields:
-    - name: TAMP1IE
-      description: Tamper 1 interrupt enable
+    - name: TAMPIE
+      description: Tamper X interrupt enable
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2IE
-      description: Tamper 2 interrupt enable
-      bit_offset: 1
-      bit_size: 1
-    - name: TAMP3IE
-      description: Tamper 3 interrupt enable
-      bit_offset: 2
-      bit_size: 1
-    - name: ITAMP3IE
-      description: Internal tamper 3 interrupt enable
-      bit_offset: 18
-      bit_size: 1
-    - name: ITAMP5IE
-      description: Internal tamper 5 interrupt enable
-      bit_offset: 20
-      bit_size: 1
-    - name: ITAMP6IE
-      description: Internal tamper 6 interrupt enable
-      bit_offset: 21
-      bit_size: 1
-    - name: ITAMP8IE
-      description: Internal tamper 8 interrupt enable
-      bit_offset: 23
+      array:
+        len: 3
+        stride: 1
+    - name: ITAMPIE
+      description: Internal tamper X interrupt enable
+      bit_offset: 16
      bit_size: 1
+      array:
+        len: 8
+        stride: 1
 fieldset/MISR:
  description: TAMP masked interrupt status register
  fields:
-    - name: TAMP1MF
-      description: Tamper 1 interrupt masked flag
+    - name: TAMPMF
+      description: Tamper X interrupt masked flag
      bit_offset: 0
      bit_size: 1
-    - name: TAMP2MF
-      description: Tamper 2 interrupt masked flag
-      bit_offset: 1
+      array:
+        len: 3
+        stride: 1
+    - name: ITAMPMF
+      description: Internal tamper X interrupt masked flag
+      bit_offset: 16
      bit_size: 1
-    - name: TAMP3MF
-      description: Tamper 3 interrupt masked flag
-      bit_offset: 2
-      bit_size: 1
-    - name: ITAMP3MF
-      description: Internal tamper 3 interrupt masked flag
-      bit_offset: 18
-      bit_size: 1
-      enum: ITAMPMF
-    - name: ITAMP5MF
-      description: Internal tamper 5 interrupt masked flag
-      bit_offset: 20
-      bit_size: 1
-      enum: ITAMPMF
-    - name: ITAMP6MF
-      description: Internal tamper 6 interrupt masked flag
-      bit_offset: 21
-      bit_size: 1
-      enum: ITAMPMF
-    - name: ITAMP8MF
-      description: Internal tamper 8 interrupt masked flag
-      bit_offset: 23
-      bit_size: 1
-      enum: ITAMPMF
+      array:
+        len: 8
+        stride: 1
 fieldset/SCR:
  description: TAMP status clear register
  fields:
-    - name: CTAMP1F
-      description: Clear tamper 1 detection flag
+    - name: CTAMPF
+      description: Clear tamper X detection flag
      bit_offset: 0
      bit_size: 1
-    - name: CTAMP2F
-      description: Clear tamper 2 detection flag
-      bit_offset: 1
-      bit_size: 1
-    - name: CTAMP3F
-      description: Clear tamper 3 detection flag
-      bit_offset: 2
-      bit_size: 1
-    - name: CITAMP3F
-      description: Clear internal tamper 3 detection flag
-      bit_offset: 18
-      bit_size: 1
-    - name: CITAMP5F
-      description: Clear internal tamper 5 detection flag
-      bit_offset: 20
-      bit_size: 1
-    - name: CITAMP6F
-      description: Clear internal tamper 6 detection flag
-      bit_offset: 21
-      bit_size: 1
-    - name: CITAMP8F
-      description: Clear internal tamper 8 detection flag
-      bit_offset: 23
+      array:
+        len: 3
+        stride: 1
+    - name: CITAMPF
+      description: Clear internal tamper X detection flag
+      bit_offset: 16
      bit_size: 1
+      array:
+        len: 8
+        stride: 1
 fieldset/SR:
  description: TAMP status register
  fields:
-    - name: TAMP1F
-      description: Tamper 1 detection flag
+    - name: TAMPF
+      description: Tamper X detection flag
      bit_offset: 0
      bit_size: 1
-      enum: TAMPF
-    - name: TAMP2F
-      description: Tamper 2 detection flag
-      bit_offset: 1
+      array:
+        len: 3
+        stride: 1
+    - name: ITAMPF
+      description: Internal tamper X detection flag
+      bit_offset: 16
      bit_size: 1
-      enum: TAMPF
-    - name: TAMP3F
-      description: Tamper 3 detection flag
-      bit_offset: 2
-      bit_size: 1
-      enum: TAMPF
-    - name: ITAMP3F
-      description: Internal tamper 3 detection flag
-      bit_offset: 18
-      bit_size: 1
-      enum: ITAMPF
-    - name: ITAMP5F
-      description: Internal tamper 5 detection flag
-      bit_offset: 20
-      bit_size: 1
-      enum: ITAMPF
-    - name: ITAMP6F
-      description: Internal tamper 6 detection flag
-      bit_offset: 21
-      bit_size: 1
-      enum: ITAMPF
-    - name: ITAMP8F
-      description: Internal tamper 8 detection flag
-      bit_offset: 23
-      bit_size: 1
-      enum: ITAMPF
+      array:
+        len: 8
+        stride: 1
 enum/BKERASE:
  bit_size: 1
  variants:
    - name: Reset
      description: Reset backup registers
      value: 1
-enum/ITAMPF:
-  bit_size: 1
-  variants:
-    - name: Idle
-      description: No tamper detected
-      value: 0
-    - name: Tamper
-      description: Internal tamper detected
-      value: 1
-enum/ITAMPMF:
-  bit_size: 1
-  variants:
-    - name: Idle
-      description: No tamper detected - Masked
-      value: 0
-    - name: Tamper
-      description: Internal tamper detected - Masked
-      value: 1
-enum/ITAMPNOER:
-  bit_size: 1
-  variants:
-    - name: Erase
-      description: Internal tamper x event erases the backup registers
-      value: 0
-    - name: NotErase
-      description: Internal tamper x event does not erase the backup registers
-      value: 1
-enum/TAMPF:
-  bit_size: 1
-  variants:
-    - name: Idle
-      description: No tamper detected
-      value: 0
-    - name: Tamper
-      description: Tamper detected
-      value: 1
 enum/TAMPFLT:
  bit_size: 2
  variants:
@ -419,15 +267,6 @@ enum/TAMPMSK:
    - name: ResetByHardware
      description: Tamper x event generates a trigger event. TAMPxF is masked and internally cleared by hardware. The backup registers are not erased. The tamper x interrupt must not be enabled when TAMP3MSK is set
      value: 1
-enum/TAMPNOER:
-  bit_size: 1
-  variants:
-    - name: Erase
-      description: Tamper x event erases the backup registers
-      value: 0
-    - name: NotErase
-      description: Tamper x event does not erase the backup registers
-      value: 1
 enum/TAMPPRCH:
  bit_size: 2
  variants: