diff --git a/svd/STM32G4/STM32G431xx.svd b/svd/STM32G4/STM32G431xx.svd
index 9e999dc..03640ce 100644
--- a/svd/STM32G4/STM32G431xx.svd
+++ b/svd/STM32G4/STM32G431xx.svd
@@ -24645,7 +24645,7 @@
COMP_C4CSR
COMP_C4CSR
Comparator control/status register
- 0x12
+ 0x0C
0x20
0x00000000
diff --git a/svd/STM32G4/STM32G441xx.svd b/svd/STM32G4/STM32G441xx.svd
index 06161c6..1a3e059 100644
--- a/svd/STM32G4/STM32G441xx.svd
+++ b/svd/STM32G4/STM32G441xx.svd
@@ -24648,7 +24648,7 @@
COMP_C4CSR
COMP_C4CSR
Comparator control/status register
- 0x12
+ 0x0C
0x20
0x00000000
diff --git a/svd/STM32G4/STM32G471xx.svd b/svd/STM32G4/STM32G471xx.svd
index 80b31a1..0f8c0a4 100644
--- a/svd/STM32G4/STM32G471xx.svd
+++ b/svd/STM32G4/STM32G471xx.svd
@@ -25115,7 +25115,7 @@
COMP_C4CSR
COMP_C4CSR
Comparator control/status register
- 0x12
+ 0x0C
0x20
0x00000000
diff --git a/svd/STM32G4/STM32G473xx.svd b/svd/STM32G4/STM32G473xx.svd
index 51bd1de..7158f7d 100644
--- a/svd/STM32G4/STM32G473xx.svd
+++ b/svd/STM32G4/STM32G473xx.svd
@@ -26281,7 +26281,7 @@
COMP_C4CSR
COMP_C4CSR
Comparator control/status register
- 0x12
+ 0x0C
0x20
0x00000000
@@ -26369,7 +26369,7 @@
COMP_C5CSR
COMP_C5CSR
Comparator control/status register
- 0x16
+ 0x10
0x20
0x00000000
@@ -26457,7 +26457,7 @@
COMP_C6CSR
COMP_C6CSR
Comparator control/status register
- 0x20
+ 0x14
0x20
0x00000000
@@ -26545,7 +26545,7 @@
COMP_C7CSR
COMP_C7CSR
Comparator control/status register
- 0x24
+ 0x18
0x20
0x00000000
diff --git a/svd/STM32G4/STM32G474xx.svd b/svd/STM32G4/STM32G474xx.svd
index 032e67e..40b4b20 100644
--- a/svd/STM32G4/STM32G474xx.svd
+++ b/svd/STM32G4/STM32G474xx.svd
@@ -25760,7 +25760,7 @@
COMP_C4CSR
COMP_C4CSR
Comparator control/status register
- 0x12
+ 0x0C
0x20
0x00000000
@@ -25848,7 +25848,7 @@
COMP_C5CSR
COMP_C5CSR
Comparator control/status register
- 0x16
+ 0x10
0x20
0x00000000
@@ -25936,7 +25936,7 @@
COMP_C6CSR
COMP_C6CSR
Comparator control/status register
- 0x20
+ 0x14
0x20
0x00000000
@@ -26024,7 +26024,7 @@
COMP_C7CSR
COMP_C7CSR
Comparator control/status register
- 0x24
+ 0x18
0x20
0x00000000
diff --git a/svd/STM32G4/STM32G483xx.svd b/svd/STM32G4/STM32G483xx.svd
index 55b5b51..3c22b9f 100644
--- a/svd/STM32G4/STM32G483xx.svd
+++ b/svd/STM32G4/STM32G483xx.svd
@@ -26281,7 +26281,7 @@
COMP_C4CSR
COMP_C4CSR
Comparator control/status register
- 0x12
+ 0x0C
0x20
0x00000000
@@ -26369,7 +26369,7 @@
COMP_C5CSR
COMP_C5CSR
Comparator control/status register
- 0x16
+ 0x10
0x20
0x00000000
@@ -26457,7 +26457,7 @@
COMP_C6CSR
COMP_C6CSR
Comparator control/status register
- 0x20
+ 0x14
0x20
0x00000000
@@ -26545,7 +26545,7 @@
COMP_C7CSR
COMP_C7CSR
Comparator control/status register
- 0x24
+ 0x18
0x20
0x00000000
diff --git a/svd/STM32G4/STM32G484xx.svd b/svd/STM32G4/STM32G484xx.svd
index 0609629..641f284 100644
--- a/svd/STM32G4/STM32G484xx.svd
+++ b/svd/STM32G4/STM32G484xx.svd
@@ -26281,7 +26281,7 @@
COMP_C4CSR
COMP_C4CSR
Comparator control/status register
- 0x12
+ 0x0C
0x20
0x00000000
@@ -26369,7 +26369,7 @@
COMP_C5CSR
COMP_C5CSR
Comparator control/status register
- 0x16
+ 0x10
0x20
0x00000000
@@ -26457,7 +26457,7 @@
COMP_C6CSR
COMP_C6CSR
Comparator control/status register
- 0x20
+ 0x14
0x20
0x00000000
@@ -26545,7 +26545,7 @@
COMP_C7CSR
COMP_C7CSR
Comparator control/status register
- 0x24
+ 0x18
0x20
0x00000000
diff --git a/svd/STM32G4/STM32GBK1CBT6.svd b/svd/STM32G4/STM32GBK1CBT6.svd
index 8559904..8ee90d5 100644
--- a/svd/STM32G4/STM32GBK1CBT6.svd
+++ b/svd/STM32G4/STM32GBK1CBT6.svd
@@ -23619,7 +23619,7 @@
COMP_C4CSR
COMP_C4CSR
Comparator control/status register
- 0x12
+ 0x0C
0x20
0x00000000
diff --git a/svd/STM32H7/STM32H7x7_CM4.svd b/svd/STM32H7/STM32H7x7_CM4.svd
index e3cae6c..1b3820a 100644
--- a/svd/STM32H7/STM32H7x7_CM4.svd
+++ b/svd/STM32H7/STM32H7x7_CM4.svd
@@ -65244,7 +65244,7 @@ xs:noNamespaceSchemaLocation="CMSIS-SVD_Schema_1_1.xsd">
15
- CNT[31]
+ CNT_31
Value depends on IUFREMAP in
TIMx_CR1.
31
@@ -68341,7 +68341,7 @@ xs:noNamespaceSchemaLocation="CMSIS-SVD_Schema_1_1.xsd">
15
- CNT[31]
+ CNT_31
UIFCPY
31
1
diff --git a/svd/STM32H7/STM32H7x7_CM7.svd b/svd/STM32H7/STM32H7x7_CM7.svd
index 757f6cf..0f296aa 100644
--- a/svd/STM32H7/STM32H7x7_CM7.svd
+++ b/svd/STM32H7/STM32H7x7_CM7.svd
@@ -65244,7 +65244,7 @@ xs:noNamespaceSchemaLocation="CMSIS-SVD_Schema_1_1.xsd">
15
- CNT[31]
+ CNT_31
Value depends on IUFREMAP in
TIMx_CR1.
31
@@ -68341,7 +68341,7 @@ xs:noNamespaceSchemaLocation="CMSIS-SVD_Schema_1_1.xsd">
15
- CNT[31]
+ CNT_31
UIFCPY
31
1
diff --git a/svd/STM32L4+/STM32L4R5.svd b/svd/STM32L4+/STM32L4R5.svd
index d002a6f..c369e4b 100644
--- a/svd/STM32L4+/STM32L4R5.svd
+++ b/svd/STM32L4+/STM32L4R5.svd
@@ -15556,9 +15556,9 @@ xs:noNamespaceSchemaLocation="CMSIS-SVD_Schema_1_1.xsd">
- CH7WDATR
- CH7WDATR
- CH7WDATR
+ CH7DATINR
+ CH7DATINR
+ CH7DATINR
0xF0
0x20
read-write