diff --git a/data/chips/STM32H723VE.json b/data/chips/STM32H723VE.json
index e0bcb24..2178617 100644
--- a/data/chips/STM32H723VE.json
+++ b/data/chips/STM32H723VE.json
@@ -6986,7 +6986,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7226,11 +7226,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7281,11 +7276,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7331,11 +7321,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7381,11 +7366,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7498,11 +7478,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7570,11 +7545,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7644,7 +7614,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7776,7 +7746,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7858,7 +7828,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7940,7 +7910,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8072,7 +8042,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8184,7 +8154,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8284,11 +8254,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8334,11 +8299,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8386,7 +8346,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H723VG.json b/data/chips/STM32H723VG.json
index fa4c0cf..0653969 100644
--- a/data/chips/STM32H723VG.json
+++ b/data/chips/STM32H723VG.json
@@ -6986,7 +6986,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7226,11 +7226,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7281,11 +7276,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7331,11 +7321,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7381,11 +7366,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7498,11 +7478,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7570,11 +7545,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7644,7 +7614,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7776,7 +7746,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7858,7 +7828,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7940,7 +7910,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8072,7 +8042,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8184,7 +8154,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8284,11 +8254,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8334,11 +8299,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8386,7 +8346,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H723ZE.json b/data/chips/STM32H723ZE.json
index 5191299..414c9aa 100644
--- a/data/chips/STM32H723ZE.json
+++ b/data/chips/STM32H723ZE.json
@@ -8389,7 +8389,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8649,11 +8649,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8704,11 +8699,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8759,11 +8749,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8814,11 +8799,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8931,11 +8911,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9018,11 +8993,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9107,7 +9077,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9239,7 +9209,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9381,7 +9351,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9488,7 +9458,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9620,7 +9590,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9732,7 +9702,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9832,11 +9802,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9882,11 +9847,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9934,7 +9894,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H723ZG.json b/data/chips/STM32H723ZG.json
index 820fbc8..03be0b5 100644
--- a/data/chips/STM32H723ZG.json
+++ b/data/chips/STM32H723ZG.json
@@ -8389,7 +8389,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8649,11 +8649,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8704,11 +8699,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8759,11 +8749,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8814,11 +8799,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8931,11 +8911,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9018,11 +8993,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9107,7 +9077,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9239,7 +9209,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9381,7 +9351,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9488,7 +9458,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9620,7 +9590,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9732,7 +9702,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9832,11 +9802,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9882,11 +9847,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9934,7 +9894,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H725AE.json b/data/chips/STM32H725AE.json
index b38f044..20a989d 100644
--- a/data/chips/STM32H725AE.json
+++ b/data/chips/STM32H725AE.json
@@ -7869,7 +7869,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8129,11 +8129,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8184,11 +8179,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8239,11 +8229,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8294,11 +8279,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8411,11 +8391,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8498,11 +8473,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8587,7 +8557,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8719,7 +8689,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8861,7 +8831,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8968,7 +8938,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9100,7 +9070,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9212,7 +9182,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9327,11 +9297,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9377,11 +9342,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9429,7 +9389,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H725AG.json b/data/chips/STM32H725AG.json
index b891c0b..2323b98 100644
--- a/data/chips/STM32H725AG.json
+++ b/data/chips/STM32H725AG.json
@@ -7875,7 +7875,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8135,11 +8135,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8190,11 +8185,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8245,11 +8235,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8300,11 +8285,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8417,11 +8397,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8504,11 +8479,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8593,7 +8563,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8725,7 +8695,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8867,7 +8837,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8974,7 +8944,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9106,7 +9076,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9218,7 +9188,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9333,11 +9303,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9383,11 +9348,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9435,7 +9395,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H725IE.json b/data/chips/STM32H725IE.json
index d0c89f7..a52a033 100644
--- a/data/chips/STM32H725IE.json
+++ b/data/chips/STM32H725IE.json
@@ -9355,7 +9355,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9660,11 +9660,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9725,11 +9720,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9780,11 +9770,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9835,11 +9820,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9952,11 +9932,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -10039,11 +10014,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -10128,7 +10098,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10260,7 +10230,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10402,7 +10372,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10509,7 +10479,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -10641,7 +10611,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -10753,7 +10723,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10873,11 +10843,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10923,11 +10888,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10975,7 +10935,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H725IG.json b/data/chips/STM32H725IG.json
index f2a542f..13212e5 100644
--- a/data/chips/STM32H725IG.json
+++ b/data/chips/STM32H725IG.json
@@ -9361,7 +9361,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9666,11 +9666,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9731,11 +9726,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9786,11 +9776,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9841,11 +9826,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9958,11 +9938,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -10045,11 +10020,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -10134,7 +10104,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10266,7 +10236,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10408,7 +10378,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10515,7 +10485,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -10647,7 +10617,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -10759,7 +10729,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10879,11 +10849,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10929,11 +10894,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10981,7 +10941,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H725RE.json b/data/chips/STM32H725RE.json
index db2d44f..5652877 100644
--- a/data/chips/STM32H725RE.json
+++ b/data/chips/STM32H725RE.json
@@ -4541,7 +4541,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -4711,11 +4711,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4766,11 +4761,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4816,11 +4806,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4866,11 +4851,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -4963,11 +4943,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5035,11 +5010,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5109,7 +5079,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5236,7 +5206,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5318,7 +5288,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5400,7 +5370,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5527,7 +5497,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5614,7 +5584,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5714,11 +5684,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5764,11 +5729,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5816,7 +5776,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H725RG.json b/data/chips/STM32H725RG.json
index 411e671..35dacf3 100644
--- a/data/chips/STM32H725RG.json
+++ b/data/chips/STM32H725RG.json
@@ -4547,7 +4547,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -4717,11 +4717,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4772,11 +4767,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4822,11 +4812,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4872,11 +4857,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -4969,11 +4949,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5041,11 +5016,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5115,7 +5085,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5242,7 +5212,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5324,7 +5294,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5406,7 +5376,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5533,7 +5503,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5620,7 +5590,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5720,11 +5690,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5770,11 +5735,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5822,7 +5782,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H725VE.json b/data/chips/STM32H725VE.json
index 33473e5..349c85f 100644
--- a/data/chips/STM32H725VE.json
+++ b/data/chips/STM32H725VE.json
@@ -6831,7 +6831,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7036,11 +7036,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7091,11 +7086,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7141,11 +7131,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7191,11 +7176,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7308,11 +7288,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7380,11 +7355,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7454,7 +7424,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7586,7 +7556,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7668,7 +7638,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7750,7 +7720,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7882,7 +7852,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7994,7 +7964,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8094,11 +8064,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8144,11 +8109,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8196,7 +8156,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H725VG.json b/data/chips/STM32H725VG.json
index 3536970..d9a157d 100644
--- a/data/chips/STM32H725VG.json
+++ b/data/chips/STM32H725VG.json
@@ -7533,7 +7533,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7738,11 +7738,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7793,11 +7788,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7843,11 +7833,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7893,11 +7878,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8010,11 +7990,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8082,11 +8057,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8156,7 +8126,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8288,7 +8258,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8370,7 +8340,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8452,7 +8422,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8584,7 +8554,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8696,7 +8666,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8796,11 +8766,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8846,11 +8811,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8898,7 +8858,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H725ZE.json b/data/chips/STM32H725ZE.json
index 51c4d4e..cd7daeb 100644
--- a/data/chips/STM32H725ZE.json
+++ b/data/chips/STM32H725ZE.json
@@ -7256,7 +7256,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7496,11 +7496,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7551,11 +7546,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7606,11 +7596,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7661,11 +7646,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7778,11 +7758,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7865,11 +7840,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7954,7 +7924,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8086,7 +8056,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8203,7 +8173,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8295,7 +8265,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8427,7 +8397,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8539,7 +8509,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8639,11 +8609,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8689,11 +8654,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8741,7 +8701,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H725ZG.json b/data/chips/STM32H725ZG.json
index 5c90633..050153a 100644
--- a/data/chips/STM32H725ZG.json
+++ b/data/chips/STM32H725ZG.json
@@ -7262,7 +7262,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7502,11 +7502,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7557,11 +7552,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7612,11 +7602,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7667,11 +7652,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7784,11 +7764,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7871,11 +7846,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7960,7 +7930,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8092,7 +8062,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8209,7 +8179,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8301,7 +8271,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8433,7 +8403,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8545,7 +8515,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8645,11 +8615,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8695,11 +8660,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8747,7 +8707,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H730AB.json b/data/chips/STM32H730AB.json
index 419ecf4..39b3126 100644
--- a/data/chips/STM32H730AB.json
+++ b/data/chips/STM32H730AB.json
@@ -7990,7 +7990,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8250,11 +8250,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8305,11 +8300,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8360,11 +8350,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8415,11 +8400,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8532,11 +8512,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8619,11 +8594,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8708,7 +8678,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8840,7 +8810,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8982,7 +8952,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9089,7 +9059,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9221,7 +9191,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9333,7 +9303,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9448,11 +9418,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9498,11 +9463,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9550,7 +9510,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H730IB.json b/data/chips/STM32H730IB.json
index 0e4db14..84d0cd4 100644
--- a/data/chips/STM32H730IB.json
+++ b/data/chips/STM32H730IB.json
@@ -9476,7 +9476,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9781,11 +9781,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9846,11 +9841,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9901,11 +9891,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9956,11 +9941,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -10073,11 +10053,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -10160,11 +10135,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -10249,7 +10219,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10381,7 +10351,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10523,7 +10493,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10630,7 +10600,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -10762,7 +10732,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -10874,7 +10844,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10994,11 +10964,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -11044,11 +11009,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -11096,7 +11056,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H730VB.json b/data/chips/STM32H730VB.json
index a15dbeb..b085a4b 100644
--- a/data/chips/STM32H730VB.json
+++ b/data/chips/STM32H730VB.json
@@ -7101,7 +7101,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7341,11 +7341,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7396,11 +7391,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7446,11 +7436,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7496,11 +7481,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7613,11 +7593,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7685,11 +7660,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7759,7 +7729,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7891,7 +7861,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7973,7 +7943,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8055,7 +8025,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8187,7 +8157,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8299,7 +8269,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8399,11 +8369,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8449,11 +8414,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8501,7 +8461,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H730ZB.json b/data/chips/STM32H730ZB.json
index bec889f..fde8b6a 100644
--- a/data/chips/STM32H730ZB.json
+++ b/data/chips/STM32H730ZB.json
@@ -8504,7 +8504,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8764,11 +8764,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8819,11 +8814,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8874,11 +8864,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8929,11 +8914,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9046,11 +9026,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9133,11 +9108,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9222,7 +9192,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9354,7 +9324,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9496,7 +9466,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9603,7 +9573,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9735,7 +9705,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9847,7 +9817,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9947,11 +9917,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9997,11 +9962,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10049,7 +10009,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H733VG.json b/data/chips/STM32H733VG.json
index ba8ba25..762f8a8 100644
--- a/data/chips/STM32H733VG.json
+++ b/data/chips/STM32H733VG.json
@@ -7101,7 +7101,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7341,11 +7341,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7396,11 +7391,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7446,11 +7436,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7496,11 +7481,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7613,11 +7593,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7685,11 +7660,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7759,7 +7729,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7891,7 +7861,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7973,7 +7943,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8055,7 +8025,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8187,7 +8157,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8299,7 +8269,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8399,11 +8369,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8449,11 +8414,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8501,7 +8461,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H733ZG.json b/data/chips/STM32H733ZG.json
index 64e9c70..7114924 100644
--- a/data/chips/STM32H733ZG.json
+++ b/data/chips/STM32H733ZG.json
@@ -8504,7 +8504,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8764,11 +8764,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8819,11 +8814,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8874,11 +8864,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8929,11 +8914,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9046,11 +9026,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9133,11 +9108,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9222,7 +9192,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9354,7 +9324,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9496,7 +9466,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9603,7 +9573,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9735,7 +9705,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9847,7 +9817,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9947,11 +9917,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9997,11 +9962,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10049,7 +10009,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H735AG.json b/data/chips/STM32H735AG.json
index 74c3b82..82ec88d 100644
--- a/data/chips/STM32H735AG.json
+++ b/data/chips/STM32H735AG.json
@@ -7995,7 +7995,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8255,11 +8255,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8310,11 +8305,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8365,11 +8355,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8420,11 +8405,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8537,11 +8517,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8624,11 +8599,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8713,7 +8683,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8845,7 +8815,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8987,7 +8957,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9094,7 +9064,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9226,7 +9196,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9338,7 +9308,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9453,11 +9423,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9503,11 +9468,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9555,7 +9515,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H735IG.json b/data/chips/STM32H735IG.json
index 5bfef6c..26124a2 100644
--- a/data/chips/STM32H735IG.json
+++ b/data/chips/STM32H735IG.json
@@ -9481,7 +9481,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9786,11 +9786,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9851,11 +9846,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9906,11 +9896,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9961,11 +9946,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -10078,11 +10058,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -10165,11 +10140,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -10254,7 +10224,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10386,7 +10356,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10528,7 +10498,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10635,7 +10605,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -10767,7 +10737,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -10879,7 +10849,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10999,11 +10969,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -11049,11 +11014,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -11101,7 +11061,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H735RG.json b/data/chips/STM32H735RG.json
index 955653c..be39aac 100644
--- a/data/chips/STM32H735RG.json
+++ b/data/chips/STM32H735RG.json
@@ -4572,7 +4572,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -4742,11 +4742,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4797,11 +4792,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4847,11 +4837,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4897,11 +4882,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -4994,11 +4974,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5066,11 +5041,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5140,7 +5110,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5267,7 +5237,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5349,7 +5319,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5431,7 +5401,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5558,7 +5528,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5645,7 +5615,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5745,11 +5715,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5795,11 +5760,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5847,7 +5807,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H735VG.json b/data/chips/STM32H735VG.json
index 2bd824e..b18354e 100644
--- a/data/chips/STM32H735VG.json
+++ b/data/chips/STM32H735VG.json
@@ -7653,7 +7653,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7858,11 +7858,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7913,11 +7908,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7963,11 +7953,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8013,11 +7998,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8130,11 +8110,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8202,11 +8177,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8276,7 +8246,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8408,7 +8378,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8490,7 +8460,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8572,7 +8542,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8704,7 +8674,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8816,7 +8786,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8916,11 +8886,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8966,11 +8931,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9018,7 +8978,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H735ZG.json b/data/chips/STM32H735ZG.json
index 06bd716..2e4944e 100644
--- a/data/chips/STM32H735ZG.json
+++ b/data/chips/STM32H735ZG.json
@@ -7382,7 +7382,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7622,11 +7622,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7677,11 +7672,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7732,11 +7722,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7787,11 +7772,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7904,11 +7884,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7991,11 +7966,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8080,7 +8050,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8212,7 +8182,7 @@
           "address": 1073799168,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8329,7 +8299,7 @@
           "address": 1073800192,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8421,7 +8391,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8553,7 +8523,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8665,7 +8635,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8765,11 +8735,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8815,11 +8780,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8867,7 +8827,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H742AG.json b/data/chips/STM32H742AG.json
