diff --git a/data/registers/opamp_h5.yaml b/data/registers/opamp_h5.yaml
index 07fb6bb..3bb9441 100644
--- a/data/registers/opamp_h5.yaml
+++ b/data/registers/opamp_h5.yaml
@@ -58,6 +58,7 @@ fieldset/CSR:
     description: User trimming enable.
     bit_offset: 18
     bit_size: 1
+    enum: USERTRIM
   - name: TSTREF
     description: OPAMP calibration reference voltage output control (reserved for test).
     bit_offset: 29
@@ -122,6 +123,15 @@ enum/CALSEL:
   - name: Percent90
     description: VREFOPAMP=90% VDDA.
     value: 3
+enum/FORCE_VP:
+  bit_size: 1
+  variants:
+  - name: NormalOperating
+    description: Normal operating mode. Non-inverting input connected to inputs.
+    value: 0
+  - name: CalibrationVerification
+    description: Calibration verification mode. Non-inverting input connected to calibration reference voltage.
+    value: 1
 enum/OPAHSM:
   bit_size: 1
   variants:
@@ -131,6 +141,15 @@ enum/OPAHSM:
   - name: HighSpeed
     description: operational amplifier in high-speed mode
     value: 1
+enum/USERTRIM:
+  bit_size: 1
+  variants:
+  - name: Factory
+    description: \'factory\' trim code used
+    value: 0
+  - name: User
+    description: \'user\' trim code used
+    value: 1
 enum/VM_SEL:
   bit_size: 2
   variants:
@@ -149,18 +168,12 @@ enum/VM_SEL:
 enum/VP_SEL:
   bit_size: 2
   variants:
-  - name: Gpio
-    description: GPIO connected to OPAMPx_VINP
+  - name: GpioInp0
+    description: GPIO INP0 connected to OPAMP_VINP
     value: 0
   - name: DacOut
     description: dac_outx connected to OPAMPx_VINP
     value: 1
-enum/FORCE_VP:
-  bit_size: 1
-  variants:
-  - name: NormalOperating
-    description: Normal operating mode. Non-inverting input connected to inputs.
-    value: 0
-  - name: CalibrationVerification
-    description: Calibration verification mode. Non-inverting input connected to calibration reference voltage.
-    value: 1
\ No newline at end of file
+  - name: GpioInp2
+    description: GPIO INP2 is connected to OPAMP_VINP
+    value: 2
diff --git a/data/registers/opamp_h7.yaml b/data/registers/opamp_h7.yaml
index 07fb6bb..fbe797e 100644
--- a/data/registers/opamp_h7.yaml
+++ b/data/registers/opamp_h7.yaml
@@ -58,6 +58,7 @@ fieldset/CSR:
     description: User trimming enable.
     bit_offset: 18
     bit_size: 1
+    enum: USERTRIM
   - name: TSTREF
     description: OPAMP calibration reference voltage output control (reserved for test).
     bit_offset: 29
@@ -122,6 +123,15 @@ enum/CALSEL:
   - name: Percent90
     description: VREFOPAMP=90% VDDA.
     value: 3
+enum/FORCE_VP:
+  bit_size: 1
+  variants:
+  - name: NormalOperating
+    description: Normal operating mode. Non-inverting input connected to inputs.
+    value: 0
+  - name: CalibrationVerification
+    description: Calibration verification mode. Non-inverting input connected to calibration reference voltage.
+    value: 1
 enum/OPAHSM:
   bit_size: 1
   variants:
@@ -131,6 +141,15 @@ enum/OPAHSM:
   - name: HighSpeed
     description: operational amplifier in high-speed mode
     value: 1
+enum/USERTRIM:
+  bit_size: 1
+  variants:
+  - name: Factory
+    description: \'factory\' trim code used
+    value: 0
+  - name: User
+    description: \'user\' trim code used
+    value: 1
 enum/VM_SEL:
   bit_size: 2
   variants:
@@ -155,12 +174,3 @@ enum/VP_SEL:
   - name: DacOut
     description: dac_outx connected to OPAMPx_VINP
     value: 1
-enum/FORCE_VP:
-  bit_size: 1
-  variants:
-  - name: NormalOperating
-    description: Normal operating mode. Non-inverting input connected to inputs.
-    value: 0
-  - name: CalibrationVerification
-    description: Calibration verification mode. Non-inverting input connected to calibration reference voltage.
-    value: 1
\ No newline at end of file