index d1abbe2..e1c3d8a 100644
--- a/data/chips/STM32H742AG.json
+++ b/data/chips/STM32H742AG.json
@@ -7023,7 +7023,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7278,11 +7278,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7333,11 +7328,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7388,11 +7378,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7443,11 +7428,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7550,11 +7530,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7637,11 +7612,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7726,7 +7696,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7858,7 +7828,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7990,7 +7960,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8102,7 +8072,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8222,11 +8192,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8272,11 +8237,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8324,7 +8284,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H742AI.json b/data/chips/STM32H742AI.json
index 7b84aae..a3aa289 100644
--- a/data/chips/STM32H742AI.json
+++ b/data/chips/STM32H742AI.json
@@ -7023,7 +7023,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7278,11 +7278,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7333,11 +7328,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7388,11 +7378,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7443,11 +7428,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7550,11 +7530,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7637,11 +7612,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7726,7 +7696,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7858,7 +7828,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7990,7 +7960,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8102,7 +8072,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8222,11 +8192,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8272,11 +8237,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8324,7 +8284,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H742BG.json b/data/chips/STM32H742BG.json
index 299b3f0..37a90c3 100644
--- a/data/chips/STM32H742BG.json
+++ b/data/chips/STM32H742BG.json
@@ -7450,7 +7450,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7750,11 +7750,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7815,11 +7810,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7870,11 +7860,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7925,11 +7910,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8032,11 +8012,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8119,11 +8094,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8208,7 +8178,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8340,7 +8310,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8472,7 +8442,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8584,7 +8554,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8709,11 +8679,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8759,11 +8724,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8811,7 +8771,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H742BI.json b/data/chips/STM32H742BI.json
index ef7179b..9f35aae 100644
--- a/data/chips/STM32H742BI.json
+++ b/data/chips/STM32H742BI.json
@@ -7450,7 +7450,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7750,11 +7750,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7815,11 +7810,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7870,11 +7860,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7925,11 +7910,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8032,11 +8012,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8119,11 +8094,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8208,7 +8178,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8340,7 +8310,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8472,7 +8442,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8584,7 +8554,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8709,11 +8679,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8759,11 +8724,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8811,7 +8771,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H742IG.json b/data/chips/STM32H742IG.json
index 3ef8187..157efef 100644
--- a/data/chips/STM32H742IG.json
+++ b/data/chips/STM32H742IG.json
@@ -8445,7 +8445,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8700,11 +8700,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8765,11 +8760,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8820,11 +8810,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8875,11 +8860,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8982,11 +8962,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9069,11 +9044,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9158,7 +9128,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9290,7 +9260,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9422,7 +9392,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9534,7 +9504,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9659,11 +9629,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9709,11 +9674,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9761,7 +9721,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H742II.json b/data/chips/STM32H742II.json
index 8d52916..562d51e 100644
--- a/data/chips/STM32H742II.json
+++ b/data/chips/STM32H742II.json
@@ -8445,7 +8445,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8700,11 +8700,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8765,11 +8760,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8820,11 +8810,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8875,11 +8860,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8982,11 +8962,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9069,11 +9044,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9158,7 +9128,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9290,7 +9260,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9422,7 +9392,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9534,7 +9504,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9659,11 +9629,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9709,11 +9674,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9761,7 +9721,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H742VG.json b/data/chips/STM32H742VG.json
index ad20427..ef3698a 100644
--- a/data/chips/STM32H742VG.json
+++ b/data/chips/STM32H742VG.json
@@ -6344,7 +6344,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6579,11 +6579,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6634,11 +6629,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6684,11 +6674,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6734,11 +6719,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6841,11 +6821,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6913,11 +6888,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6987,7 +6957,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7119,7 +7089,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7251,7 +7221,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7363,7 +7333,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7463,11 +7433,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7513,11 +7478,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7565,7 +7525,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H742VI.json b/data/chips/STM32H742VI.json
index 32ea1c8..4a06b4b 100644
--- a/data/chips/STM32H742VI.json
+++ b/data/chips/STM32H742VI.json
@@ -6344,7 +6344,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6579,11 +6579,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6634,11 +6629,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6684,11 +6674,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6734,11 +6719,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6841,11 +6821,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6913,11 +6888,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6987,7 +6957,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7119,7 +7089,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7251,7 +7221,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7363,7 +7333,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7463,11 +7433,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7513,11 +7478,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7565,7 +7525,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H742XG.json b/data/chips/STM32H742XG.json
index a7c0053..bc61051 100644
--- a/data/chips/STM32H742XG.json
+++ b/data/chips/STM32H742XG.json
@@ -7856,7 +7856,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8156,11 +8156,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8221,11 +8216,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8276,11 +8266,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8331,11 +8316,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8438,11 +8418,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8525,11 +8500,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8614,7 +8584,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8746,7 +8716,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8878,7 +8848,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8990,7 +8960,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9115,11 +9085,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9165,11 +9130,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9217,7 +9177,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H742XI.json b/data/chips/STM32H742XI.json
index ae8abe2..b83c1e9 100644
--- a/data/chips/STM32H742XI.json
+++ b/data/chips/STM32H742XI.json
@@ -7856,7 +7856,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8156,11 +8156,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8221,11 +8216,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8276,11 +8266,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8331,11 +8316,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8438,11 +8418,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8525,11 +8500,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8614,7 +8584,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8746,7 +8716,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8878,7 +8848,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8990,7 +8960,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9115,11 +9085,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9165,11 +9130,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9217,7 +9177,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H742ZG.json b/data/chips/STM32H742ZG.json
index a4a8622..b21ebb1 100644
--- a/data/chips/STM32H742ZG.json
+++ b/data/chips/STM32H742ZG.json
@@ -6616,7 +6616,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6871,11 +6871,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6926,11 +6921,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6981,11 +6971,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7036,11 +7021,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7143,11 +7123,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7230,11 +7205,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7319,7 +7289,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7451,7 +7421,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7583,7 +7553,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7695,7 +7665,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7795,11 +7765,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7845,11 +7810,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7897,7 +7857,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H742ZI.json b/data/chips/STM32H742ZI.json
index fae716b..39df1de 100644
--- a/data/chips/STM32H742ZI.json
+++ b/data/chips/STM32H742ZI.json
@@ -6616,7 +6616,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6871,11 +6871,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6926,11 +6921,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6981,11 +6971,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7036,11 +7021,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7143,11 +7123,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7230,11 +7205,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7319,7 +7289,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7451,7 +7421,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7583,7 +7553,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7695,7 +7665,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7795,11 +7765,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7845,11 +7810,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7897,7 +7857,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H743AG.json b/data/chips/STM32H743AG.json
index d576fb9..fef0e71 100644
--- a/data/chips/STM32H743AG.json
+++ b/data/chips/STM32H743AG.json
@@ -7452,7 +7452,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7707,11 +7707,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7762,11 +7757,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7817,11 +7807,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7872,11 +7857,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7979,11 +7959,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8066,11 +8041,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8155,7 +8125,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8287,7 +8257,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8419,7 +8389,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8531,7 +8501,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8651,11 +8621,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8701,11 +8666,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8753,7 +8713,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H743AI.json b/data/chips/STM32H743AI.json
index db13b6d..2505c85 100644
--- a/data/chips/STM32H743AI.json
+++ b/data/chips/STM32H743AI.json
@@ -7452,7 +7452,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7707,11 +7707,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7762,11 +7757,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7817,11 +7807,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7872,11 +7857,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7979,11 +7959,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8066,11 +8041,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8155,7 +8125,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8287,7 +8257,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8419,7 +8389,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8531,7 +8501,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8651,11 +8621,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8701,11 +8666,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8753,7 +8713,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H743BG.json b/data/chips/STM32H743BG.json
index 6156658..75519ca 100644
--- a/data/chips/STM32H743BG.json
+++ b/data/chips/STM32H743BG.json
@@ -8059,7 +8059,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8359,11 +8359,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8424,11 +8419,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8479,11 +8469,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8534,11 +8519,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8641,11 +8621,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8728,11 +8703,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8817,7 +8787,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8949,7 +8919,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9081,7 +9051,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9193,7 +9163,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9318,11 +9288,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9368,11 +9333,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9420,7 +9380,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H743BI.json b/data/chips/STM32H743BI.json
index 4930ea9..1ecfea0 100644
--- a/data/chips/STM32H743BI.json
+++ b/data/chips/STM32H743BI.json
@@ -8059,7 +8059,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8359,11 +8359,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8424,11 +8419,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8479,11 +8469,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8534,11 +8519,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8641,11 +8621,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8728,11 +8703,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8817,7 +8787,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8949,7 +8919,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9081,7 +9051,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9193,7 +9163,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9318,11 +9288,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9368,11 +9333,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9420,7 +9380,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H743IG.json b/data/chips/STM32H743IG.json
index 69907ac..5b3b788 100644
--- a/data/chips/STM32H743IG.json
+++ b/data/chips/STM32H743IG.json
@@ -8894,7 +8894,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9149,11 +9149,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9214,11 +9209,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9269,11 +9259,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9324,11 +9309,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9431,11 +9411,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9518,11 +9493,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9607,7 +9577,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9739,7 +9709,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9871,7 +9841,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9983,7 +9953,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10108,11 +10078,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10158,11 +10123,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10210,7 +10170,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H743II.json b/data/chips/STM32H743II.json
index b730136..165b22e 100644
--- a/data/chips/STM32H743II.json
+++ b/data/chips/STM32H743II.json
@@ -8894,7 +8894,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9149,11 +9149,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9214,11 +9209,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9269,11 +9259,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9324,11 +9309,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9431,11 +9411,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9518,11 +9493,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9607,7 +9577,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9739,7 +9709,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9871,7 +9841,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9983,7 +9953,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10108,11 +10078,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10158,11 +10123,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10210,7 +10170,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H743VG.json b/data/chips/STM32H743VG.json
index ef88821..20d92c4 100644
--- a/data/chips/STM32H743VG.json
+++ b/data/chips/STM32H743VG.json
@@ -6628,7 +6628,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6863,11 +6863,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6918,11 +6913,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6968,11 +6958,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7018,11 +7003,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7125,11 +7105,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7197,11 +7172,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7271,7 +7241,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7403,7 +7373,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7535,7 +7505,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7647,7 +7617,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7747,11 +7717,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7797,11 +7762,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7849,7 +7809,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H743VI.json b/data/chips/STM32H743VI.json
index 29ba6c0..5afbcca 100644
--- a/data/chips/STM32H743VI.json
+++ b/data/chips/STM32H743VI.json
@@ -6628,7 +6628,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6863,11 +6863,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6918,11 +6913,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6968,11 +6958,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7018,11 +7003,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7125,11 +7105,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7197,11 +7172,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7271,7 +7241,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7403,7 +7373,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7535,7 +7505,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7647,7 +7617,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7747,11 +7717,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7797,11 +7762,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7849,7 +7809,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H743XG.json b/data/chips/STM32H743XG.json
index 8631596..db82967 100644
--- a/data/chips/STM32H743XG.json
+++ b/data/chips/STM32H743XG.json
@@ -8465,7 +8465,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8765,11 +8765,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8830,11 +8825,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8885,11 +8875,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8940,11 +8925,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9047,11 +9027,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9134,11 +9109,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9223,7 +9193,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9355,7 +9325,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9487,7 +9457,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9599,7 +9569,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9724,11 +9694,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9774,11 +9739,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9826,7 +9786,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H743XI.json b/data/chips/STM32H743XI.json
index 905b3df..6592ff3 100644
--- a/data/chips/STM32H743XI.json
+++ b/data/chips/STM32H743XI.json
@@ -8465,7 +8465,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8765,11 +8765,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8830,11 +8825,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8885,11 +8875,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8940,11 +8925,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9047,11 +9027,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9134,11 +9109,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9223,7 +9193,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9355,7 +9325,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9487,7 +9457,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9599,7 +9569,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9724,11 +9694,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9774,11 +9739,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9826,7 +9786,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H743ZG.json b/data/chips/STM32H743ZG.json
index c3965b6..7a404dc 100644
--- a/data/chips/STM32H743ZG.json
+++ b/data/chips/STM32H743ZG.json
@@ -6955,7 +6955,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7210,11 +7210,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7265,11 +7260,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7320,11 +7310,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7375,11 +7360,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7482,11 +7462,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7569,11 +7544,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7658,7 +7628,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7790,7 +7760,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7922,7 +7892,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8034,7 +8004,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8134,11 +8104,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8184,11 +8149,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8236,7 +8196,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H743ZI.json b/data/chips/STM32H743ZI.json
index 36b103b..069d222 100644
--- a/data/chips/STM32H743ZI.json
+++ b/data/chips/STM32H743ZI.json
@@ -6955,7 +6955,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7210,11 +7210,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7265,11 +7260,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7320,11 +7310,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7375,11 +7360,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7482,11 +7462,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7569,11 +7544,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7658,7 +7628,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7790,7 +7760,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7922,7 +7892,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8034,7 +8004,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8134,11 +8104,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8184,11 +8149,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8236,7 +8196,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H745BG.json b/data/chips/STM32H745BG.json
index fdf9909..98f8a88 100644
--- a/data/chips/STM32H745BG.json
+++ b/data/chips/STM32H745BG.json
@@ -7940,7 +7940,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8240,11 +8240,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8305,11 +8300,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8360,11 +8350,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8415,11 +8400,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8522,11 +8502,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8609,11 +8584,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8698,7 +8668,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8830,7 +8800,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8962,7 +8932,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9074,7 +9044,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9199,11 +9169,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9249,11 +9214,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9301,7 +9261,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -17860,7 +17820,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18160,11 +18120,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18225,11 +18180,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18280,11 +18230,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18335,11 +18280,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18442,11 +18382,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18529,11 +18464,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18618,7 +18548,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -18750,7 +18680,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -18882,7 +18812,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -18994,7 +18924,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19119,11 +19049,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19169,11 +19094,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19221,7 +19141,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H745BI.json b/data/chips/STM32H745BI.json
index f5c2356..03cd79a 100644
--- a/data/chips/STM32H745BI.json
+++ b/data/chips/STM32H745BI.json
@@ -7940,7 +7940,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8240,11 +8240,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8305,11 +8300,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8360,11 +8350,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8415,11 +8400,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8522,11 +8502,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8609,11 +8584,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8698,7 +8668,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8830,7 +8800,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8962,7 +8932,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9074,7 +9044,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9199,11 +9169,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9249,11 +9214,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9301,7 +9261,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -17860,7 +17820,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18160,11 +18120,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18225,11 +18180,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18280,11 +18230,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18335,11 +18280,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18442,11 +18382,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18529,11 +18464,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18618,7 +18548,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -18750,7 +18680,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -18882,7 +18812,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -18994,7 +18924,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19119,11 +19049,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19169,11 +19094,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19221,7 +19141,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H745IG.json b/data/chips/STM32H745IG.json
index 3cd5125..5553f9a 100644
--- a/data/chips/STM32H745IG.json
+++ b/data/chips/STM32H745IG.json
@@ -8782,7 +8782,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9082,11 +9082,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9147,11 +9142,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9202,11 +9192,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9257,11 +9242,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9364,11 +9344,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9451,11 +9426,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9540,7 +9510,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9672,7 +9642,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9804,7 +9774,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9916,7 +9886,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10036,11 +10006,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10086,11 +10051,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10138,7 +10098,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18444,7 +18404,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18744,11 +18704,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18809,11 +18764,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18864,11 +18814,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18919,11 +18864,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19026,11 +18966,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19113,11 +19048,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19202,7 +19132,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19334,7 +19264,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19466,7 +19396,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19578,7 +19508,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19698,11 +19628,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19748,11 +19673,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19800,7 +19720,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H745II.json b/data/chips/STM32H745II.json
index c03f842..6311dd1 100644
--- a/data/chips/STM32H745II.json
+++ b/data/chips/STM32H745II.json
@@ -8782,7 +8782,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9082,11 +9082,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9147,11 +9142,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9202,11 +9192,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9257,11 +9242,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9364,11 +9344,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9451,11 +9426,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9540,7 +9510,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9672,7 +9642,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9804,7 +9774,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9916,7 +9886,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10036,11 +10006,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10086,11 +10051,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10138,7 +10098,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18444,7 +18404,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18744,11 +18704,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18809,11 +18764,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18864,11 +18814,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18919,11 +18864,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19026,11 +18966,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19113,11 +19048,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19202,7 +19132,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19334,7 +19264,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19466,7 +19396,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19578,7 +19508,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19698,11 +19628,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19748,11 +19673,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19800,7 +19720,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H745XG.json b/data/chips/STM32H745XG.json
index dde111d..9299854 100644
--- a/data/chips/STM32H745XG.json
+++ b/data/chips/STM32H745XG.json
@@ -8456,7 +8456,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8756,11 +8756,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8821,11 +8816,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8876,11 +8866,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8931,11 +8916,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9038,11 +9018,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9125,11 +9100,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9214,7 +9184,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9346,7 +9316,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9478,7 +9448,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9590,7 +9560,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9715,11 +9685,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9765,11 +9730,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9817,7 +9777,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18550,7 +18510,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18850,11 +18810,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18915,11 +18870,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18970,11 +18920,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19025,11 +18970,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19132,11 +19072,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19219,11 +19154,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19308,7 +19238,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19440,7 +19370,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19572,7 +19502,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19684,7 +19614,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19809,11 +19739,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19859,11 +19784,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19911,7 +19831,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H745XI.json b/data/chips/STM32H745XI.json
index f77d1a6..62fdac0 100644
--- a/data/chips/STM32H745XI.json
+++ b/data/chips/STM32H745XI.json
@@ -8456,7 +8456,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8756,11 +8756,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8821,11 +8816,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8876,11 +8866,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8931,11 +8916,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9038,11 +9018,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9125,11 +9100,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9214,7 +9184,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9346,7 +9316,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9478,7 +9448,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9590,7 +9560,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9715,11 +9685,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9765,11 +9730,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9817,7 +9777,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18550,7 +18510,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18850,11 +18810,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18915,11 +18870,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18970,11 +18920,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19025,11 +18970,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19132,11 +19072,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19219,11 +19154,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19308,7 +19238,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19440,7 +19370,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19572,7 +19502,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19684,7 +19614,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19809,11 +19739,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19859,11 +19784,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19911,7 +19831,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H745ZG.json b/data/chips/STM32H745ZG.json
index ae67a47..48bd030 100644
--- a/data/chips/STM32H745ZG.json
+++ b/data/chips/STM32H745ZG.json
@@ -6791,7 +6791,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7026,11 +7026,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7081,11 +7076,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7136,11 +7126,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7191,11 +7176,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7298,11 +7278,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7385,11 +7360,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7474,7 +7444,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7606,7 +7576,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7738,7 +7708,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7850,7 +7820,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7950,11 +7920,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8000,11 +7965,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8052,7 +8012,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -15646,7 +15606,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -15881,11 +15841,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -15936,11 +15891,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -15991,11 +15941,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16046,11 +15991,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16153,11 +16093,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16240,11 +16175,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16329,7 +16259,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -16461,7 +16391,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -16593,7 +16523,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -16705,7 +16635,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -16805,11 +16735,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16855,11 +16780,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16907,7 +16827,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H745ZI.json b/data/chips/STM32H745ZI.json
index 64d1f63..9b51b1a 100644
--- a/data/chips/STM32H745ZI.json
+++ b/data/chips/STM32H745ZI.json
@@ -6791,7 +6791,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7026,11 +7026,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7081,11 +7076,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7136,11 +7126,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7191,11 +7176,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7298,11 +7278,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7385,11 +7360,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7474,7 +7444,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7606,7 +7576,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7738,7 +7708,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7850,7 +7820,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7950,11 +7920,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8000,11 +7965,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8052,7 +8012,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -15646,7 +15606,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -15881,11 +15841,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -15936,11 +15891,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -15991,11 +15941,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16046,11 +15991,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16153,11 +16093,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16240,11 +16175,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16329,7 +16259,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -16461,7 +16391,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -16593,7 +16523,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -16705,7 +16635,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -16805,11 +16735,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16855,11 +16780,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16907,7 +16827,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H747AG.json b/data/chips/STM32H747AG.json
index 9a36922..59147ae 100644
--- a/data/chips/STM32H747AG.json
+++ b/data/chips/STM32H747AG.json
@@ -7144,7 +7144,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7399,11 +7399,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7454,11 +7449,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7509,11 +7499,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7564,11 +7549,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7671,11 +7651,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7758,11 +7733,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7847,7 +7817,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7979,7 +7949,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8111,7 +8081,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8223,7 +8193,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8323,11 +8293,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8373,11 +8338,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8425,7 +8385,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16260,7 +16220,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16515,11 +16475,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16570,11 +16525,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16625,11 +16575,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16680,11 +16625,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16787,11 +16727,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16874,11 +16809,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16963,7 +16893,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -17095,7 +17025,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -17227,7 +17157,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -17339,7 +17269,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -17439,11 +17369,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17489,11 +17414,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17541,7 +17461,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H747AI.json b/data/chips/STM32H747AI.json
index ab7b047..69f9b06 100644
--- a/data/chips/STM32H747AI.json
+++ b/data/chips/STM32H747AI.json
@@ -7144,7 +7144,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7399,11 +7399,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7454,11 +7449,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7509,11 +7499,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7564,11 +7549,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7671,11 +7651,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7758,11 +7733,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7847,7 +7817,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7979,7 +7949,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8111,7 +8081,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8223,7 +8193,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8323,11 +8293,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8373,11 +8338,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8425,7 +8385,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16260,7 +16220,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16515,11 +16475,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16570,11 +16525,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16625,11 +16575,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16680,11 +16625,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16787,11 +16727,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16874,11 +16809,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16963,7 +16893,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -17095,7 +17025,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -17227,7 +17157,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -17339,7 +17269,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -17439,11 +17369,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17489,11 +17414,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17541,7 +17461,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H747BG.json b/data/chips/STM32H747BG.json
index 389798b..0eb8a88 100644
--- a/data/chips/STM32H747BG.json
+++ b/data/chips/STM32H747BG.json
@@ -7923,7 +7923,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8178,11 +8178,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8243,11 +8238,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8298,11 +8288,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8353,11 +8338,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8460,11 +8440,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8547,11 +8522,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8636,7 +8606,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8768,7 +8738,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8900,7 +8870,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9012,7 +8982,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9137,11 +9107,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9187,11 +9152,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9239,7 +9199,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -17714,7 +17674,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -17969,11 +17929,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18034,11 +17989,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18089,11 +18039,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18144,11 +18089,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18251,11 +18191,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18338,11 +18273,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18427,7 +18357,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -18559,7 +18489,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -18691,7 +18621,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -18803,7 +18733,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -18928,11 +18858,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18978,11 +18903,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19030,7 +18950,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H747BI.json b/data/chips/STM32H747BI.json
index 8bc7f7b..07bb056 100644
--- a/data/chips/STM32H747BI.json
+++ b/data/chips/STM32H747BI.json
@@ -7923,7 +7923,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8178,11 +8178,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8243,11 +8238,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8298,11 +8288,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8353,11 +8338,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8460,11 +8440,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8547,11 +8522,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8636,7 +8606,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8768,7 +8738,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8900,7 +8870,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9012,7 +8982,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9137,11 +9107,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9187,11 +9152,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9239,7 +9199,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -17714,7 +17674,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -17969,11 +17929,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18034,11 +17989,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18089,11 +18039,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18144,11 +18089,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18251,11 +18191,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18338,11 +18273,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18427,7 +18357,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -18559,7 +18489,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -18691,7 +18621,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -18803,7 +18733,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -18928,11 +18858,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18978,11 +18903,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19030,7 +18950,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H747IG.json b/data/chips/STM32H747IG.json
index 3c8f2a7..f9b6692 100644
--- a/data/chips/STM32H747IG.json
+++ b/data/chips/STM32H747IG.json
@@ -7186,7 +7186,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7441,11 +7441,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7496,11 +7491,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7551,11 +7541,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7606,11 +7591,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7713,11 +7693,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7800,11 +7775,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7889,7 +7859,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8021,7 +7991,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8153,7 +8123,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8265,7 +8235,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8365,11 +8335,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8415,11 +8380,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8467,7 +8427,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16302,7 +16262,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16557,11 +16517,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16612,11 +16567,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16667,11 +16617,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16722,11 +16667,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16829,11 +16769,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16916,11 +16851,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -17005,7 +16935,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -17137,7 +17067,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -17269,7 +17199,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -17381,7 +17311,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -17481,11 +17411,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17531,11 +17456,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17583,7 +17503,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H747II.json b/data/chips/STM32H747II.json
index 91c4d9e..aaa67fa 100644
--- a/data/chips/STM32H747II.json
+++ b/data/chips/STM32H747II.json
@@ -7186,7 +7186,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7441,11 +7441,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7496,11 +7491,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7551,11 +7541,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7606,11 +7591,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7713,11 +7693,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7800,11 +7775,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7889,7 +7859,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8021,7 +7991,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8153,7 +8123,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8265,7 +8235,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8365,11 +8335,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8415,11 +8380,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8467,7 +8427,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16302,7 +16262,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16557,11 +16517,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16612,11 +16567,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16667,11 +16617,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16722,11 +16667,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16829,11 +16769,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16916,11 +16851,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -17005,7 +16935,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -17137,7 +17067,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -17269,7 +17199,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -17381,7 +17311,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -17481,11 +17411,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17531,11 +17456,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17583,7 +17503,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H747XG.json b/data/chips/STM32H747XG.json
index d417abb..6b26aab 100644
--- a/data/chips/STM32H747XG.json
+++ b/data/chips/STM32H747XG.json
@@ -8509,7 +8509,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8809,11 +8809,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8874,11 +8869,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8929,11 +8919,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8984,11 +8969,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9091,11 +9071,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9178,11 +9153,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9267,7 +9237,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9399,7 +9369,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9531,7 +9501,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9643,7 +9613,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9768,11 +9738,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9818,11 +9783,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9870,7 +9830,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18654,7 +18614,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18954,11 +18914,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19019,11 +18974,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19074,11 +19024,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19129,11 +19074,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19236,11 +19176,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19323,11 +19258,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19412,7 +19342,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19544,7 +19474,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19676,7 +19606,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19788,7 +19718,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19913,11 +19843,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19963,11 +19888,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -20015,7 +19935,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H747XI.json b/data/chips/STM32H747XI.json
index 261e350..c716071 100644
--- a/data/chips/STM32H747XI.json
+++ b/data/chips/STM32H747XI.json
@@ -8509,7 +8509,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8809,11 +8809,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8874,11 +8869,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8929,11 +8919,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8984,11 +8969,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9091,11 +9071,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9178,11 +9153,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9267,7 +9237,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9399,7 +9369,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9531,7 +9501,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9643,7 +9613,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9768,11 +9738,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9818,11 +9783,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9870,7 +9830,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18654,7 +18614,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18954,11 +18914,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19019,11 +18974,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19074,11 +19024,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19129,11 +19074,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19236,11 +19176,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19323,11 +19258,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19412,7 +19342,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19544,7 +19474,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19676,7 +19606,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19788,7 +19718,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19913,11 +19843,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19963,11 +19888,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -20015,7 +19935,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H747ZI.json b/data/chips/STM32H747ZI.json
index 13aad92..a6b4140 100644
--- a/data/chips/STM32H747ZI.json
+++ b/data/chips/STM32H747ZI.json
@@ -6620,7 +6620,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6875,11 +6875,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6930,11 +6925,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6980,11 +6970,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7030,11 +7015,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7137,11 +7117,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7209,11 +7184,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7283,7 +7253,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7415,7 +7385,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7547,7 +7517,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7659,7 +7629,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7759,11 +7729,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7809,11 +7774,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7861,7 +7821,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -15190,7 +15150,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -15445,11 +15405,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -15500,11 +15455,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -15550,11 +15500,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -15600,11 +15545,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -15707,11 +15647,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -15779,11 +15714,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -15853,7 +15783,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -15985,7 +15915,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -16117,7 +16047,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -16229,7 +16159,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -16329,11 +16259,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16379,11 +16304,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16431,7 +16351,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H750IB.json b/data/chips/STM32H750IB.json
index 1f9e774..b56f1bd 100644
--- a/data/chips/STM32H750IB.json
+++ b/data/chips/STM32H750IB.json
@@ -8939,7 +8939,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9194,11 +9194,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9259,11 +9254,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9314,11 +9304,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9369,11 +9354,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9476,11 +9456,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9563,11 +9538,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9652,7 +9622,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9784,7 +9754,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9916,7 +9886,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -10028,7 +9998,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10153,11 +10123,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10203,11 +10168,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10255,7 +10215,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H750VB.json b/data/chips/STM32H750VB.json
index 53dff96..a3ac324 100644
--- a/data/chips/STM32H750VB.json
+++ b/data/chips/STM32H750VB.json
@@ -6067,7 +6067,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6302,11 +6302,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6357,11 +6352,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6407,11 +6397,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6457,11 +6442,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6564,11 +6544,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6636,11 +6611,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6710,7 +6680,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -6842,7 +6812,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -6974,7 +6944,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7086,7 +7056,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7186,11 +7156,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7236,11 +7201,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7288,7 +7248,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H750XB.json b/data/chips/STM32H750XB.json
index 1acce26..94918e5 100644
--- a/data/chips/STM32H750XB.json
+++ b/data/chips/STM32H750XB.json
@@ -8510,7 +8510,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8810,11 +8810,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8875,11 +8870,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8930,11 +8920,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8985,11 +8970,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9092,11 +9072,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9179,11 +9154,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9268,7 +9238,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9400,7 +9370,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9532,7 +9502,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9644,7 +9614,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9769,11 +9739,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9819,11 +9784,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9871,7 +9831,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H750ZB.json b/data/chips/STM32H750ZB.json
index b7ed7f3..c766db6 100644
--- a/data/chips/STM32H750ZB.json
+++ b/data/chips/STM32H750ZB.json
@@ -6988,7 +6988,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7243,11 +7243,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7298,11 +7293,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7353,11 +7343,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7408,11 +7393,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7515,11 +7495,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7602,11 +7577,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7691,7 +7661,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7823,7 +7793,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7955,7 +7925,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8067,7 +8037,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8167,11 +8137,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8217,11 +8182,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8269,7 +8229,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H753AI.json b/data/chips/STM32H753AI.json
index 1629b42..032a23f 100644
--- a/data/chips/STM32H753AI.json
+++ b/data/chips/STM32H753AI.json
@@ -7531,7 +7531,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7786,11 +7786,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7841,11 +7836,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7896,11 +7886,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7951,11 +7936,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8058,11 +8038,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8145,11 +8120,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8234,7 +8204,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8366,7 +8336,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8498,7 +8468,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8610,7 +8580,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8730,11 +8700,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8780,11 +8745,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8832,7 +8792,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H753BI.json b/data/chips/STM32H753BI.json
index 6da992b..5613bbe 100644
--- a/data/chips/STM32H753BI.json
+++ b/data/chips/STM32H753BI.json
@@ -8138,7 +8138,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8438,11 +8438,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8503,11 +8498,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8558,11 +8548,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8613,11 +8598,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8720,11 +8700,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8807,11 +8782,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8896,7 +8866,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9028,7 +8998,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9160,7 +9130,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9272,7 +9242,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9397,11 +9367,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9447,11 +9412,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9499,7 +9459,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H753II.json b/data/chips/STM32H753II.json
index 922b71a..d4bfa41 100644
--- a/data/chips/STM32H753II.json
+++ b/data/chips/STM32H753II.json
@@ -8973,7 +8973,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9228,11 +9228,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9293,11 +9288,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9348,11 +9338,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9403,11 +9388,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9510,11 +9490,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9597,11 +9572,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9686,7 +9656,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9818,7 +9788,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9950,7 +9920,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -10062,7 +10032,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10187,11 +10157,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10237,11 +10202,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10289,7 +10249,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H753VI.json b/data/chips/STM32H753VI.json
index d334529..ef3dd5b 100644
--- a/data/chips/STM32H753VI.json
+++ b/data/chips/STM32H753VI.json
@@ -6707,7 +6707,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6942,11 +6942,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6997,11 +6992,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7047,11 +7037,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7097,11 +7082,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7204,11 +7184,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7276,11 +7251,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7350,7 +7320,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7482,7 +7452,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7614,7 +7584,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7726,7 +7696,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7826,11 +7796,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7876,11 +7841,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7928,7 +7888,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H753XI.json b/data/chips/STM32H753XI.json
index 34a0f7f..0726270 100644
--- a/data/chips/STM32H753XI.json
+++ b/data/chips/STM32H753XI.json
@@ -8544,7 +8544,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8844,11 +8844,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8909,11 +8904,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8964,11 +8954,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9019,11 +9004,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9126,11 +9106,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9213,11 +9188,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9302,7 +9272,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9434,7 +9404,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9566,7 +9536,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9678,7 +9648,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9803,11 +9773,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9853,11 +9818,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9905,7 +9865,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H753ZI.json b/data/chips/STM32H753ZI.json
index f5a2886..a7fd1d6 100644
--- a/data/chips/STM32H753ZI.json
+++ b/data/chips/STM32H753ZI.json
@@ -7034,7 +7034,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7289,11 +7289,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7344,11 +7339,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7399,11 +7389,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7454,11 +7439,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7561,11 +7541,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7648,11 +7623,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7737,7 +7707,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7869,7 +7839,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8001,7 +7971,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8113,7 +8083,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8213,11 +8183,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8263,11 +8228,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8315,7 +8275,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H755BI.json b/data/chips/STM32H755BI.json
index 4a1a44a..762ff4f 100644
--- a/data/chips/STM32H755BI.json
+++ b/data/chips/STM32H755BI.json
@@ -8019,7 +8019,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8319,11 +8319,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8384,11 +8379,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8439,11 +8429,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8494,11 +8479,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8601,11 +8581,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8688,11 +8663,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8777,7 +8747,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8909,7 +8879,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9041,7 +9011,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9153,7 +9123,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9278,11 +9248,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9328,11 +9293,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9380,7 +9340,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18016,7 +17976,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18316,11 +18276,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18381,11 +18336,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18436,11 +18386,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18491,11 +18436,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18598,11 +18538,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18685,11 +18620,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18774,7 +18704,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -18906,7 +18836,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19038,7 +18968,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19150,7 +19080,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19275,11 +19205,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19325,11 +19250,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19377,7 +19297,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H755II.json b/data/chips/STM32H755II.json
index 65fa506..8aba10d 100644
--- a/data/chips/STM32H755II.json
+++ b/data/chips/STM32H755II.json
@@ -8861,7 +8861,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9161,11 +9161,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9226,11 +9221,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9281,11 +9271,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9336,11 +9321,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9443,11 +9423,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9530,11 +9505,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9619,7 +9589,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9751,7 +9721,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9883,7 +9853,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9995,7 +9965,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10115,11 +10085,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10165,11 +10130,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10217,7 +10177,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18600,7 +18560,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18900,11 +18860,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18965,11 +18920,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19020,11 +18970,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19075,11 +19020,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19182,11 +19122,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19269,11 +19204,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19358,7 +19288,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19490,7 +19420,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19622,7 +19552,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19734,7 +19664,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19854,11 +19784,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19904,11 +19829,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19956,7 +19876,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H755XI.json b/data/chips/STM32H755XI.json
index 3ff5e18..bfe37b0 100644
--- a/data/chips/STM32H755XI.json
+++ b/data/chips/STM32H755XI.json
@@ -8535,7 +8535,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8835,11 +8835,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8900,11 +8895,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8955,11 +8945,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9010,11 +8995,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9117,11 +9097,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9204,11 +9179,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9293,7 +9263,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9425,7 +9395,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9557,7 +9527,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9669,7 +9639,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9794,11 +9764,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9844,11 +9809,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9896,7 +9856,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18706,7 +18666,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -19006,11 +18966,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19071,11 +19026,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19126,11 +19076,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19181,11 +19126,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19288,11 +19228,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19375,11 +19310,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19464,7 +19394,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19596,7 +19526,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19728,7 +19658,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19840,7 +19770,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19965,11 +19895,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -20015,11 +19940,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -20067,7 +19987,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H755ZI.json b/data/chips/STM32H755ZI.json
index cfa0d1c..bcc11e3 100644
--- a/data/chips/STM32H755ZI.json
+++ b/data/chips/STM32H755ZI.json
@@ -6870,7 +6870,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7105,11 +7105,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7160,11 +7155,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7215,11 +7205,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7270,11 +7255,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7377,11 +7357,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7464,11 +7439,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7553,7 +7523,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7685,7 +7655,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7817,7 +7787,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7929,7 +7899,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8029,11 +7999,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8079,11 +8044,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8131,7 +8091,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -15802,7 +15762,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16037,11 +15997,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16092,11 +16047,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16147,11 +16097,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16202,11 +16147,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16309,11 +16249,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16396,11 +16331,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16485,7 +16415,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -16617,7 +16547,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -16749,7 +16679,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -16861,7 +16791,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -16961,11 +16891,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17011,11 +16936,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17063,7 +16983,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H757AI.json b/data/chips/STM32H757AI.json
index 93af4a2..f1e00c3 100644
--- a/data/chips/STM32H757AI.json
+++ b/data/chips/STM32H757AI.json
@@ -7223,7 +7223,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7478,11 +7478,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7533,11 +7528,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7588,11 +7578,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7643,11 +7628,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7750,11 +7730,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7837,11 +7812,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7926,7 +7896,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8058,7 +8028,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8190,7 +8160,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8302,7 +8272,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8402,11 +8372,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8452,11 +8417,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8504,7 +8464,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16416,7 +16376,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16671,11 +16631,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16726,11 +16681,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16781,11 +16731,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16836,11 +16781,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16943,11 +16883,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -17030,11 +16965,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -17119,7 +17049,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -17251,7 +17181,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -17383,7 +17313,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -17495,7 +17425,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -17595,11 +17525,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17645,11 +17570,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17697,7 +17617,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H757BI.json b/data/chips/STM32H757BI.json
index bedd942..0237e33 100644
--- a/data/chips/STM32H757BI.json
+++ b/data/chips/STM32H757BI.json
@@ -8002,7 +8002,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8257,11 +8257,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8322,11 +8317,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8377,11 +8367,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8432,11 +8417,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8539,11 +8519,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8626,11 +8601,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8715,7 +8685,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8847,7 +8817,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8979,7 +8949,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9091,7 +9061,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9216,11 +9186,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9266,11 +9231,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9318,7 +9278,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -17870,7 +17830,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18125,11 +18085,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18190,11 +18145,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18245,11 +18195,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -18300,11 +18245,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18407,11 +18347,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18494,11 +18429,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -18583,7 +18513,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -18715,7 +18645,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -18847,7 +18777,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -18959,7 +18889,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19084,11 +19014,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19134,11 +19059,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19186,7 +19106,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H757II.json b/data/chips/STM32H757II.json
index 4235899..977f105 100644
--- a/data/chips/STM32H757II.json
+++ b/data/chips/STM32H757II.json
@@ -7265,7 +7265,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7520,11 +7520,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7575,11 +7570,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7630,11 +7620,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7685,11 +7670,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7792,11 +7772,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7879,11 +7854,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7968,7 +7938,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8100,7 +8070,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8232,7 +8202,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8344,7 +8314,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8444,11 +8414,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8494,11 +8459,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8546,7 +8506,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16458,7 +16418,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -16713,11 +16673,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16768,11 +16723,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16823,11 +16773,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16878,11 +16823,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16985,11 +16925,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -17072,11 +17007,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -17161,7 +17091,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -17293,7 +17223,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -17425,7 +17355,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -17537,7 +17467,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -17637,11 +17567,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17687,11 +17612,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -17739,7 +17659,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H757XI.json b/data/chips/STM32H757XI.json
index 2f5ec16..adec386 100644
--- a/data/chips/STM32H757XI.json
+++ b/data/chips/STM32H757XI.json
@@ -8588,7 +8588,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8888,11 +8888,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8953,11 +8948,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9008,11 +8998,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9063,11 +9048,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9170,11 +9150,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9257,11 +9232,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9346,7 +9316,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9478,7 +9448,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9610,7 +9580,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9722,7 +9692,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9847,11 +9817,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9897,11 +9862,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9949,7 +9909,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -18810,7 +18770,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -19110,11 +19070,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19175,11 +19130,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19230,11 +19180,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -19285,11 +19230,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19392,11 +19332,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19479,11 +19414,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -19568,7 +19498,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -19700,7 +19630,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19832,7 +19762,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -19944,7 +19874,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -20069,11 +19999,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -20119,11 +20044,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -20171,7 +20091,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H757ZI.json b/data/chips/STM32H757ZI.json
index 4663338..02cb2ed 100644
--- a/data/chips/STM32H757ZI.json
+++ b/data/chips/STM32H757ZI.json
@@ -6699,7 +6699,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6954,11 +6954,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7009,11 +7004,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7059,11 +7049,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7109,11 +7094,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7216,11 +7196,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7288,11 +7263,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7362,7 +7332,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7494,7 +7464,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7626,7 +7596,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7738,7 +7708,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7838,11 +7808,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7888,11 +7853,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7940,7 +7900,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -15346,7 +15306,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -15601,11 +15561,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -15656,11 +15611,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -15706,11 +15656,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -15756,11 +15701,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -15863,11 +15803,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -15935,11 +15870,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -16009,7 +15939,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -16141,7 +16071,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -16273,7 +16203,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -16385,7 +16315,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -16485,11 +16415,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16535,11 +16460,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -16587,7 +16507,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3AG.json b/data/chips/STM32H7A3AG.json
index 6e7ca44..13f3b8f 100644
--- a/data/chips/STM32H7A3AG.json
+++ b/data/chips/STM32H7A3AG.json
@@ -7385,7 +7385,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7640,11 +7640,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7695,11 +7690,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7750,11 +7740,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7805,11 +7790,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7922,11 +7902,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8009,11 +7984,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8098,7 +8068,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8230,7 +8200,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8362,7 +8332,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8474,7 +8444,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8589,11 +8559,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8639,11 +8604,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8691,7 +8651,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3AI.json b/data/chips/STM32H7A3AI.json
index c68bb47..4d24713 100644
--- a/data/chips/STM32H7A3AI.json
+++ b/data/chips/STM32H7A3AI.json
@@ -7385,7 +7385,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7640,11 +7640,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7695,11 +7690,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7750,11 +7740,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7805,11 +7790,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7922,11 +7902,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8009,11 +7984,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8098,7 +8068,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8230,7 +8200,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8362,7 +8332,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8474,7 +8444,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8589,11 +8559,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8639,11 +8604,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8691,7 +8651,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3IG.json b/data/chips/STM32H7A3IG.json
index 18099cb..a67845a 100644
--- a/data/chips/STM32H7A3IG.json
+++ b/data/chips/STM32H7A3IG.json
@@ -11409,7 +11409,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -11709,11 +11709,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -11774,11 +11769,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -11829,11 +11819,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -11884,11 +11869,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -12001,11 +11981,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -12088,11 +12063,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -12177,7 +12147,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -12309,7 +12279,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -12441,7 +12411,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -12553,7 +12523,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -12678,11 +12648,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -12728,11 +12693,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -12780,7 +12740,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3II.json b/data/chips/STM32H7A3II.json
index 91e86d4..9e95efa 100644
--- a/data/chips/STM32H7A3II.json
+++ b/data/chips/STM32H7A3II.json
@@ -11409,7 +11409,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -11709,11 +11709,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -11774,11 +11769,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -11829,11 +11819,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -11884,11 +11869,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -12001,11 +11981,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -12088,11 +12063,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -12177,7 +12147,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -12309,7 +12279,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -12441,7 +12411,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -12553,7 +12523,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -12678,11 +12648,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -12728,11 +12693,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -12780,7 +12740,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3LG.json b/data/chips/STM32H7A3LG.json
index 62d4e3a..94454d1 100644
--- a/data/chips/STM32H7A3LG.json
+++ b/data/chips/STM32H7A3LG.json
@@ -8381,7 +8381,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8681,11 +8681,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8746,11 +8741,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8801,11 +8791,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8856,11 +8841,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8973,11 +8953,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9060,11 +9035,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9149,7 +9119,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9281,7 +9251,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9413,7 +9383,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9525,7 +9495,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9650,11 +9620,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9700,11 +9665,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9752,7 +9712,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3LI.json b/data/chips/STM32H7A3LI.json
index 99c9ef5..ac67c33 100644
--- a/data/chips/STM32H7A3LI.json
+++ b/data/chips/STM32H7A3LI.json
@@ -8387,7 +8387,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8687,11 +8687,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8752,11 +8747,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8807,11 +8797,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8862,11 +8847,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8979,11 +8959,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9066,11 +9041,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9155,7 +9125,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9287,7 +9257,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9419,7 +9389,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9531,7 +9501,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9656,11 +9626,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9706,11 +9671,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9758,7 +9718,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3NG.json b/data/chips/STM32H7A3NG.json
index 04565b6..aefc274 100644
--- a/data/chips/STM32H7A3NG.json
+++ b/data/chips/STM32H7A3NG.json
@@ -8289,7 +8289,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8589,11 +8589,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8654,11 +8649,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8709,11 +8699,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8764,11 +8749,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8881,11 +8861,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8968,11 +8943,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9057,7 +9027,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9189,7 +9159,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9321,7 +9291,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9433,7 +9403,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9558,11 +9528,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9608,11 +9573,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9660,7 +9620,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3NI.json b/data/chips/STM32H7A3NI.json
index d28fe0a..e678f12 100644
--- a/data/chips/STM32H7A3NI.json
+++ b/data/chips/STM32H7A3NI.json
@@ -8289,7 +8289,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8589,11 +8589,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8654,11 +8649,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8709,11 +8699,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8764,11 +8749,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8881,11 +8861,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8968,11 +8943,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9057,7 +9027,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9189,7 +9159,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9321,7 +9291,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9433,7 +9403,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9558,11 +9528,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9608,11 +9573,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9660,7 +9620,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3QI.json b/data/chips/STM32H7A3QI.json
index dd83674..e7da4e5 100644
--- a/data/chips/STM32H7A3QI.json
+++ b/data/chips/STM32H7A3QI.json
@@ -6476,7 +6476,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6711,11 +6711,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6766,11 +6761,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6816,11 +6806,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6866,11 +6851,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6983,11 +6963,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7055,11 +7030,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7129,7 +7099,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7261,7 +7231,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7388,7 +7358,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7500,7 +7470,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7600,11 +7570,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7650,11 +7615,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7702,7 +7662,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3RG.json b/data/chips/STM32H7A3RG.json
index 0247192..7797cac 100644
--- a/data/chips/STM32H7A3RG.json
+++ b/data/chips/STM32H7A3RG.json
@@ -4628,7 +4628,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -4783,11 +4783,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4838,11 +4833,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4888,11 +4878,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4938,11 +4923,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5035,11 +5015,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5107,11 +5082,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5181,7 +5151,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5308,7 +5278,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5435,7 +5405,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5522,7 +5492,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5622,11 +5592,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5672,11 +5637,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5724,7 +5684,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3RI.json b/data/chips/STM32H7A3RI.json
index 7ebf3c2..8193770 100644
--- a/data/chips/STM32H7A3RI.json
+++ b/data/chips/STM32H7A3RI.json
@@ -4628,7 +4628,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -4783,11 +4783,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4838,11 +4833,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4888,11 +4878,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4938,11 +4923,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5035,11 +5015,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5107,11 +5082,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5181,7 +5151,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5308,7 +5278,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5435,7 +5405,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5522,7 +5492,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5622,11 +5592,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5672,11 +5637,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5724,7 +5684,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3VG.json b/data/chips/STM32H7A3VG.json
index 8da0b92..c28912f 100644
--- a/data/chips/STM32H7A3VG.json
+++ b/data/chips/STM32H7A3VG.json
@@ -7867,7 +7867,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8102,11 +8102,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8157,11 +8152,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8207,11 +8197,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8257,11 +8242,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8374,11 +8354,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8446,11 +8421,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8520,7 +8490,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8652,7 +8622,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8784,7 +8754,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8896,7 +8866,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8996,11 +8966,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9046,11 +9011,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9098,7 +9058,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3VI.json b/data/chips/STM32H7A3VI.json
index 820bc7a..7117ee4 100644
--- a/data/chips/STM32H7A3VI.json
+++ b/data/chips/STM32H7A3VI.json
@@ -7867,7 +7867,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8102,11 +8102,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8157,11 +8152,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8207,11 +8197,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8257,11 +8242,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8374,11 +8354,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8446,11 +8421,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8520,7 +8490,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8652,7 +8622,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8784,7 +8754,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8896,7 +8866,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8996,11 +8966,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9046,11 +9011,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9098,7 +9058,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3ZG.json b/data/chips/STM32H7A3ZG.json
index 6a0381a..68938a3 100644
--- a/data/chips/STM32H7A3ZG.json
+++ b/data/chips/STM32H7A3ZG.json
@@ -7901,7 +7901,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8156,11 +8156,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8211,11 +8206,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8266,11 +8256,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8321,11 +8306,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8438,11 +8418,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8525,11 +8500,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8614,7 +8584,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8746,7 +8716,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8878,7 +8848,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8990,7 +8960,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9090,11 +9060,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9140,11 +9105,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9192,7 +9152,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7A3ZI.json b/data/chips/STM32H7A3ZI.json
index 8251b13..eaf1726 100644
--- a/data/chips/STM32H7A3ZI.json
+++ b/data/chips/STM32H7A3ZI.json
@@ -7901,7 +7901,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8156,11 +8156,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8211,11 +8206,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8266,11 +8256,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8321,11 +8306,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8438,11 +8418,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8525,11 +8500,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8614,7 +8584,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8746,7 +8716,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8878,7 +8848,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8990,7 +8960,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9090,11 +9060,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9140,11 +9105,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9192,7 +9152,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B0AB.json b/data/chips/STM32H7B0AB.json
index 219cd94..cc9afc0 100644
--- a/data/chips/STM32H7B0AB.json
+++ b/data/chips/STM32H7B0AB.json
@@ -7483,7 +7483,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7738,11 +7738,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7793,11 +7788,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7848,11 +7838,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7903,11 +7888,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8020,11 +8000,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8107,11 +8082,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8196,7 +8166,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8328,7 +8298,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8460,7 +8430,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8572,7 +8542,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8687,11 +8657,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8737,11 +8702,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8789,7 +8749,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B0IB.json b/data/chips/STM32H7B0IB.json
index 87127e9..cbd0e20 100644
--- a/data/chips/STM32H7B0IB.json
+++ b/data/chips/STM32H7B0IB.json
@@ -9178,7 +9178,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9433,11 +9433,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9498,11 +9493,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9553,11 +9543,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9608,11 +9593,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9725,11 +9705,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9812,11 +9787,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9901,7 +9871,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10033,7 +10003,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -10165,7 +10135,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -10277,7 +10247,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10402,11 +10372,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10452,11 +10417,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10504,7 +10464,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B0RB.json b/data/chips/STM32H7B0RB.json
index 7146305..cb60680 100644
--- a/data/chips/STM32H7B0RB.json
+++ b/data/chips/STM32H7B0RB.json
@@ -4711,7 +4711,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -4866,11 +4866,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4921,11 +4916,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4971,11 +4961,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5021,11 +5006,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5118,11 +5098,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5190,11 +5165,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5264,7 +5234,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5391,7 +5361,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5518,7 +5488,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5605,7 +5575,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5705,11 +5675,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5755,11 +5720,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5807,7 +5767,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B0VB.json b/data/chips/STM32H7B0VB.json
index 3db521a..2f719b9 100644
--- a/data/chips/STM32H7B0VB.json
+++ b/data/chips/STM32H7B0VB.json
@@ -6132,7 +6132,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6367,11 +6367,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6422,11 +6417,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6472,11 +6462,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6522,11 +6507,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6639,11 +6619,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6711,11 +6686,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6785,7 +6755,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -6917,7 +6887,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7049,7 +7019,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7161,7 +7131,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7261,11 +7231,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7311,11 +7276,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7363,7 +7323,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B0ZB.json b/data/chips/STM32H7B0ZB.json
index 85a6a45..90d9738 100644
--- a/data/chips/STM32H7B0ZB.json
+++ b/data/chips/STM32H7B0ZB.json
@@ -7129,7 +7129,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7384,11 +7384,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7439,11 +7434,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7494,11 +7484,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7549,11 +7534,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7666,11 +7646,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7753,11 +7728,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7842,7 +7812,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7974,7 +7944,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8106,7 +8076,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8218,7 +8188,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8318,11 +8288,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8368,11 +8333,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8420,7 +8380,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B3AI.json b/data/chips/STM32H7B3AI.json
index 086349b..b3ff512 100644
--- a/data/chips/STM32H7B3AI.json
+++ b/data/chips/STM32H7B3AI.json
@@ -7505,7 +7505,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7760,11 +7760,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7815,11 +7810,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7870,11 +7860,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7925,11 +7910,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8042,11 +8022,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8129,11 +8104,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8218,7 +8188,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8350,7 +8320,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8482,7 +8452,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8594,7 +8564,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8709,11 +8679,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8759,11 +8724,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8811,7 +8771,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B3II.json b/data/chips/STM32H7B3II.json
index c666acd..b035017 100644
--- a/data/chips/STM32H7B3II.json
+++ b/data/chips/STM32H7B3II.json
@@ -11529,7 +11529,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -11829,11 +11829,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -11894,11 +11889,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -11949,11 +11939,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -12004,11 +11989,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -12121,11 +12101,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -12208,11 +12183,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -12297,7 +12267,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -12429,7 +12399,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -12561,7 +12531,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -12673,7 +12643,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -12798,11 +12768,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -12848,11 +12813,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -12900,7 +12860,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B3LI.json b/data/chips/STM32H7B3LI.json
index b0ba623..932a9f4 100644
--- a/data/chips/STM32H7B3LI.json
+++ b/data/chips/STM32H7B3LI.json
@@ -8507,7 +8507,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8807,11 +8807,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8872,11 +8867,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8927,11 +8917,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8982,11 +8967,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9099,11 +9079,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9186,11 +9161,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9275,7 +9245,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9407,7 +9377,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9539,7 +9509,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9651,7 +9621,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9776,11 +9746,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9826,11 +9791,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9878,7 +9838,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B3NI.json b/data/chips/STM32H7B3NI.json
index a17c4d2..187786e 100644
--- a/data/chips/STM32H7B3NI.json
+++ b/data/chips/STM32H7B3NI.json
@@ -8409,7 +8409,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8709,11 +8709,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8774,11 +8769,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8829,11 +8819,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8884,11 +8869,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9001,11 +8981,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9088,11 +9063,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9177,7 +9147,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9309,7 +9279,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9441,7 +9411,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9553,7 +9523,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9678,11 +9648,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9728,11 +9693,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9780,7 +9740,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B3QI.json b/data/chips/STM32H7B3QI.json
index 89197c2..101fff7 100644
--- a/data/chips/STM32H7B3QI.json
+++ b/data/chips/STM32H7B3QI.json
@@ -6581,7 +6581,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6816,11 +6816,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6871,11 +6866,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6921,11 +6911,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6971,11 +6956,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7088,11 +7068,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7160,11 +7135,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7234,7 +7204,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7366,7 +7336,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7493,7 +7463,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7605,7 +7575,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7705,11 +7675,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7755,11 +7720,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7807,7 +7767,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B3RI.json b/data/chips/STM32H7B3RI.json
index a9f0a98..e70310c 100644
--- a/data/chips/STM32H7B3RI.json
+++ b/data/chips/STM32H7B3RI.json
@@ -4733,7 +4733,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -4888,11 +4888,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4943,11 +4938,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -4993,11 +4983,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5043,11 +5028,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5140,11 +5120,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5212,11 +5187,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5286,7 +5256,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5413,7 +5383,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5540,7 +5510,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -5627,7 +5597,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5727,11 +5697,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5777,11 +5742,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5829,7 +5789,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B3VI.json b/data/chips/STM32H7B3VI.json
index 0601f2d..ad4b399 100644
--- a/data/chips/STM32H7B3VI.json
+++ b/data/chips/STM32H7B3VI.json
@@ -7972,7 +7972,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8207,11 +8207,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8262,11 +8257,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8312,11 +8302,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8362,11 +8347,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8479,11 +8459,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8551,11 +8526,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8625,7 +8595,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8757,7 +8727,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8889,7 +8859,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9001,7 +8971,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9101,11 +9071,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9151,11 +9116,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9203,7 +9163,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7B3ZI.json b/data/chips/STM32H7B3ZI.json
index b4cc68e..ae26af3 100644
--- a/data/chips/STM32H7B3ZI.json
+++ b/data/chips/STM32H7B3ZI.json
@@ -8021,7 +8021,7 @@
           "address": 1073807360,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8276,11 +8276,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8331,11 +8326,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8386,11 +8376,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8441,11 +8426,6 @@
         {
           "name": "TIM15",
           "address": 1073823744,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8558,11 +8538,6 @@
         {
           "name": "TIM16",
           "address": 1073824768,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8645,11 +8620,6 @@
         {
           "name": "TIM17",
           "address": 1073825792,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8734,7 +8704,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8866,7 +8836,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8998,7 +8968,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9110,7 +9080,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9210,11 +9180,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9260,11 +9225,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9312,7 +9272,7 @@
           "address": 1073808384,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
diff --git a/data/chips/STM32H7R3A8.json b/data/chips/STM32H7R3A8.json
index d3752d1..36f90d5 100644
--- a/data/chips/STM32H7R3A8.json
+++ b/data/chips/STM32H7R3A8.json
@@ -6119,7 +6119,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6349,11 +6349,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6404,11 +6399,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6459,11 +6449,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6514,11 +6499,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6631,11 +6611,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6718,11 +6693,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6807,7 +6777,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -6924,7 +6894,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7041,7 +7011,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7148,7 +7118,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7233,11 +7203,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7283,11 +7248,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7R3I8.json b/data/chips/STM32H7R3I8.json
index 3066d73..4181ee2 100644
--- a/data/chips/STM32H7R3I8.json
+++ b/data/chips/STM32H7R3I8.json
@@ -7525,7 +7525,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7765,11 +7765,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7820,11 +7815,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7875,11 +7865,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7930,11 +7915,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8047,11 +8027,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8139,11 +8114,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8228,7 +8198,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8345,7 +8315,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8462,7 +8432,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8569,7 +8539,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8654,11 +8624,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8704,11 +8669,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7R3L8.json b/data/chips/STM32H7R3L8.json
index bee5e3a..76a2113 100644
--- a/data/chips/STM32H7R3L8.json
+++ b/data/chips/STM32H7R3L8.json
@@ -8460,7 +8460,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8710,11 +8710,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8765,11 +8760,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8820,11 +8810,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8875,11 +8860,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8992,11 +8972,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9084,11 +9059,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9178,7 +9148,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9295,7 +9265,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9412,7 +9382,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9519,7 +9489,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9604,11 +9574,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9654,11 +9619,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7R3R8.json b/data/chips/STM32H7R3R8.json
index d8faf4e..1568220 100644
--- a/data/chips/STM32H7R3R8.json
+++ b/data/chips/STM32H7R3R8.json
@@ -3141,7 +3141,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -3271,11 +3271,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -3326,11 +3321,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -3376,11 +3366,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -3426,11 +3411,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -3513,11 +3493,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -3592,7 +3567,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -3709,7 +3684,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -3794,11 +3769,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -3844,11 +3814,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7R3V8.json b/data/chips/STM32H7R3V8.json
index 1848c2f..042002f 100644
--- a/data/chips/STM32H7R3V8.json
+++ b/data/chips/STM32H7R3V8.json
@@ -5077,7 +5077,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -5222,11 +5222,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5277,11 +5272,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5327,11 +5317,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5377,11 +5362,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5469,11 +5449,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5546,11 +5521,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5625,7 +5595,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5742,7 +5712,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5827,11 +5797,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5877,11 +5842,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7R3Z8.json b/data/chips/STM32H7R3Z8.json
index d6e6124..9e9f6ca 100644
--- a/data/chips/STM32H7R3Z8.json
+++ b/data/chips/STM32H7R3Z8.json
@@ -6585,7 +6585,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6775,11 +6775,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6830,11 +6825,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6880,11 +6870,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6930,11 +6915,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7047,11 +7027,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7124,11 +7099,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7203,7 +7173,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7320,7 +7290,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7437,7 +7407,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7544,7 +7514,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7629,11 +7599,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7679,11 +7644,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7R7A8.json b/data/chips/STM32H7R7A8.json
index aa3e459..adccd23 100644
--- a/data/chips/STM32H7R7A8.json
+++ b/data/chips/STM32H7R7A8.json
@@ -6282,7 +6282,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6512,11 +6512,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6567,11 +6562,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6622,11 +6612,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6677,11 +6662,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6794,11 +6774,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6881,11 +6856,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6970,7 +6940,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7087,7 +7057,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7204,7 +7174,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7291,7 +7261,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7376,11 +7346,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7426,11 +7391,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7R7I8.json b/data/chips/STM32H7R7I8.json
index c6bfda7..db04e8f 100644
--- a/data/chips/STM32H7R7I8.json
+++ b/data/chips/STM32H7R7I8.json
@@ -7660,7 +7660,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7890,11 +7890,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7945,11 +7940,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8000,11 +7990,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8055,11 +8040,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8172,11 +8152,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8264,11 +8239,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8353,7 +8323,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8470,7 +8440,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8587,7 +8557,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8674,7 +8644,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8759,11 +8729,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8809,11 +8774,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7R7L8.json b/data/chips/STM32H7R7L8.json
index 1d597f0..259f091 100644
--- a/data/chips/STM32H7R7L8.json
+++ b/data/chips/STM32H7R7L8.json
@@ -8748,7 +8748,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8998,11 +8998,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9053,11 +9048,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9108,11 +9098,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9163,11 +9148,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9280,11 +9260,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9372,11 +9347,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9466,7 +9436,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9583,7 +9553,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9700,7 +9670,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9807,7 +9777,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9892,11 +9862,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9942,11 +9907,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7R7Z8.json b/data/chips/STM32H7R7Z8.json
index 10fde2d..ebff846 100644
--- a/data/chips/STM32H7R7Z8.json
+++ b/data/chips/STM32H7R7Z8.json
@@ -5576,7 +5576,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -5756,11 +5756,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5811,11 +5806,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5861,11 +5851,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5911,11 +5896,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6023,11 +6003,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6100,11 +6075,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6179,7 +6149,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -6296,7 +6266,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -6413,7 +6383,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -6498,11 +6468,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6548,11 +6513,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7S3A8.json b/data/chips/STM32H7S3A8.json
index 83607bd..51d55d5 100644
--- a/data/chips/STM32H7S3A8.json
+++ b/data/chips/STM32H7S3A8.json
@@ -6244,7 +6244,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6474,11 +6474,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6529,11 +6524,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6584,11 +6574,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6639,11 +6624,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6756,11 +6736,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6843,11 +6818,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6932,7 +6902,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7049,7 +7019,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7166,7 +7136,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7273,7 +7243,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7358,11 +7328,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7408,11 +7373,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7S3I8.json b/data/chips/STM32H7S3I8.json
index b122c75..218ba98 100644
--- a/data/chips/STM32H7S3I8.json
+++ b/data/chips/STM32H7S3I8.json
@@ -7650,7 +7650,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -7890,11 +7890,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7945,11 +7940,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8000,11 +7990,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8055,11 +8040,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8172,11 +8152,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8264,11 +8239,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8353,7 +8323,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8470,7 +8440,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8587,7 +8557,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8694,7 +8664,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8779,11 +8749,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8829,11 +8794,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7S3L8.json b/data/chips/STM32H7S3L8.json
index 6e96288..88bcac8 100644
--- a/data/chips/STM32H7S3L8.json
+++ b/data/chips/STM32H7S3L8.json
@@ -8585,7 +8585,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8835,11 +8835,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8890,11 +8885,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8945,11 +8935,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9000,11 +8985,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9117,11 +9097,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9209,11 +9184,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9303,7 +9273,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9420,7 +9390,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9537,7 +9507,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9644,7 +9614,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9729,11 +9699,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9779,11 +9744,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7S3R8.json b/data/chips/STM32H7S3R8.json
index e246e13..704abb7 100644
--- a/data/chips/STM32H7S3R8.json
+++ b/data/chips/STM32H7S3R8.json
@@ -3266,7 +3266,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -3396,11 +3396,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -3451,11 +3446,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -3501,11 +3491,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -3551,11 +3536,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -3638,11 +3618,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -3717,7 +3692,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -3834,7 +3809,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -3919,11 +3894,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -3969,11 +3939,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7S3V8.json b/data/chips/STM32H7S3V8.json
index e9e5187..bde794d 100644
--- a/data/chips/STM32H7S3V8.json
+++ b/data/chips/STM32H7S3V8.json
@@ -5202,7 +5202,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -5347,11 +5347,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5402,11 +5397,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5452,11 +5442,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5502,11 +5487,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5594,11 +5574,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5671,11 +5646,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -5750,7 +5720,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5867,7 +5837,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -5952,11 +5922,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6002,11 +5967,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7S3Z8.json b/data/chips/STM32H7S3Z8.json
index b0dc245..08651b7 100644
--- a/data/chips/STM32H7S3Z8.json
+++ b/data/chips/STM32H7S3Z8.json
@@ -6710,7 +6710,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6900,11 +6900,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6955,11 +6950,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7005,11 +6995,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7055,11 +7040,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7172,11 +7152,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7249,11 +7224,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7328,7 +7298,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7445,7 +7415,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7562,7 +7532,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7669,7 +7639,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7754,11 +7724,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7804,11 +7769,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7S7A8.json b/data/chips/STM32H7S7A8.json
index 0ab4f2f..e4b1f86 100644
--- a/data/chips/STM32H7S7A8.json
+++ b/data/chips/STM32H7S7A8.json
@@ -6407,7 +6407,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -6637,11 +6637,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6692,11 +6687,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6747,11 +6737,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6802,11 +6787,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6919,11 +6899,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7006,11 +6981,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -7095,7 +7065,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7212,7 +7182,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7329,7 +7299,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -7416,7 +7386,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -7501,11 +7471,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -7551,11 +7516,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7S7I8.json b/data/chips/STM32H7S7I8.json
index 155acd7..a73a01a 100644
--- a/data/chips/STM32H7S7I8.json
+++ b/data/chips/STM32H7S7I8.json
@@ -7785,7 +7785,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -8015,11 +8015,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8070,11 +8065,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8125,11 +8115,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8180,11 +8165,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8297,11 +8277,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8389,11 +8364,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -8478,7 +8448,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8595,7 +8565,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8712,7 +8682,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -8799,7 +8769,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -8884,11 +8854,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -8934,11 +8899,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7S7L8.json b/data/chips/STM32H7S7L8.json
index cf2f37b..1da7c87 100644
--- a/data/chips/STM32H7S7L8.json
+++ b/data/chips/STM32H7S7L8.json
@@ -8873,7 +8873,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -9123,11 +9123,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9178,11 +9173,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9233,11 +9223,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -9288,11 +9273,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9405,11 +9385,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9497,11 +9472,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -9591,7 +9561,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -9708,7 +9678,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9825,7 +9795,7 @@
           "address": 1073743872,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -9932,7 +9902,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -10017,11 +9987,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -10067,11 +10032,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
diff --git a/data/chips/STM32H7S7Z8.json b/data/chips/STM32H7S7Z8.json
index 76344e8..ea8bcd6 100644
--- a/data/chips/STM32H7S7Z8.json
+++ b/data/chips/STM32H7S7Z8.json
@@ -5701,7 +5701,7 @@
           "address": 1107296256,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_ADV"
           },
           "rcc": {
@@ -5881,11 +5881,6 @@
         {
           "name": "TIM12",
           "address": 1073747968,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5936,11 +5931,6 @@
         {
           "name": "TIM13",
           "address": 1073748992,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -5986,11 +5976,6 @@
         {
           "name": "TIM14",
           "address": 1073750016,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6036,11 +6021,6 @@
         {
           "name": "TIM15",
           "address": 1107312640,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_2CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6148,11 +6128,6 @@
         {
           "name": "TIM16",
           "address": 1107313664,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6225,11 +6200,6 @@
         {
           "name": "TIM17",
           "address": 1107314688,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_1CH_CMP"
-          },
           "rcc": {
             "bus_clock": "PCLK2",
             "kernel_clock": "PCLK2_TIM",
@@ -6304,7 +6274,7 @@
           "address": 1073741824,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -6421,7 +6391,7 @@
           "address": 1073742848,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP16"
           },
           "rcc": {
@@ -6538,7 +6508,7 @@
           "address": 1073744896,
           "registers": {
             "kind": "timer",
-            "version": "v1",
+            "version": "v2",
             "block": "TIM_GP32"
           },
           "rcc": {
@@ -6623,11 +6593,6 @@
         {
           "name": "TIM6",
           "address": 1073745920,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",
@@ -6673,11 +6638,6 @@
         {
           "name": "TIM7",
           "address": 1073746944,
-          "registers": {
-            "kind": "timer",
-            "version": "v1",
-            "block": "TIM_BASIC"
-          },
           "rcc": {
             "bus_clock": "PCLK1",
             "kernel_clock": "PCLK1_TIM",