From 651a91677207e556315112733f320e7d9f468469 Mon Sep 17 00:00:00 2001
From: Niklas Hauser <niklas.hauser@rwth-aachen.de>
Date: Mon, 14 Sep 2026 19:29:34 +0200
Subject: [PATCH 1/2] [dfg] Remove unused peripheral protocols

---
 tools/generator/dfg/stmicro.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/generator/dfg/stmicro.py b/tools/generator/dfg/stmicro.py
index 3efb3cfb..73d0b4fd 100644
--- a/tools/generator/dfg/stmicro.py
+++ b/tools/generator/dfg/stmicro.py
@@ -189,13 +189,13 @@ def driverOrder(e):
     _add_interrupts(p, core_child)
 
     modules = {}
-    for m, i, _, h, f, pr in p["modules"]:
+    for m, i, _, h, f in p["modules"]:
         if m + h not in modules:
-            modules[m + h] = (m, h, f, pr, [i])
+            modules[m + h] = (m, h, f, [i])
         else:
-            modules[m + h][4].append(i)
+            modules[m + h][3].append(i)
 
-    for name, hardware, features, protocols, instances in modules.values():
+    for name, hardware, features, instances in modules.values():
         driver = tree.addChild("driver")
         driver.setAttributes("name", name, "type", hardware)
         if name == "gpio":

From f329d999ac0e94fdb00b62532856b6883cba718d Mon Sep 17 00:00:00 2001
From: Niklas Hauser <niklas.hauser@rwth-aachen.de>
Date: Sun, 13 Sep 2026 20:08:55 +0200
Subject: [PATCH 2/2] Update device files

---
 devices/stm32/stm32c0-11_31.xml             |  15 ++-
 devices/stm32/stm32c0-51_71.xml             |  31 +++---
 devices/stm32/stm32c0-91_92.xml             |  19 ++--
 devices/stm32/stm32f0-30.xml                |  88 ++++------------
 devices/stm32/stm32f0-31_38.xml             |  47 +++------
 devices/stm32/stm32f0-42_48.xml             |  63 +++--------
 devices/stm32/stm32f0-51_58.xml             |  71 ++++---------
 devices/stm32/stm32f0-70.xml                |  56 +++-------
 devices/stm32/stm32f0-71_72_78.xml          |  32 ++++--
 devices/stm32/stm32f0-91_98.xml             |  56 +++-------
 devices/stm32/stm32f1-00-4_6_8_b.xml        |   4 +-
 devices/stm32/stm32f1-00-c_d_e.xml          |   4 +-
 devices/stm32/stm32f1-01_02_03-4_6.xml      |   5 +-
 devices/stm32/stm32f1-01_02_03-8_b.xml      |   5 +-
 devices/stm32/stm32f1-01_03-c_d_e.xml       |  31 +-----
 devices/stm32/stm32f1-01_03-f_g.xml         |  31 +-----
 devices/stm32/stm32f1-05_07.xml             |   2 +-
 devices/stm32/stm32f2-05_07_15_17.xml       |  11 +-
 devices/stm32/stm32f3-01.xml                |  17 +--
 devices/stm32/stm32f3-02-6_8.xml            |  19 ++--
 devices/stm32/stm32f3-02-b_c_d_e.xml        |  33 +++---
 devices/stm32/stm32f3-03-6_8.xml            |  58 +++++++---
 devices/stm32/stm32f3-03-b_c_d_e.xml        |  40 ++++---
 devices/stm32/stm32f3-18.xml                |  15 ++-
 devices/stm32/stm32f3-28_34.xml             |  58 +++++++---
 devices/stm32/stm32f3-58_98.xml             |  40 ++++---
 devices/stm32/stm32f3-73_78.xml             |  11 +-
 devices/stm32/stm32f4-01_11.xml             |  25 +++--
 devices/stm32/stm32f4-05_07_15_17.xml       |   4 +-
 devices/stm32/stm32f4-10.xml                |  12 ++-
 devices/stm32/stm32f4-12.xml                |  14 +--
 devices/stm32/stm32f4-13_23.xml             |  31 +++---
 devices/stm32/stm32f4-27_29_37_39.xml       |   4 +-
 devices/stm32/stm32f4-46.xml                |   6 +-
 devices/stm32/stm32f4-69_79.xml             |   4 +-
 devices/stm32/stm32f7-22_23_30_32_33.xml    |  11 +-
 devices/stm32/stm32f7-45_46_50_56.xml       |  13 ++-
 devices/stm32/stm32f7-65.xml                |   9 +-
 devices/stm32/stm32f7-67_68_77_78.xml       |   9 +-
 devices/stm32/stm32f7-69_79.xml             |   9 +-
 devices/stm32/stm32g0-30_31_41.xml          |   5 +-
 devices/stm32/stm32g0-50_51_61.xml          |   5 +-
 devices/stm32/stm32g0-70_b0.xml             |  13 +--
 devices/stm32/stm32g0-71_81.xml             |   8 +-
 devices/stm32/stm32g0-b1_c1.xml             |  14 +--
 devices/stm32/stm32g4-11.xml                |  72 ++++---------
 devices/stm32/stm32g4-14.xml                | 111 +++++---------------
 devices/stm32/stm32g4-31_41.xml             |  42 +++++---
 devices/stm32/stm32g4-71.xml                |  91 +++++-----------
 devices/stm32/stm32g4-73_83.xml             |  45 ++++----
 devices/stm32/stm32g4-74_84.xml             |  45 ++++----
 devices/stm32/stm32g4-91_a1.xml             |  41 +++++---
 devices/stm32/stm32h5-03.xml                |  21 ++--
 devices/stm32/stm32h5-23_33.xml             |  19 ++--
 devices/stm32/stm32h5-43_53.xml             |  23 ++--
 devices/stm32/stm32h5-62_63_73.xml          |  23 ++--
 devices/stm32/stm32h5-e4_e5_f4_f5-.xml      |  29 ++---
 devices/stm32/stm32h5-e4_e5_f4_f5-q.xml     |  31 +++---
 devices/stm32/stm32h7-23_30_33.xml          |  30 +++---
 devices/stm32/stm32h7-25_35.xml             |  30 +++---
 devices/stm32/stm32h7-42_43_50_53.xml       |  23 ++--
 devices/stm32/stm32h7-45_47_55_57.xml       |  23 ++--
 devices/stm32/stm32h7-a3_b0_b3-.xml         |  13 ++-
 devices/stm32/stm32h7-a3_b0_b3-q.xml        |  13 ++-
 devices/stm32/stm32h7-r3_s3.xml             |  76 +++++++-------
 devices/stm32/stm32h7-r7_s7.xml             |  68 ++++++------
 devices/stm32/stm32l0-10.xml                |  12 ++-
 devices/stm32/stm32l0-11_21.xml             |  11 +-
 devices/stm32/stm32l0-31_41.xml             |  11 +-
 devices/stm32/stm32l0-51_52_53_62_63.xml    |  11 +-
 devices/stm32/stm32l0-71_72_73_81_82_83.xml |  11 +-
 devices/stm32/stm32l1-00.xml                |   8 +-
 devices/stm32/stm32l1-51_52-6_8_b.xml       |   5 +-
 devices/stm32/stm32l1-51_52_62-c.xml        |   3 +-
 devices/stm32/stm32l1-51_52_62-c_d.xml      |   3 +-
 devices/stm32/stm32l1-51_52_62-d_e.xml      |   3 +-
 devices/stm32/stm32l4-12_22.xml             |  18 +++-
 devices/stm32/stm32l4-31_33_43.xml          |  32 ++++--
 devices/stm32/stm32l4-32_42.xml             |  32 ++++--
 devices/stm32/stm32l4-51_71.xml             |  38 ++++---
 devices/stm32/stm32l4-52_62.xml             |  29 +++--
 devices/stm32/stm32l4-75.xml                |  33 ++++--
 devices/stm32/stm32l4-76_86.xml             |  39 ++++---
 devices/stm32/stm32l4-96_a6.xml             |  36 ++++---
 devices/stm32/stm32l4-p5.xml                |  28 ++++-
 devices/stm32/stm32l4-q5.xml                |  28 ++++-
 devices/stm32/stm32l4-r5_r7_r9.xml          |  28 ++++-
 devices/stm32/stm32l4-s5_s7_s9.xml          |  28 ++++-
 devices/stm32/stm32l5-52_62.xml             |   9 +-
 devices/stm32/stm32u0-31.xml                |  71 ++++++-------
 devices/stm32/stm32u0-73_83.xml             |  29 +++--
 devices/stm32/stm32u3-35_45.xml             |  68 +++++-------
 devices/stm32/stm32u3-56_66.xml             |  23 ++--
 devices/stm32/stm32u3-75_85.xml             |  23 ++--
 devices/stm32/stm32u3-b5_c5-.xml            |  31 ++++--
 devices/stm32/stm32u3-b5_c5-q.xml           |  31 ++++--
 devices/stm32/stm32u5-35_45.xml             |  43 +-------
 devices/stm32/stm32u5-75_85.xml             |  46 +-------
 devices/stm32/stm32u5-95_99_a5-.xml         |  52 ++-------
 devices/stm32/stm32u5-95_99_a5_a9-q.xml     |  52 ++-------
 devices/stm32/stm32u5-f7_f9_g7_g9-q.xml     |  50 +--------
 devices/stm32/stm32u5-f7_g7-.xml            |  50 +--------
 devices/stm32/stm32wb-05.xml                |  32 ++----
 devices/stm32/stm32wb-06_07.xml             |  31 ++----
 devices/stm32/stm32wb-09.xml                |  32 ++----
 devices/stm32/stm32wb-10_15.xml             |  19 ++--
 devices/stm32/stm32wb-30_50.xml             |  11 +-
 devices/stm32/stm32wb-35_55.xml             |  13 ++-
 devices/stm32/stm32wl-30_31.xml             |  40 ++++---
 devices/stm32/stm32wl-33.xml                |  40 +++----
 devices/stm32/stm32wl-3r.xml                |  38 +++----
 devices/stm32/stm32wl-54_55.xml             |  85 +++++++--------
 devices/stm32/stm32wl-e4_e5.xml             |  81 +++++++-------
 113 files changed, 1582 insertions(+), 1792 deletions(-)

diff --git a/devices/stm32/stm32c0-11_31.xml b/devices/stm32/stm32c0-11_31.xml
index 93d466c8..f7ff3036 100644
--- a/devices/stm32/stm32c0-11_31.xml
+++ b/devices/stm32/stm32c0-11_31.xml
@@ -54,13 +54,16 @@
       <vector position="27" name="USART1"/>
       <vector position="28" name="USART2"/>
     </driver>
-    <driver name="adc" type="stm32-c0">
+    <driver name="adc" type="stm32-g0">
       <feature value="calfact"/>
       <feature value="oversampler"/>
       <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="debug" type="stm32-v1.0"/>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1200">
@@ -77,7 +80,9 @@
       <instance value="1"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="pwr" type="stm32-v1.0"/>
     <driver name="rcc" type="stm32-v1.0">
       <max-frequency value="48000000"/>
@@ -91,7 +96,6 @@
     </driver>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
-      <feature value="exti"/>
       <feature value="itline"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
@@ -105,6 +109,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -335,7 +340,7 @@
         <signal af="1" driver="usart" instance="1" name="de"/>
         <signal af="1" driver="usart" instance="1" name="rts"/>
         <signal af="2" driver="tim" instance="1" name="etr"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
       </gpio>
       <gpio port="a" pin="13">
         <signal driver="adc" instance="1" name="in13"/>
diff --git a/devices/stm32/stm32c0-51_71.xml b/devices/stm32/stm32c0-51_71.xml
index 987f2370..0807d6ee 100644
--- a/devices/stm32/stm32c0-51_71.xml
+++ b/devices/stm32/stm32c0-51_71.xml
@@ -84,7 +84,7 @@
       <vector position="27" name="USART1"/>
       <vector position="28" name="USART2"/>
     </driver>
-    <driver name="adc" type="stm32-c0">
+    <driver name="adc" type="stm32-g0">
       <feature value="calfact"/>
       <feature value="oversampler"/>
       <feature value="prescaler"/>
@@ -92,7 +92,10 @@
     </driver>
     <driver device-name="71" name="boot" type="stm32-v1.1"/>
     <driver device-name="51" name="boot" type="stm32-v1.2"/>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="debug" type="stm32-v1.0"/>
     <driver name="dmamux" type="stm32-v1.0"/>
     <driver name="flash" type="stm32-v1.0">
@@ -111,7 +114,9 @@
       <instance value="1"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver device-name="71" name="pwr" type="stm32-v1.0"/>
     <driver device-name="51" name="pwr" type="stm32-v1.1"/>
     <driver device-name="71" name="rcc" type="stm32-v1.1">
@@ -130,7 +135,6 @@
     </driver>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
-      <feature value="exti"/>
       <feature value="itline"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
@@ -145,6 +149,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -389,26 +394,22 @@
         <signal af="15" driver="rcc" name="mco_2"/>
       </gpio>
       <gpio port="a" pin="9">
-        <signal device-name="51" driver="i2c" instance="2" name="scl"/>
-        <signal device-name="51" driver="spi" instance="2" name="miso"/>
         <signal af="0" driver="rcc" name="mco"/>
         <signal af="1" driver="usart" instance="1" name="tx"/>
         <signal af="2" driver="tim" instance="1" name="ch2"/>
         <signal af="3" driver="tim" instance="3" name="etr"/>
-        <signal device-name="71" af="4" driver="spi" instance="2" name="miso"/>
+        <signal af="4" driver="spi" instance="2" name="miso"/>
         <signal af="6" driver="i2c" instance="1" name="scl"/>
-        <signal device-name="71" af="8" driver="i2c" instance="2" name="scl"/>
+        <signal af="8" driver="i2c" instance="2" name="scl"/>
       </gpio>
       <gpio port="a" pin="10">
-        <signal device-name="51" driver="i2c" instance="2" name="sda"/>
-        <signal device-name="51" driver="spi" instance="2" name="mosi"/>
-        <signal device-name="71" af="0" driver="spi" instance="2" name="mosi"/>
+        <signal af="0" driver="spi" instance="2" name="mosi"/>
         <signal af="1" driver="usart" instance="1" name="rx"/>
         <signal af="2" driver="tim" instance="1" name="ch3"/>
         <signal af="3" driver="rcc" name="mco_2"/>
         <signal af="5" driver="tim" instance="17" name="bkin"/>
         <signal af="6" driver="i2c" instance="1" name="sda"/>
-        <signal device-name="71" af="8" driver="i2c" instance="2" name="sda"/>
+        <signal af="8" driver="i2c" instance="2" name="sda"/>
       </gpio>
       <gpio port="a" pin="11">
         <signal device-name="51" driver="adc" instance="1" name="in11"/>
@@ -430,7 +431,7 @@
         <signal af="1" driver="usart" instance="1" name="de"/>
         <signal af="1" driver="usart" instance="1" name="rts"/>
         <signal af="2" driver="tim" instance="1" name="etr"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="i2c" instance="2" name="sda"/>
       </gpio>
       <gpio port="a" pin="13">
@@ -442,8 +443,8 @@
         <signal af="4" driver="usart" instance="2" name="rx"/>
       </gpio>
       <gpio port="a" pin="14">
-        <signal device-name="51" name="boot0"/>
         <signal driver="adc" instance="1" name="in14"/>
+        <signal device-name="51" driver="boot" name="boot0"/>
         <signal af="0" driver="debug" name="swclk"/>
         <signal af="1" driver="usart" instance="2" name="tx"/>
         <signal af="8" driver="i2s" instance="1" name="ws"/>
@@ -649,7 +650,7 @@
       <gpio device-pin="r" port="c" pin="9">
         <signal af="1" driver="tim" instance="3" name="ch4"/>
         <signal af="2" driver="tim" instance="1" name="ch2"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="usb" name="noe"/>
       </gpio>
       <gpio device-pin="r" port="c" pin="10">
diff --git a/devices/stm32/stm32c0-91_92.xml b/devices/stm32/stm32c0-91_92.xml
index acf41eea..8053053b 100644
--- a/devices/stm32/stm32c0-91_92.xml
+++ b/devices/stm32/stm32c0-91_92.xml
@@ -73,14 +73,17 @@
       <vector device-name="92" position="30" name="FDCAN1_IT0"/>
       <vector device-name="92" position="31" name="FDCAN1_IT1"/>
     </driver>
-    <driver name="adc" type="stm32-c0">
+    <driver name="adc" type="stm32-g0">
       <feature value="calfact"/>
       <feature value="oversampler"/>
       <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver name="boot" type="stm32-v1.2"/>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="debug" type="stm32-v1.0"/>
     <driver name="dmamux" type="stm32-v1.0"/>
     <driver device-name="92" name="fdcan" type="stm32">
@@ -102,7 +105,9 @@
       <instance value="1"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="pwr" type="stm32-v1.0"/>
     <driver name="rcc" type="stm32-v1.2">
       <max-frequency value="48000000"/>
@@ -117,7 +122,6 @@
     </driver>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
-      <feature value="exti"/>
       <feature value="itline"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
@@ -133,6 +137,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -451,7 +456,7 @@
         <signal af="1" driver="usart" instance="1" name="rts"/>
         <signal af="2" driver="tim" instance="1" name="etr"/>
         <signal device-name="92" af="4" driver="fdcan" instance="1" name="tx"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="i2c" instance="2" name="sda"/>
       </gpio>
       <gpio port="a" pin="13">
@@ -462,8 +467,8 @@
         <signal af="4" driver="usart" instance="2" name="rx"/>
       </gpio>
       <gpio port="a" pin="14">
-        <signal name="boot0"/>
         <signal driver="adc" instance="1" name="in14"/>
+        <signal driver="boot" name="boot0"/>
         <signal af="0" driver="debug" name="swclk"/>
         <signal af="1" driver="usart" instance="2" name="tx"/>
         <signal af="8" driver="i2s" instance="1" name="ws"/>
@@ -712,7 +717,7 @@
       <gpio device-pin="r" port="c" pin="9">
         <signal af="1" driver="tim" instance="3" name="ch4"/>
         <signal af="2" driver="tim" instance="1" name="ch2"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
       </gpio>
       <gpio device-pin="r" port="c" pin="10">
         <signal af="0" driver="usart" instance="3" name="tx"/>
diff --git a/devices/stm32/stm32f0-30.xml b/devices/stm32/stm32f0-30.xml
index fdbf9684..f1a21264 100644
--- a/devices/stm32/stm32f0-30.xml
+++ b/devices/stm32/stm32f0-30.xml
@@ -55,7 +55,6 @@
     </driver>
     <driver name="adc" type="stm32-f0"/>
     <driver name="crc" type="stm32">
-      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="flash" type="stm32-v1.0">
@@ -104,7 +103,6 @@
       <instance value="17"/>
     </driver>
     <driver name="usart" type="stm32-extended">
-      <feature value="wakeup"/>
       <instance value="1"/>
       <instance device-size="8|c" value="2"/>
       <instance device-size="c" value="3"/>
@@ -117,32 +115,28 @@
       <instance value="1"/>
       <channels instance="1">
         <channel position="1">
-          <signal driver="adc"/>
+          <signal driver="adc">
+            <remap position="8" mask="1" id="0"/>
+          </signal>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="0"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="0"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
         </channel>
         <channel position="2">
-          <signal driver="adc"/>
-          <signal driver="i2c" instance="1" name="tx">
-            <remap position="27" mask="1" id="0"/>
+          <signal driver="adc">
+            <remap position="8" mask="1" id="1"/>
           </signal>
+          <signal driver="i2c" instance="1" name="tx"/>
           <signal driver="spi" instance="1" name="rx"/>
-          <signal driver="tim" instance="1" name="ch1">
-            <remap position="28" mask="1" id="0"/>
-          </signal>
+          <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="1"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="1"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="3" name="ch3"/>
           <signal driver="usart" instance="1" name="tx">
@@ -150,20 +144,14 @@
           </signal>
         </channel>
         <channel position="3">
-          <signal driver="i2c" instance="1" name="rx">
-            <remap position="27" mask="1" id="0"/>
-          </signal>
+          <signal driver="i2c" instance="1" name="rx"/>
           <signal driver="spi" instance="1" name="tx"/>
-          <signal driver="tim" instance="1" name="ch2">
-            <remap position="28" mask="1" id="0"/>
-          </signal>
+          <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="0"/>
-            <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
             <remap position="11" mask="1" id="0"/>
-            <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="3" name="ch4"/>
           <signal driver="tim" instance="3" name="up"/>
@@ -174,38 +162,26 @@
         </channel>
         <channel position="4">
           <signal device-size="8" driver="i2c" instance="2" name="tx"/>
-          <signal device-size="8" driver="spi" instance="2" name="rx">
-            <remap position="24" mask="1" id="0"/>
-          </signal>
+          <signal device-size="8" driver="spi" instance="2" name="rx"/>
           <signal driver="tim" instance="1" name="ch4"/>
           <signal driver="tim" instance="1" name="com"/>
           <signal driver="tim" instance="1" name="trig"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="1"/>
-            <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
             <remap position="11" mask="1" id="1"/>
-            <remap position="13" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="3" name="ch1">
-            <remap position="30" mask="1" id="0"/>
-          </signal>
-          <signal driver="tim" instance="3" name="trig">
-            <remap position="30" mask="1" id="0"/>
           </signal>
+          <signal driver="tim" instance="3" name="ch1"/>
+          <signal driver="tim" instance="3" name="trig"/>
           <signal driver="usart" instance="1" name="tx">
             <remap position="9" mask="1" id="1"/>
           </signal>
-          <signal device-size="8" driver="usart" instance="2" name="tx">
-            <remap position="25" mask="1" id="0"/>
-          </signal>
+          <signal device-size="8" driver="usart" instance="2" name="tx"/>
         </channel>
         <channel position="5">
           <signal device-size="8" driver="i2c" instance="2" name="rx"/>
-          <signal device-size="8" driver="spi" instance="2" name="tx">
-            <remap position="24" mask="1" id="0"/>
-          </signal>
+          <signal device-size="8" driver="spi" instance="2" name="tx"/>
           <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="1" name="up"/>
           <signal device-size="8" driver="tim" instance="15" name="ch1"/>
@@ -215,9 +191,7 @@
           <signal driver="usart" instance="1" name="rx">
             <remap position="10" mask="1" id="1"/>
           </signal>
-          <signal device-size="8" driver="usart" instance="2" name="rx">
-            <remap position="25" mask="1" id="0"/>
-          </signal>
+          <signal device-size="8" driver="usart" instance="2" name="rx"/>
         </channel>
       </channels>
     </driver>
@@ -230,12 +204,8 @@
             <signal driver="adc"/>
           </request>
           <request position="7">
-            <signal driver="tim" instance="17" name="ch1">
-              <remap position="14" mask="1" id="1"/>
-            </signal>
-            <signal driver="tim" instance="17" name="up">
-              <remap position="14" mask="1" id="1"/>
-            </signal>
+            <signal driver="tim" instance="17" name="ch1"/>
+            <signal driver="tim" instance="17" name="up"/>
           </request>
           <request position="8">
             <signal driver="usart" instance="1" name="rx"/>
@@ -264,9 +234,7 @@
             <signal driver="adc"/>
           </request>
           <request position="2">
-            <signal driver="i2c" instance="1" name="tx">
-              <remap position="27" mask="1" id="0"/>
-            </signal>
+            <signal driver="i2c" instance="1" name="tx"/>
           </request>
           <request position="3">
             <signal driver="spi" instance="1" name="rx"/>
@@ -275,12 +243,8 @@
             <signal driver="tim" instance="1" name="ch1"/>
           </request>
           <request position="7">
-            <signal driver="tim" instance="17" name="ch1">
-              <remap position="14" mask="1" id="1"/>
-            </signal>
-            <signal driver="tim" instance="17" name="up">
-              <remap position="14" mask="1" id="1"/>
-            </signal>
+            <signal driver="tim" instance="17" name="ch1"/>
+            <signal driver="tim" instance="17" name="up"/>
           </request>
           <request position="8">
             <signal driver="usart" instance="1" name="tx"/>
@@ -357,12 +321,8 @@
             <signal driver="spi" instance="2" name="rx"/>
           </request>
           <request position="6">
-            <signal driver="tim" instance="3" name="ch1">
-              <remap position="30" mask="1" id="1"/>
-            </signal>
-            <signal driver="tim" instance="3" name="trig">
-              <remap position="30" mask="1" id="1"/>
-            </signal>
+            <signal driver="tim" instance="3" name="ch1"/>
+            <signal driver="tim" instance="3" name="trig"/>
           </request>
           <request position="7">
             <signal driver="tim" instance="16" name="ch1"/>
@@ -403,9 +363,7 @@
             <signal driver="spi" instance="2" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="tim" instance="1" name="ch3">
-              <remap position="28" mask="1" id="0"/>
-            </signal>
+            <signal driver="tim" instance="1" name="ch3"/>
           </request>
           <request position="8">
             <signal driver="usart" instance="1" name="rx"/>
diff --git a/devices/stm32/stm32f0-31_38.xml b/devices/stm32/stm32f0-31_38.xml
index f98af100..f69a23e0 100644
--- a/devices/stm32/stm32f0-31_38.xml
+++ b/devices/stm32/stm32f0-31_38.xml
@@ -59,7 +59,6 @@
     </driver>
     <driver name="adc" type="stm32-f0"/>
     <driver name="crc" type="stm32">
-      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="flash" type="stm32-v1.0">
@@ -113,33 +112,29 @@
       <instance value="1"/>
       <channels instance="1">
         <channel position="1">
-          <signal driver="adc"/>
+          <signal driver="adc">
+            <remap position="8" mask="1" id="0"/>
+          </signal>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="0"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="0"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="2" name="ch3"/>
         </channel>
         <channel position="2">
-          <signal driver="adc"/>
-          <signal driver="i2c" instance="1" name="tx">
-            <remap position="27" mask="1" id="0"/>
+          <signal driver="adc">
+            <remap position="8" mask="1" id="1"/>
           </signal>
+          <signal driver="i2c" instance="1" name="tx"/>
           <signal driver="spi" instance="1" name="rx"/>
-          <signal driver="tim" instance="1" name="ch1">
-            <remap position="28" mask="1" id="0"/>
-          </signal>
+          <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="1"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="1"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="2" name="up"/>
           <signal driver="tim" instance="3" name="ch3"/>
@@ -148,24 +143,16 @@
           </signal>
         </channel>
         <channel position="3">
-          <signal driver="i2c" instance="1" name="rx">
-            <remap position="27" mask="1" id="0"/>
-          </signal>
+          <signal driver="i2c" instance="1" name="rx"/>
           <signal driver="spi" instance="1" name="tx"/>
-          <signal driver="tim" instance="1" name="ch2">
-            <remap position="28" mask="1" id="0"/>
-          </signal>
+          <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="0"/>
-            <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
             <remap position="11" mask="1" id="0"/>
-            <remap position="13" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="2" name="ch2">
-            <remap position="29" mask="1" id="0"/>
           </signal>
+          <signal driver="tim" instance="2" name="ch2"/>
           <signal driver="tim" instance="3" name="ch4"/>
           <signal driver="tim" instance="3" name="up"/>
           <signal driver="usart" instance="1" name="rx">
@@ -178,21 +165,13 @@
           <signal driver="tim" instance="1" name="trig"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="1"/>
-            <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
             <remap position="11" mask="1" id="1"/>
-            <remap position="13" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="2" name="ch4">
-            <remap position="29" mask="1" id="0"/>
-          </signal>
-          <signal driver="tim" instance="3" name="ch1">
-            <remap position="30" mask="1" id="0"/>
-          </signal>
-          <signal driver="tim" instance="3" name="trig">
-            <remap position="30" mask="1" id="0"/>
           </signal>
+          <signal driver="tim" instance="2" name="ch4"/>
+          <signal driver="tim" instance="3" name="ch1"/>
+          <signal driver="tim" instance="3" name="trig"/>
           <signal driver="usart" instance="1" name="tx">
             <remap position="9" mask="1" id="1"/>
           </signal>
diff --git a/devices/stm32/stm32f0-42_48.xml b/devices/stm32/stm32f0-42_48.xml
index 4ea9f753..ff94fe0c 100644
--- a/devices/stm32/stm32f0-42_48.xml
+++ b/devices/stm32/stm32f0-42_48.xml
@@ -67,7 +67,6 @@
       <feature value="filter-14"/>
     </driver>
     <driver name="crc" type="stm32">
-      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="flash" type="stm32-v1.0">
@@ -126,33 +125,29 @@
       <instance value="1"/>
       <channels instance="1">
         <channel position="1">
-          <signal driver="adc"/>
+          <signal driver="adc">
+            <remap position="8" mask="1" id="0"/>
+          </signal>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="0"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="0"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="2" name="ch3"/>
         </channel>
         <channel position="2">
-          <signal driver="adc"/>
-          <signal driver="i2c" instance="1" name="tx">
-            <remap position="27" mask="1" id="0"/>
+          <signal driver="adc">
+            <remap position="8" mask="1" id="1"/>
           </signal>
+          <signal driver="i2c" instance="1" name="tx"/>
           <signal driver="spi" instance="1" name="rx"/>
-          <signal driver="tim" instance="1" name="ch1">
-            <remap position="28" mask="1" id="0"/>
-          </signal>
+          <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="1"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="1"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="2" name="up"/>
           <signal driver="tim" instance="3" name="ch3"/>
@@ -161,24 +156,16 @@
           </signal>
         </channel>
         <channel position="3">
-          <signal driver="i2c" instance="1" name="rx">
-            <remap position="27" mask="1" id="0"/>
-          </signal>
+          <signal driver="i2c" instance="1" name="rx"/>
           <signal driver="spi" instance="1" name="tx"/>
-          <signal driver="tim" instance="1" name="ch2">
-            <remap position="28" mask="1" id="0"/>
-          </signal>
+          <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="0"/>
-            <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
             <remap position="11" mask="1" id="0"/>
-            <remap position="13" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="2" name="ch2">
-            <remap position="29" mask="1" id="0"/>
           </signal>
+          <signal driver="tim" instance="2" name="ch2"/>
           <signal driver="tim" instance="3" name="ch4"/>
           <signal driver="tim" instance="3" name="up"/>
           <signal driver="usart" instance="1" name="rx">
@@ -186,49 +173,33 @@
           </signal>
         </channel>
         <channel position="4">
-          <signal device-pin="c" driver="spi" instance="2" name="rx">
-            <remap position="24" mask="1" id="0"/>
-          </signal>
+          <signal device-pin="c" driver="spi" instance="2" name="rx"/>
           <signal driver="tim" instance="1" name="ch4"/>
           <signal driver="tim" instance="1" name="com"/>
           <signal driver="tim" instance="1" name="trig"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="1"/>
-            <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
             <remap position="11" mask="1" id="1"/>
-            <remap position="13" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="2" name="ch4">
-            <remap position="29" mask="1" id="0"/>
-          </signal>
-          <signal driver="tim" instance="3" name="ch1">
-            <remap position="30" mask="1" id="0"/>
-          </signal>
-          <signal driver="tim" instance="3" name="trig">
-            <remap position="30" mask="1" id="0"/>
           </signal>
+          <signal driver="tim" instance="2" name="ch4"/>
+          <signal driver="tim" instance="3" name="ch1"/>
+          <signal driver="tim" instance="3" name="trig"/>
           <signal driver="usart" instance="1" name="tx">
             <remap position="9" mask="1" id="1"/>
           </signal>
-          <signal driver="usart" instance="2" name="tx">
-            <remap position="25" mask="1" id="0"/>
-          </signal>
+          <signal driver="usart" instance="2" name="tx"/>
         </channel>
         <channel position="5">
-          <signal device-pin="c" driver="spi" instance="2" name="tx">
-            <remap position="24" mask="1" id="0"/>
-          </signal>
+          <signal device-pin="c" driver="spi" instance="2" name="tx"/>
           <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="1" name="up"/>
           <signal driver="tim" instance="2" name="ch1"/>
           <signal driver="usart" instance="1" name="rx">
             <remap position="10" mask="1" id="1"/>
           </signal>
-          <signal driver="usart" instance="2" name="rx">
-            <remap position="25" mask="1" id="0"/>
-          </signal>
+          <signal driver="usart" instance="2" name="rx"/>
         </channel>
       </channels>
     </driver>
diff --git a/devices/stm32/stm32f0-51_58.xml b/devices/stm32/stm32f0-51_58.xml
index f79b6c45..24555679 100644
--- a/devices/stm32/stm32f0-51_58.xml
+++ b/devices/stm32/stm32f0-51_58.xml
@@ -84,7 +84,6 @@
       <instance value="2"/>
     </driver>
     <driver name="crc" type="stm32">
-      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="dac" type="stm32">
@@ -152,33 +151,29 @@
       <instance value="1"/>
       <channels instance="1">
         <channel position="1">
-          <signal driver="adc"/>
+          <signal driver="adc">
+            <remap position="8" mask="1" id="0"/>
+          </signal>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="0"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="0"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="2" name="ch3"/>
         </channel>
         <channel position="2">
-          <signal driver="adc"/>
-          <signal driver="i2c" instance="1" name="tx">
-            <remap position="27" mask="1" id="0"/>
+          <signal driver="adc">
+            <remap position="8" mask="1" id="1"/>
           </signal>
+          <signal driver="i2c" instance="1" name="tx"/>
           <signal driver="spi" instance="1" name="rx"/>
-          <signal driver="tim" instance="1" name="ch1">
-            <remap position="28" mask="1" id="0"/>
-          </signal>
+          <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="1"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="1"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="2" name="up"/>
           <signal driver="tim" instance="3" name="ch3"/>
@@ -188,24 +183,16 @@
         </channel>
         <channel position="3">
           <signal driver="dac" instance="1" name="ch1"/>
-          <signal driver="i2c" instance="1" name="rx">
-            <remap position="27" mask="1" id="0"/>
-          </signal>
+          <signal driver="i2c" instance="1" name="rx"/>
           <signal driver="spi" instance="1" name="tx"/>
-          <signal driver="tim" instance="1" name="ch2">
-            <remap position="28" mask="1" id="0"/>
-          </signal>
+          <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="0"/>
-            <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
             <remap position="11" mask="1" id="0"/>
-            <remap position="13" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="2" name="ch2">
-            <remap position="29" mask="1" id="0"/>
           </signal>
+          <signal driver="tim" instance="2" name="ch2"/>
           <signal driver="tim" instance="3" name="ch4"/>
           <signal driver="tim" instance="3" name="up"/>
           <signal driver="tim" instance="6" name="up"/>
@@ -215,47 +202,29 @@
         </channel>
         <channel position="4">
           <signal device-pin="c|r" device-size="8" driver="i2c" instance="2" name="tx"/>
-          <signal device-pin="c|r" device-size="8" driver="spi" instance="2" name="rx">
-            <remap position="24" mask="1" id="0"/>
-          </signal>
-          <signal device-pin="r" device-size="4|6" driver="spi" instance="2" name="rx">
-            <remap position="24" mask="1" id="0"/>
-          </signal>
+          <signal device-pin="c|r" device-size="8" driver="spi" instance="2" name="rx"/>
+          <signal device-pin="r" device-size="4|6" driver="spi" instance="2" name="rx"/>
           <signal driver="tim" instance="1" name="ch4"/>
           <signal driver="tim" instance="1" name="com"/>
           <signal driver="tim" instance="1" name="trig"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="1"/>
-            <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
             <remap position="11" mask="1" id="1"/>
-            <remap position="13" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="2" name="ch4">
-            <remap position="29" mask="1" id="0"/>
-          </signal>
-          <signal driver="tim" instance="3" name="ch1">
-            <remap position="30" mask="1" id="0"/>
-          </signal>
-          <signal driver="tim" instance="3" name="trig">
-            <remap position="30" mask="1" id="0"/>
           </signal>
+          <signal driver="tim" instance="2" name="ch4"/>
+          <signal driver="tim" instance="3" name="ch1"/>
+          <signal driver="tim" instance="3" name="trig"/>
           <signal driver="usart" instance="1" name="tx">
             <remap position="9" mask="1" id="1"/>
           </signal>
-          <signal device-size="6|8" driver="usart" instance="2" name="tx">
-            <remap position="25" mask="1" id="0"/>
-          </signal>
+          <signal device-size="6|8" driver="usart" instance="2" name="tx"/>
         </channel>
         <channel position="5">
           <signal device-pin="c|r" device-size="8" driver="i2c" instance="2" name="rx"/>
-          <signal device-pin="c|r" device-size="8" driver="spi" instance="2" name="tx">
-            <remap position="24" mask="1" id="0"/>
-          </signal>
-          <signal device-pin="r" device-size="4|6" driver="spi" instance="2" name="tx">
-            <remap position="24" mask="1" id="0"/>
-          </signal>
+          <signal device-pin="c|r" device-size="8" driver="spi" instance="2" name="tx"/>
+          <signal device-pin="r" device-size="4|6" driver="spi" instance="2" name="tx"/>
           <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="1" name="up"/>
           <signal driver="tim" instance="15" name="ch1"/>
@@ -266,9 +235,7 @@
           <signal driver="usart" instance="1" name="rx">
             <remap position="10" mask="1" id="1"/>
           </signal>
-          <signal device-size="6|8" driver="usart" instance="2" name="rx">
-            <remap position="25" mask="1" id="0"/>
-          </signal>
+          <signal device-size="6|8" driver="usart" instance="2" name="rx"/>
         </channel>
       </channels>
     </driver>
diff --git a/devices/stm32/stm32f0-70.xml b/devices/stm32/stm32f0-70.xml
index dfc507a0..099f73b7 100644
--- a/devices/stm32/stm32f0-70.xml
+++ b/devices/stm32/stm32f0-70.xml
@@ -48,7 +48,6 @@
     </driver>
     <driver name="adc" type="stm32-f0"/>
     <driver name="crc" type="stm32">
-      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="flash" type="stm32-v1.0">
@@ -97,7 +96,6 @@
       <instance value="17"/>
     </driver>
     <driver name="usart" type="stm32-extended">
-      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance device-size="b" value="3"/>
@@ -109,32 +107,28 @@
       <instance value="1"/>
       <channels instance="1">
         <channel position="1">
-          <signal driver="adc"/>
+          <signal driver="adc">
+            <remap position="8" mask="1" id="0"/>
+          </signal>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="0"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="0"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
         </channel>
         <channel position="2">
-          <signal driver="adc"/>
-          <signal driver="i2c" instance="1" name="tx">
-            <remap position="27" mask="1" id="0"/>
+          <signal driver="adc">
+            <remap position="8" mask="1" id="1"/>
           </signal>
+          <signal driver="i2c" instance="1" name="tx"/>
           <signal driver="spi" instance="1" name="rx"/>
-          <signal driver="tim" instance="1" name="ch1">
-            <remap position="28" mask="1" id="0"/>
-          </signal>
+          <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="1"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="1"/>
-            <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="3" name="ch3"/>
           <signal driver="usart" instance="1" name="tx">
@@ -145,20 +139,14 @@
           </signal>
         </channel>
         <channel position="3">
-          <signal driver="i2c" instance="1" name="rx">
-            <remap position="27" mask="1" id="0"/>
-          </signal>
+          <signal driver="i2c" instance="1" name="rx"/>
           <signal driver="spi" instance="1" name="tx"/>
-          <signal driver="tim" instance="1" name="ch2">
-            <remap position="28" mask="1" id="0"/>
-          </signal>
+          <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="0"/>
-            <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
             <remap position="11" mask="1" id="0"/>
-            <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="3" name="ch4"/>
           <signal driver="tim" instance="3" name="up"/>
@@ -172,39 +160,27 @@
         </channel>
         <channel position="4">
           <signal device-size="b" driver="i2c" instance="2" name="tx"/>
-          <signal device-size="b" driver="spi" instance="2" name="rx">
-            <remap position="24" mask="1" id="0"/>
-          </signal>
+          <signal device-size="b" driver="spi" instance="2" name="rx"/>
           <signal driver="tim" instance="1" name="ch4"/>
           <signal driver="tim" instance="1" name="com"/>
           <signal driver="tim" instance="1" name="trig"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="1"/>
-            <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
             <remap position="11" mask="1" id="1"/>
-            <remap position="13" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="3" name="ch1">
-            <remap position="30" mask="1" id="0"/>
-          </signal>
-          <signal driver="tim" instance="3" name="trig">
-            <remap position="30" mask="1" id="0"/>
           </signal>
+          <signal driver="tim" instance="3" name="ch1"/>
+          <signal driver="tim" instance="3" name="trig"/>
           <signal device-size="b" driver="tim" instance="7" name="up"/>
           <signal driver="usart" instance="1" name="tx">
             <remap position="9" mask="1" id="1"/>
           </signal>
-          <signal driver="usart" instance="2" name="tx">
-            <remap position="25" mask="1" id="0"/>
-          </signal>
+          <signal driver="usart" instance="2" name="tx"/>
         </channel>
         <channel position="5">
           <signal device-size="b" driver="i2c" instance="2" name="rx"/>
-          <signal device-size="b" driver="spi" instance="2" name="tx">
-            <remap position="24" mask="1" id="0"/>
-          </signal>
+          <signal device-size="b" driver="spi" instance="2" name="tx"/>
           <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="1" name="up"/>
           <signal device-size="b" driver="tim" instance="15" name="ch1"/>
@@ -214,9 +190,7 @@
           <signal driver="usart" instance="1" name="rx">
             <remap position="10" mask="1" id="1"/>
           </signal>
-          <signal driver="usart" instance="2" name="rx">
-            <remap position="25" mask="1" id="0"/>
-          </signal>
+          <signal driver="usart" instance="2" name="rx"/>
         </channel>
       </channels>
     </driver>
diff --git a/devices/stm32/stm32f0-71_72_78.xml b/devices/stm32/stm32f0-71_72_78.xml
index 0c3a1438..30c7a815 100644
--- a/devices/stm32/stm32f0-71_72_78.xml
+++ b/devices/stm32/stm32f0-71_72_78.xml
@@ -173,19 +173,23 @@
       <instance value="1"/>
       <channels instance="1">
         <channel position="1">
-          <signal driver="adc"/>
+          <signal driver="adc">
+            <remap position="8" mask="1" id="0"/>
+          </signal>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="0"/>
-            <remap position="14" mask="1" id="1"/>
+            <remap position="14" mask="1" id="0"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="0"/>
-            <remap position="14" mask="1" id="1"/>
+            <remap position="14" mask="1" id="0"/>
           </signal>
           <signal driver="tim" instance="2" name="ch3"/>
         </channel>
         <channel position="2">
-          <signal driver="adc"/>
+          <signal driver="adc">
+            <remap position="8" mask="1" id="1"/>
+          </signal>
           <signal driver="i2c" instance="1" name="tx">
             <remap position="27" mask="1" id="0"/>
           </signal>
@@ -195,11 +199,11 @@
           </signal>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="1"/>
-            <remap position="14" mask="1" id="1"/>
+            <remap position="14" mask="1" id="0"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="1"/>
-            <remap position="14" mask="1" id="1"/>
+            <remap position="14" mask="1" id="0"/>
           </signal>
           <signal driver="tim" instance="2" name="up"/>
           <signal driver="tim" instance="3" name="ch3"/>
@@ -221,11 +225,11 @@
           </signal>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="0"/>
-            <remap position="13" mask="1" id="1"/>
+            <remap position="13" mask="1" id="0"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
             <remap position="11" mask="1" id="0"/>
-            <remap position="13" mask="1" id="1"/>
+            <remap position="13" mask="1" id="0"/>
           </signal>
           <signal driver="tim" instance="2" name="ch2">
             <remap position="29" mask="1" id="0"/>
@@ -251,11 +255,11 @@
           <signal driver="tim" instance="1" name="trig"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="1"/>
-            <remap position="13" mask="1" id="1"/>
+            <remap position="13" mask="1" id="0"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
             <remap position="11" mask="1" id="1"/>
-            <remap position="13" mask="1" id="1"/>
+            <remap position="13" mask="1" id="0"/>
           </signal>
           <signal driver="tim" instance="2" name="ch4">
             <remap position="29" mask="1" id="0"/>
@@ -279,7 +283,9 @@
           <signal driver="spi" instance="2" name="tx">
             <remap position="24" mask="1" id="0"/>
           </signal>
-          <signal driver="tim" instance="1" name="ch3"/>
+          <signal driver="tim" instance="1" name="ch3">
+            <remap position="28" mask="1" id="0"/>
+          </signal>
           <signal driver="tim" instance="1" name="up"/>
           <signal driver="tim" instance="15" name="ch1"/>
           <signal driver="tim" instance="15" name="com"/>
@@ -310,9 +316,11 @@
             <remap position="28" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="16" name="ch1">
+            <remap position="11" mask="1" id="0"/>
             <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="16" name="up">
+            <remap position="11" mask="1" id="0"/>
             <remap position="13" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="3" name="ch1">
@@ -337,9 +345,11 @@
             <remap position="24" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="17" name="ch1">
+            <remap position="12" mask="1" id="0"/>
             <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="17" name="up">
+            <remap position="12" mask="1" id="0"/>
             <remap position="14" mask="1" id="1"/>
           </signal>
           <signal driver="tim" instance="2" name="ch2">
diff --git a/devices/stm32/stm32f0-91_98.xml b/devices/stm32/stm32f0-91_98.xml
index 10a7c5c2..59c3e55c 100644
--- a/devices/stm32/stm32f0-91_98.xml
+++ b/devices/stm32/stm32f0-91_98.xml
@@ -166,12 +166,8 @@
             <signal driver="adc"/>
           </request>
           <request position="7">
-            <signal driver="tim" instance="17" name="ch1">
-              <remap position="14" mask="1" id="1"/>
-            </signal>
-            <signal driver="tim" instance="17" name="up">
-              <remap position="14" mask="1" id="1"/>
-            </signal>
+            <signal driver="tim" instance="17" name="ch1"/>
+            <signal driver="tim" instance="17" name="up"/>
           </request>
           <request position="8">
             <signal driver="usart" instance="1" name="rx"/>
@@ -207,9 +203,7 @@
             <signal driver="adc"/>
           </request>
           <request position="2">
-            <signal driver="i2c" instance="1" name="tx">
-              <remap position="27" mask="1" id="0"/>
-            </signal>
+            <signal driver="i2c" instance="1" name="tx"/>
           </request>
           <request position="3">
             <signal driver="spi" instance="1" name="rx"/>
@@ -218,12 +212,8 @@
             <signal driver="tim" instance="1" name="ch1"/>
           </request>
           <request position="7">
-            <signal driver="tim" instance="17" name="ch1">
-              <remap position="14" mask="1" id="1"/>
-            </signal>
-            <signal driver="tim" instance="17" name="up">
-              <remap position="14" mask="1" id="1"/>
-            </signal>
+            <signal driver="tim" instance="17" name="ch1"/>
+            <signal driver="tim" instance="17" name="up"/>
           </request>
           <request position="8">
             <signal driver="usart" instance="1" name="tx"/>
@@ -320,12 +310,8 @@
             <signal driver="tim" instance="2" name="ch4"/>
           </request>
           <request position="6">
-            <signal driver="tim" instance="3" name="ch1">
-              <remap position="30" mask="1" id="1"/>
-            </signal>
-            <signal driver="tim" instance="3" name="trig">
-              <remap position="30" mask="1" id="1"/>
-            </signal>
+            <signal driver="tim" instance="3" name="ch1"/>
+            <signal driver="tim" instance="3" name="trig"/>
           </request>
           <request position="7">
             <signal driver="tim" instance="16" name="ch1"/>
@@ -373,9 +359,7 @@
             <signal driver="spi" instance="2" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="tim" instance="1" name="ch3">
-              <remap position="28" mask="1" id="0"/>
-            </signal>
+            <signal driver="tim" instance="1" name="ch3"/>
           </request>
           <request position="8">
             <signal driver="usart" instance="1" name="rx"/>
@@ -404,9 +388,7 @@
         </channel>
         <channel position="6">
           <request position="2">
-            <signal driver="i2c" instance="1" name="tx">
-              <remap position="27" mask="1" id="0"/>
-            </signal>
+            <signal driver="i2c" instance="1" name="tx"/>
           </request>
           <request position="3">
             <signal driver="spi" instance="2" name="rx"/>
@@ -414,17 +396,11 @@
           <request position="4">
             <signal driver="tim" instance="1" name="ch1"/>
             <signal driver="tim" instance="1" name="ch2"/>
-            <signal driver="tim" instance="1" name="ch3">
-              <remap position="28" mask="1" id="0"/>
-            </signal>
+            <signal driver="tim" instance="1" name="ch3"/>
           </request>
           <request position="6">
-            <signal driver="tim" instance="3" name="ch1">
-              <remap position="30" mask="1" id="1"/>
-            </signal>
-            <signal driver="tim" instance="3" name="trig">
-              <remap position="30" mask="1" id="1"/>
-            </signal>
+            <signal driver="tim" instance="3" name="ch1"/>
+            <signal driver="tim" instance="3" name="trig"/>
           </request>
           <request position="7">
             <signal driver="tim" instance="16" name="ch1"/>
@@ -467,12 +443,8 @@
             <signal driver="tim" instance="2" name="ch4"/>
           </request>
           <request position="7">
-            <signal driver="tim" instance="17" name="ch1">
-              <remap position="14" mask="1" id="1"/>
-            </signal>
-            <signal driver="tim" instance="17" name="up">
-              <remap position="14" mask="1" id="1"/>
-            </signal>
+            <signal driver="tim" instance="17" name="ch1"/>
+            <signal driver="tim" instance="17" name="up"/>
           </request>
           <request position="8">
             <signal driver="usart" instance="1" name="tx"/>
diff --git a/devices/stm32/stm32f1-00-4_6_8_b.xml b/devices/stm32/stm32f1-00-4_6_8_b.xml
index 548e8632..91d3e56d 100644
--- a/devices/stm32/stm32f1-00-4_6_8_b.xml
+++ b/devices/stm32/stm32f1-00-4_6_8_b.xml
@@ -69,7 +69,9 @@
       <instance value="1"/>
     </driver>
     <driver name="crc" type="stm32"/>
-    <driver name="dac" type="stm32"/>
+    <driver name="dac" type="stm32">
+      <feature value="status"/>
+    </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1800">
         <wait-state ws="0" hclk-max="24000000"/>
diff --git a/devices/stm32/stm32f1-00-c_d_e.xml b/devices/stm32/stm32f1-00-c_d_e.xml
index 75de11b7..edc2e3f5 100644
--- a/devices/stm32/stm32f1-00-c_d_e.xml
+++ b/devices/stm32/stm32f1-00-c_d_e.xml
@@ -71,7 +71,9 @@
       <instance value="1"/>
     </driver>
     <driver name="crc" type="stm32"/>
-    <driver name="dac" type="stm32"/>
+    <driver name="dac" type="stm32">
+      <feature value="status"/>
+    </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1800">
         <wait-state ws="0" hclk-max="24000000"/>
diff --git a/devices/stm32/stm32f1-01_02_03-4_6.xml b/devices/stm32/stm32f1-01_02_03-4_6.xml
index 4397814b..4c70a418 100644
--- a/devices/stm32/stm32f1-01_02_03-4_6.xml
+++ b/devices/stm32/stm32f1-01_02_03-4_6.xml
@@ -87,8 +87,9 @@
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1800">
         <wait-state ws="0" hclk-max="24000000"/>
-        <wait-state ws="1" hclk-max="48000000"/>
-        <wait-state ws="2" hclk-max="72000000"/>
+        <wait-state device-name="01" ws="1" hclk-max="36000000"/>
+        <wait-state device-name="02|03" ws="1" hclk-max="48000000"/>
+        <wait-state device-name="03" ws="2" hclk-max="72000000"/>
       </latency>
     </driver>
     <driver name="i2c" type="stm32">
diff --git a/devices/stm32/stm32f1-01_02_03-8_b.xml b/devices/stm32/stm32f1-01_02_03-8_b.xml
index 3bd5548b..759b1c75 100644
--- a/devices/stm32/stm32f1-01_02_03-8_b.xml
+++ b/devices/stm32/stm32f1-01_02_03-8_b.xml
@@ -113,8 +113,9 @@
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1800">
         <wait-state ws="0" hclk-max="24000000"/>
-        <wait-state ws="1" hclk-max="48000000"/>
-        <wait-state ws="2" hclk-max="72000000"/>
+        <wait-state device-name="01" ws="1" hclk-max="36000000"/>
+        <wait-state device-name="02|03" ws="1" hclk-max="48000000"/>
+        <wait-state device-name="03" ws="2" hclk-max="72000000"/>
       </latency>
     </driver>
     <driver name="i2c" type="stm32">
diff --git a/devices/stm32/stm32f1-01_03-c_d_e.xml b/devices/stm32/stm32f1-01_03-c_d_e.xml
index dda51f3d..e4b1a2b0 100644
--- a/devices/stm32/stm32f1-01_03-c_d_e.xml
+++ b/devices/stm32/stm32f1-01_03-c_d_e.xml
@@ -133,8 +133,9 @@
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1800">
         <wait-state ws="0" hclk-max="24000000"/>
-        <wait-state ws="1" hclk-max="48000000"/>
-        <wait-state ws="2" hclk-max="72000000"/>
+        <wait-state device-name="01" ws="1" hclk-max="36000000"/>
+        <wait-state device-name="03" ws="1" hclk-max="48000000"/>
+        <wait-state device-name="03" ws="2" hclk-max="72000000"/>
       </latency>
     </driver>
     <driver device-pin="v|z" name="fsmc" type="stm32-v1.0"/>
@@ -464,32 +465,6 @@
           <signal port="d" pin="1" name="tx"/>
         </group>
       </remap>
-      <remap device-name="03" driver="i2s" instance="3" position="28" mask="1">
-        <group id="0">
-          <signal port="a" pin="15" name="ws"/>
-          <signal port="b" pin="3" name="ck"/>
-          <signal port="b" pin="5" name="sd"/>
-        </group>
-        <group id="1">
-          <signal port="a" pin="4" name="ws"/>
-          <signal port="c" pin="10" name="ck"/>
-          <signal port="c" pin="12" name="sd"/>
-        </group>
-      </remap>
-      <remap driver="spi" instance="3" position="28" mask="1">
-        <group id="0">
-          <signal port="a" pin="15" name="nss"/>
-          <signal port="b" pin="3" name="sck"/>
-          <signal port="b" pin="4" name="miso"/>
-          <signal port="b" pin="5" name="mosi"/>
-        </group>
-        <group id="1">
-          <signal port="a" pin="4" name="nss"/>
-          <signal port="c" pin="10" name="sck"/>
-          <signal port="c" pin="11" name="miso"/>
-          <signal port="c" pin="12" name="mosi"/>
-        </group>
-      </remap>
       <gpio port="a" pin="0">
         <signal driver="adc" instance="1" name="in0"/>
         <signal device-name="03" driver="adc" instance="2" name="in0"/>
diff --git a/devices/stm32/stm32f1-01_03-f_g.xml b/devices/stm32/stm32f1-01_03-f_g.xml
index 73a73777..d55c976d 100644
--- a/devices/stm32/stm32f1-01_03-f_g.xml
+++ b/devices/stm32/stm32f1-01_03-f_g.xml
@@ -115,8 +115,9 @@
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1800">
         <wait-state ws="0" hclk-max="24000000"/>
-        <wait-state ws="1" hclk-max="48000000"/>
-        <wait-state ws="2" hclk-max="72000000"/>
+        <wait-state device-name="01" ws="1" hclk-max="36000000"/>
+        <wait-state device-name="03" ws="1" hclk-max="48000000"/>
+        <wait-state device-name="03" ws="2" hclk-max="72000000"/>
       </latency>
     </driver>
     <driver device-pin="v|z" name="fsmc" type="stm32-v1.0"/>
@@ -463,32 +464,6 @@
           <signal port="d" pin="1" name="tx"/>
         </group>
       </remap>
-      <remap device-name="03" driver="i2s" instance="3" position="28" mask="1">
-        <group id="0">
-          <signal port="a" pin="15" name="ws"/>
-          <signal port="b" pin="3" name="ck"/>
-          <signal port="b" pin="5" name="sd"/>
-        </group>
-        <group id="1">
-          <signal port="a" pin="4" name="ws"/>
-          <signal port="c" pin="10" name="ck"/>
-          <signal port="c" pin="12" name="sd"/>
-        </group>
-      </remap>
-      <remap driver="spi" instance="3" position="28" mask="1">
-        <group id="0">
-          <signal port="a" pin="15" name="nss"/>
-          <signal port="b" pin="3" name="sck"/>
-          <signal port="b" pin="4" name="miso"/>
-          <signal port="b" pin="5" name="mosi"/>
-        </group>
-        <group id="1">
-          <signal port="a" pin="4" name="nss"/>
-          <signal port="c" pin="10" name="sck"/>
-          <signal port="c" pin="11" name="miso"/>
-          <signal port="c" pin="12" name="mosi"/>
-        </group>
-      </remap>
       <remap driver="tim" instance="9" position="37" mask="1">
         <group id="0">
           <signal port="a" pin="2" name="ch1"/>
diff --git a/devices/stm32/stm32f1-05_07.xml b/devices/stm32/stm32f1-05_07.xml
index c03bfa7f..929e5363 100644
--- a/devices/stm32/stm32f1-05_07.xml
+++ b/devices/stm32/stm32f1-05_07.xml
@@ -101,7 +101,7 @@
       <instance value="2"/>
     </driver>
     <driver name="can" type="stm32">
-      <feature value="filter-14"/>
+      <feature value="filter-28"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
diff --git a/devices/stm32/stm32f2-05_07_15_17.xml b/devices/stm32/stm32f2-05_07_15_17.xml
index 6d9c7815..058f7380 100644
--- a/devices/stm32/stm32f2-05_07_15_17.xml
+++ b/devices/stm32/stm32f2-05_07_15_17.xml
@@ -86,16 +86,15 @@
       <memory device-size="e" name="flash" access="rx" start="0x8000000" size="524288"/>
       <memory device-size="f" name="flash" access="rx" start="0x8000000" size="786432"/>
       <memory device-size="g" name="flash" access="rx" start="0x8000000" size="1048576"/>
-      <memory device-size="b" name="sram1" access="rwx" start="0x20000000" size="49152"/>
-      <memory device-name="05" device-size="c" name="sram1" access="rwx" start="0x20000000" size="81920"/>
+      <memory device-size="b" name="sram" access="rwx" start="0x20000000" size="65536"/>
+      <memory device-name="05" device-size="c" name="sram" access="rwx" start="0x20000000" size="98304"/>
       <memory device-name="07" device-size="c" name="sram1" access="rwx" start="0x20000000" size="114688"/>
       <memory device-name="05|07" device-size="e|f|g" name="sram1" access="rwx" start="0x20000000" size="114688"/>
       <memory device-name="15|17" device-size="e|g" name="sram1" access="rwx" start="0x20000000" size="114688"/>
-      <memory device-size="b" name="sram2" access="rwx" start="0x2000C000" size="16384"/>
-      <memory device-name="05" device-size="c" name="sram2" access="rwx" start="0x20014000" size="16384"/>
       <memory device-name="07" device-size="c" name="sram2" access="rwx" start="0x2001C000" size="16384"/>
       <memory device-name="05|07" device-size="e|f|g" name="sram2" access="rwx" start="0x2001C000" size="16384"/>
       <memory device-name="15|17" device-size="e|g" name="sram2" access="rwx" start="0x2001C000" size="16384"/>
+      <memory name="backup" access="rwx" start="0x40024000" size="4096"/>
       <vector position="0" name="WWDG"/>
       <vector position="1" name="PVD"/>
       <vector position="2" name="TAMP_STAMP"/>
@@ -689,7 +688,7 @@
         <signal af="3" driver="tim" instance="8" name="ch1n"/>
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
-        <signal device-name="07|17" af="11" driver="eth" name="rcc_crs_dv"/>
+        <signal device-name="07|17" af="11" driver="eth" name="crs_dv"/>
         <signal device-name="07|17" af="11" driver="eth" name="rx_dv"/>
       </gpio>
       <gpio port="a" pin="8">
@@ -938,7 +937,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="12" driver="sdio" name="d1"/>
         <signal device-name="07|17" af="13" driver="dcmi" name="d3"/>
       </gpio>
diff --git a/devices/stm32/stm32f3-01.xml b/devices/stm32/stm32f3-01.xml
index f5f27062..6a4fe73d 100644
--- a/devices/stm32/stm32f3-01.xml
+++ b/devices/stm32/stm32f3-01.xml
@@ -121,7 +121,6 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="ccm-wp"/>
       <feature value="cfgr2"/>
       <feature value="exti"/>
       <feature value="fpu"/>
@@ -168,7 +167,9 @@
           <signal device-pin="c|r" driver="usart" instance="3" name="tx"/>
         </channel>
         <channel position="3">
-          <signal driver="dac" name="ch1"/>
+          <signal driver="dac" name="ch1">
+            <remap position="13" mask="1" id="1"/>
+          </signal>
           <signal driver="spi" instance="3" name="tx"/>
           <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="16" name="ch1">
@@ -204,8 +205,12 @@
         <channel position="6">
           <signal driver="i2c" instance="1" name="tx"/>
           <signal driver="tim" instance="1" name="ch3"/>
-          <signal driver="tim" instance="16" name="ch1"/>
-          <signal driver="tim" instance="16" name="up"/>
+          <signal driver="tim" instance="16" name="ch1">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
+          <signal driver="tim" instance="16" name="up">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
           <signal driver="usart" instance="2" name="rx"/>
         </channel>
         <channel position="7">
@@ -330,7 +335,7 @@
       </gpio>
       <gpio port="a" pin="12">
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
@@ -521,7 +526,7 @@
       <gpio device-pin="r" port="c" pin="8"/>
       <gpio device-pin="r" port="c" pin="9">
         <signal af="3" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
       </gpio>
       <gpio device-pin="r" port="c" pin="10">
         <signal af="6" driver="i2s" instance="3" name="ck"/>
diff --git a/devices/stm32/stm32f3-02-6_8.xml b/devices/stm32/stm32f3-02-6_8.xml
index 7f4eb112..86fa4f95 100644
--- a/devices/stm32/stm32f3-02-6_8.xml
+++ b/devices/stm32/stm32f3-02-6_8.xml
@@ -76,7 +76,7 @@
       <instance value="1"/>
     </driver>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
     </driver>
     <driver name="comp" type="stm32-v1.2">
       <instance value="2"/>
@@ -127,7 +127,6 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="ccm-wp"/>
       <feature value="cfgr2"/>
       <feature value="exti"/>
       <feature value="fpu"/>
@@ -175,7 +174,9 @@
           <signal device-pin="c|r" driver="usart" instance="3" name="tx"/>
         </channel>
         <channel position="3">
-          <signal driver="dac" name="ch1"/>
+          <signal driver="dac" name="ch1">
+            <remap position="13" mask="1" id="1"/>
+          </signal>
           <signal driver="spi" instance="3" name="tx"/>
           <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="16" name="ch1">
@@ -211,8 +212,12 @@
         <channel position="6">
           <signal driver="i2c" instance="1" name="tx"/>
           <signal driver="tim" instance="1" name="ch3"/>
-          <signal driver="tim" instance="16" name="ch1"/>
-          <signal driver="tim" instance="16" name="up"/>
+          <signal driver="tim" instance="16" name="ch1">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
+          <signal driver="tim" instance="16" name="up">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
           <signal driver="usart" instance="2" name="rx"/>
         </channel>
         <channel position="7">
@@ -340,7 +345,7 @@
       <gpio port="a" pin="12">
         <signal driver="usb" name="dp"/>
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
@@ -534,7 +539,7 @@
       <gpio device-pin="r" port="c" pin="8"/>
       <gpio device-pin="r" port="c" pin="9">
         <signal af="3" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
       </gpio>
       <gpio device-pin="r" port="c" pin="10">
         <signal af="6" driver="i2s" instance="3" name="ck"/>
diff --git a/devices/stm32/stm32f3-02-b_c_d_e.xml b/devices/stm32/stm32f3-02-b_c_d_e.xml
index fbb94d49..d7cf9ebc 100644
--- a/devices/stm32/stm32f3-02-b_c_d_e.xml
+++ b/devices/stm32/stm32f3-02-b_c_d_e.xml
@@ -108,7 +108,7 @@
       <instance value="2"/>
     </driver>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
     </driver>
     <driver device-size="d|e" name="comp" type="stm32-v1.2">
       <instance value="1"/>
@@ -171,7 +171,6 @@
       <instance device-pin="v|z" device-size="d|e" value="4"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="ccm-wp"/>
       <feature value="cfgr2"/>
       <feature value="exti"/>
       <feature value="fpu"/>
@@ -229,7 +228,9 @@
           <signal driver="usart" instance="3" name="tx"/>
         </channel>
         <channel position="3">
-          <signal device-size="b|c" driver="dac" name="ch1"/>
+          <signal device-size="b|c" driver="dac" name="ch1">
+            <remap position="13" mask="1" id="1"/>
+          </signal>
           <signal device-size="d|e" driver="dac" instance="1" name="ch1">
             <remap position="13" mask="1" id="1"/>
           </signal>
@@ -250,9 +251,7 @@
         </channel>
         <channel position="4">
           <signal device-size="b|c" driver="dac" name="ch2"/>
-          <signal device-size="d|e" driver="dac" instance="1" name="ch2">
-            <remap position="14" mask="1" id="1"/>
-          </signal>
+          <signal device-size="d|e" driver="dac" instance="1" name="ch2"/>
           <signal driver="i2c" instance="2" name="tx"/>
           <signal driver="spi" instance="2" name="rx"/>
           <signal driver="tim" instance="1" name="ch4"/>
@@ -276,8 +275,12 @@
         <channel position="6">
           <signal driver="i2c" instance="1" name="tx"/>
           <signal driver="tim" instance="1" name="ch3"/>
-          <signal driver="tim" instance="16" name="ch1"/>
-          <signal driver="tim" instance="16" name="up"/>
+          <signal driver="tim" instance="16" name="ch1">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
+          <signal driver="tim" instance="16" name="up">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
           <signal driver="tim" instance="3" name="ch1"/>
           <signal driver="tim" instance="3" name="trig"/>
           <signal driver="usart" instance="2" name="rx"/>
@@ -299,7 +302,6 @@
       <channels instance="2">
         <channel position="1">
           <signal driver="adc" instance="2">
-            <remap position="73" mask="1" id="0"/>
             <remap position="8" mask="1" id="0"/>
           </signal>
           <signal driver="spi" instance="3" name="rx"/>
@@ -309,10 +311,11 @@
         </channel>
         <channel position="3">
           <signal driver="adc" instance="2">
-            <remap position="73" mask="1" id="0"/>
             <remap position="8" mask="1" id="1"/>
           </signal>
-          <signal device-size="b|c" driver="dac" name="ch1"/>
+          <signal device-size="b|c" driver="dac" name="ch1">
+            <remap position="13" mask="1" id="0"/>
+          </signal>
           <signal device-size="d|e" driver="dac" instance="1" name="ch1">
             <remap position="13" mask="1" id="0"/>
           </signal>
@@ -323,9 +326,7 @@
         </channel>
         <channel position="4">
           <signal device-size="b|c" driver="dac" name="ch2"/>
-          <signal device-size="d|e" driver="dac" instance="1" name="ch2">
-            <remap position="14" mask="1" id="0"/>
-          </signal>
+          <signal device-size="d|e" driver="dac" instance="1" name="ch2"/>
           <signal device-pin="v|z" device-size="d|e" driver="spi" instance="4" name="rx"/>
         </channel>
         <channel device-pin="r|v|z" position="5">
@@ -480,7 +481,7 @@
       <gpio port="a" pin="12">
         <signal device-size="d|e" driver="usb" name="dp"/>
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal device-size="d|e" af="5" driver="i2s" name="ckin"/>
+        <signal device-size="d|e" af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
@@ -706,7 +707,7 @@
       <gpio device-pin="r|v|z" port="c" pin="9">
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal device-size="d|e" af="3" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
       </gpio>
       <gpio device-pin="r|v|z" port="c" pin="10">
         <signal af="5" driver="uart" instance="4" name="tx"/>
diff --git a/devices/stm32/stm32f3-03-6_8.xml b/devices/stm32/stm32f3-03-6_8.xml
index 4bbc04e3..71800567 100644
--- a/devices/stm32/stm32f3-03-6_8.xml
+++ b/devices/stm32/stm32f3-03-6_8.xml
@@ -70,7 +70,7 @@
       <instance value="2"/>
     </driver>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
     </driver>
     <driver name="comp" type="stm32-v1.0">
       <instance value="2"/>
@@ -160,8 +160,12 @@
           <signal driver="adc" instance="2">
             <remap position="72" mask="3" id="2"/>
           </signal>
-          <signal driver="i2c" instance="1" name="tx"/>
-          <signal driver="spi" instance="1" name="rx"/>
+          <signal driver="i2c" instance="1" name="tx">
+            <remap position="70" mask="3" id="1"/>
+          </signal>
+          <signal driver="spi" instance="1" name="rx">
+            <remap position="64" mask="3" id="0"/>
+          </signal>
           <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="2" name="up"/>
           <signal driver="tim" instance="3" name="ch3"/>
@@ -171,8 +175,12 @@
           <signal driver="dac" instance="1" name="ch1">
             <remap position="13" mask="1" id="1"/>
           </signal>
-          <signal driver="i2c" instance="1" name="rx"/>
-          <signal driver="spi" instance="1" name="tx"/>
+          <signal driver="i2c" instance="1" name="rx">
+            <remap position="68" mask="3" id="1"/>
+          </signal>
+          <signal driver="spi" instance="1" name="tx">
+            <remap position="66" mask="3" id="0"/>
+          </signal>
           <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="0"/>
@@ -194,8 +202,12 @@
           <signal driver="dac" instance="1" name="ch2">
             <remap position="14" mask="1" id="1"/>
           </signal>
-          <signal driver="i2c" instance="1" name="tx"/>
-          <signal driver="spi" instance="1" name="rx"/>
+          <signal driver="i2c" instance="1" name="tx">
+            <remap position="70" mask="3" id="2"/>
+          </signal>
+          <signal driver="spi" instance="1" name="rx">
+            <remap position="64" mask="3" id="1"/>
+          </signal>
           <signal driver="tim" instance="1" name="ch4"/>
           <signal driver="tim" instance="1" name="com"/>
           <signal driver="tim" instance="1" name="trig"/>
@@ -208,8 +220,12 @@
           <signal driver="dac" instance="2" name="ch1">
             <remap position="15" mask="1" id="1"/>
           </signal>
-          <signal driver="i2c" instance="1" name="rx"/>
-          <signal driver="spi" instance="1" name="tx"/>
+          <signal driver="i2c" instance="1" name="rx">
+            <remap position="68" mask="3" id="2"/>
+          </signal>
+          <signal driver="spi" instance="1" name="tx">
+            <remap position="66" mask="3" id="1"/>
+          </signal>
           <signal driver="tim" instance="1" name="up"/>
           <signal driver="tim" instance="15" name="ch1"/>
           <signal driver="tim" instance="15" name="com"/>
@@ -219,18 +235,30 @@
           <signal driver="usart" instance="1" name="rx"/>
         </channel>
         <channel position="6">
-          <signal driver="i2c" instance="1" name="tx"/>
-          <signal driver="spi" instance="1" name="rx"/>
+          <signal driver="i2c" instance="1" name="tx">
+            <remap position="70" mask="3" id="0"/>
+          </signal>
+          <signal driver="spi" instance="1" name="rx">
+            <remap position="64" mask="3" id="2"/>
+          </signal>
           <signal driver="tim" instance="1" name="ch3"/>
-          <signal driver="tim" instance="16" name="ch1"/>
-          <signal driver="tim" instance="16" name="up"/>
+          <signal driver="tim" instance="16" name="ch1">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
+          <signal driver="tim" instance="16" name="up">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
           <signal driver="tim" instance="3" name="ch1"/>
           <signal driver="tim" instance="3" name="trig"/>
           <signal driver="usart" instance="2" name="rx"/>
         </channel>
         <channel position="7">
-          <signal driver="i2c" instance="1" name="rx"/>
-          <signal driver="spi" instance="1" name="tx"/>
+          <signal driver="i2c" instance="1" name="rx">
+            <remap position="68" mask="3" id="0"/>
+          </signal>
+          <signal driver="spi" instance="1" name="tx">
+            <remap position="66" mask="3" id="2"/>
+          </signal>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="1"/>
           </signal>
diff --git a/devices/stm32/stm32f3-03-b_c_d_e.xml b/devices/stm32/stm32f3-03-b_c_d_e.xml
index 9fad750b..2ddea26a 100644
--- a/devices/stm32/stm32f3-03-b_c_d_e.xml
+++ b/devices/stm32/stm32f3-03-b_c_d_e.xml
@@ -129,7 +129,7 @@
       <instance value="4"/>
     </driver>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
     </driver>
     <driver device-size="d|e" name="comp" type="stm32-v1.2">
       <instance value="1"/>
@@ -261,7 +261,9 @@
           <signal driver="usart" instance="3" name="tx"/>
         </channel>
         <channel position="3">
-          <signal device-size="b|c" driver="dac" name="ch1"/>
+          <signal device-size="b|c" driver="dac" name="ch1">
+            <remap position="13" mask="1" id="1"/>
+          </signal>
           <signal device-size="d|e" driver="dac" instance="1" name="ch1">
             <remap position="13" mask="1" id="1"/>
           </signal>
@@ -281,7 +283,9 @@
           <signal driver="usart" instance="3" name="rx"/>
         </channel>
         <channel position="4">
-          <signal device-size="b|c" driver="dac" name="ch2"/>
+          <signal device-size="b|c" driver="dac" name="ch2">
+            <remap position="14" mask="1" id="1"/>
+          </signal>
           <signal device-size="d|e" driver="dac" instance="1" name="ch2">
             <remap position="14" mask="1" id="1"/>
           </signal>
@@ -311,8 +315,12 @@
         <channel position="6">
           <signal driver="i2c" instance="1" name="tx"/>
           <signal driver="tim" instance="1" name="ch3"/>
-          <signal driver="tim" instance="16" name="ch1"/>
-          <signal driver="tim" instance="16" name="up"/>
+          <signal driver="tim" instance="16" name="ch1">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
+          <signal driver="tim" instance="16" name="up">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
           <signal driver="tim" instance="3" name="ch1"/>
           <signal driver="tim" instance="3" name="trig"/>
           <signal driver="usart" instance="2" name="rx"/>
@@ -334,7 +342,6 @@
       <channels instance="2">
         <channel position="1">
           <signal driver="adc" instance="2">
-            <remap position="73" mask="1" id="0"/>
             <remap position="8" mask="1" id="0"/>
           </signal>
           <signal driver="spi" instance="3" name="rx"/>
@@ -343,7 +350,9 @@
           <signal driver="tim" instance="8" name="up"/>
         </channel>
         <channel position="2">
-          <signal driver="adc" instance="4"/>
+          <signal driver="adc" instance="4">
+            <remap position="8" mask="1" id="0"/>
+          </signal>
           <signal driver="spi" instance="3" name="tx"/>
           <signal device-pin="v|z" device-size="d|e" driver="tim" instance="20" name="ch2"/>
           <signal driver="tim" instance="8" name="ch4"/>
@@ -352,10 +361,11 @@
         </channel>
         <channel position="3">
           <signal driver="adc" instance="2">
-            <remap position="73" mask="1" id="0"/>
             <remap position="8" mask="1" id="1"/>
           </signal>
-          <signal device-size="b|c" driver="dac" name="ch1"/>
+          <signal device-size="b|c" driver="dac" name="ch1">
+            <remap position="13" mask="1" id="0"/>
+          </signal>
           <signal device-size="d|e" driver="dac" instance="1" name="ch1">
             <remap position="13" mask="1" id="0"/>
           </signal>
@@ -368,8 +378,12 @@
           <signal device-pin="r|v|z" driver="uart" instance="4" name="rx"/>
         </channel>
         <channel position="4">
-          <signal driver="adc" instance="4"/>
-          <signal device-size="b|c" driver="dac" name="ch2"/>
+          <signal driver="adc" instance="4">
+            <remap position="8" mask="1" id="1"/>
+          </signal>
+          <signal device-size="b|c" driver="dac" name="ch2">
+            <remap position="14" mask="1" id="0"/>
+          </signal>
           <signal device-size="d|e" driver="dac" instance="1" name="ch2">
             <remap position="14" mask="1" id="0"/>
           </signal>
@@ -557,7 +571,7 @@
       <gpio port="a" pin="12">
         <signal device-size="d|e" driver="usb" name="dp"/>
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal device-size="d|e" af="5" driver="i2s" name="ckin"/>
+        <signal device-size="d|e" af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
@@ -831,7 +845,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal device-size="d|e" af="3" driver="i2c" instance="3" name="sda"/>
         <signal af="4" driver="tim" instance="8" name="ch4"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="8" name="bkin2"/>
       </gpio>
       <gpio device-pin="r|v|z" port="c" pin="10">
diff --git a/devices/stm32/stm32f3-18.xml b/devices/stm32/stm32f3-18.xml
index 0e991877..c837e3f1 100644
--- a/devices/stm32/stm32f3-18.xml
+++ b/devices/stm32/stm32f3-18.xml
@@ -107,7 +107,6 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="ccm-wp"/>
       <feature value="cfgr2"/>
       <feature value="exti"/>
       <feature value="fpu"/>
@@ -154,7 +153,9 @@
           <signal device-pin="c" driver="usart" instance="3" name="tx"/>
         </channel>
         <channel position="3">
-          <signal driver="dac" name="ch1"/>
+          <signal driver="dac" name="ch1">
+            <remap position="13" mask="1" id="1"/>
+          </signal>
           <signal driver="spi" instance="3" name="tx"/>
           <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="16" name="ch1">
@@ -190,8 +191,12 @@
         <channel position="6">
           <signal driver="i2c" instance="1" name="tx"/>
           <signal driver="tim" instance="1" name="ch3"/>
-          <signal driver="tim" instance="16" name="ch1"/>
-          <signal driver="tim" instance="16" name="up"/>
+          <signal driver="tim" instance="16" name="ch1">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
+          <signal driver="tim" instance="16" name="up">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
           <signal driver="usart" instance="2" name="rx"/>
         </channel>
         <channel position="7">
@@ -316,7 +321,7 @@
       </gpio>
       <gpio port="a" pin="12">
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
diff --git a/devices/stm32/stm32f3-28_34.xml b/devices/stm32/stm32f3-28_34.xml
index 6a8f4773..58eb5f7a 100644
--- a/devices/stm32/stm32f3-28_34.xml
+++ b/devices/stm32/stm32f3-28_34.xml
@@ -91,7 +91,7 @@
       <instance value="2"/>
     </driver>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
     </driver>
     <driver name="comp" type="stm32-v1.0">
       <instance value="2"/>
@@ -185,8 +185,12 @@
             <remap position="72" mask="3" id="2"/>
           </signal>
           <signal device-name="34" driver="hrtim" instance="1" name="m"/>
-          <signal driver="i2c" instance="1" name="tx"/>
-          <signal driver="spi" instance="1" name="rx"/>
+          <signal driver="i2c" instance="1" name="tx">
+            <remap position="70" mask="3" id="1"/>
+          </signal>
+          <signal driver="spi" instance="1" name="rx">
+            <remap position="64" mask="3" id="0"/>
+          </signal>
           <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="2" name="up"/>
           <signal driver="tim" instance="3" name="ch3"/>
@@ -197,8 +201,12 @@
             <remap position="13" mask="1" id="1"/>
           </signal>
           <signal device-name="34" driver="hrtim" instance="1" name="a"/>
-          <signal driver="i2c" instance="1" name="rx"/>
-          <signal driver="spi" instance="1" name="tx"/>
+          <signal driver="i2c" instance="1" name="rx">
+            <remap position="68" mask="3" id="1"/>
+          </signal>
+          <signal driver="spi" instance="1" name="tx">
+            <remap position="66" mask="3" id="0"/>
+          </signal>
           <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="16" name="ch1">
             <remap position="11" mask="1" id="0"/>
@@ -221,8 +229,12 @@
             <remap position="14" mask="1" id="1"/>
           </signal>
           <signal device-name="34" driver="hrtim" instance="1" name="b"/>
-          <signal driver="i2c" instance="1" name="tx"/>
-          <signal driver="spi" instance="1" name="rx"/>
+          <signal driver="i2c" instance="1" name="tx">
+            <remap position="70" mask="3" id="2"/>
+          </signal>
+          <signal driver="spi" instance="1" name="rx">
+            <remap position="64" mask="3" id="1"/>
+          </signal>
           <signal driver="tim" instance="1" name="ch4"/>
           <signal driver="tim" instance="1" name="com"/>
           <signal driver="tim" instance="1" name="trig"/>
@@ -236,8 +248,12 @@
             <remap position="15" mask="1" id="1"/>
           </signal>
           <signal device-name="34" driver="hrtim" instance="1" name="c"/>
-          <signal driver="i2c" instance="1" name="rx"/>
-          <signal driver="spi" instance="1" name="tx"/>
+          <signal driver="i2c" instance="1" name="rx">
+            <remap position="68" mask="3" id="2"/>
+          </signal>
+          <signal driver="spi" instance="1" name="tx">
+            <remap position="66" mask="3" id="1"/>
+          </signal>
           <signal driver="tim" instance="1" name="up"/>
           <signal driver="tim" instance="15" name="ch1"/>
           <signal driver="tim" instance="15" name="com"/>
@@ -248,19 +264,31 @@
         </channel>
         <channel position="6">
           <signal device-name="34" driver="hrtim" instance="1" name="d"/>
-          <signal driver="i2c" instance="1" name="tx"/>
-          <signal driver="spi" instance="1" name="rx"/>
+          <signal driver="i2c" instance="1" name="tx">
+            <remap position="70" mask="3" id="0"/>
+          </signal>
+          <signal driver="spi" instance="1" name="rx">
+            <remap position="64" mask="3" id="2"/>
+          </signal>
           <signal driver="tim" instance="1" name="ch3"/>
-          <signal driver="tim" instance="16" name="ch1"/>
-          <signal driver="tim" instance="16" name="up"/>
+          <signal driver="tim" instance="16" name="ch1">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
+          <signal driver="tim" instance="16" name="up">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
           <signal driver="tim" instance="3" name="ch1"/>
           <signal driver="tim" instance="3" name="trig"/>
           <signal driver="usart" instance="2" name="rx"/>
         </channel>
         <channel position="7">
           <signal device-name="34" driver="hrtim" instance="1" name="e"/>
-          <signal driver="i2c" instance="1" name="rx"/>
-          <signal driver="spi" instance="1" name="tx"/>
+          <signal driver="i2c" instance="1" name="rx">
+            <remap position="68" mask="3" id="0"/>
+          </signal>
+          <signal driver="spi" instance="1" name="tx">
+            <remap position="66" mask="3" id="2"/>
+          </signal>
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="1"/>
           </signal>
diff --git a/devices/stm32/stm32f3-58_98.xml b/devices/stm32/stm32f3-58_98.xml
index c835b375..04ded4c7 100644
--- a/devices/stm32/stm32f3-58_98.xml
+++ b/devices/stm32/stm32f3-58_98.xml
@@ -96,7 +96,7 @@
       <instance value="4"/>
     </driver>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
     </driver>
     <driver device-name="98" name="comp" type="stm32-v1.2">
       <instance value="1"/>
@@ -227,7 +227,9 @@
           <signal driver="usart" instance="3" name="tx"/>
         </channel>
         <channel position="3">
-          <signal device-name="58" driver="dac" name="ch1"/>
+          <signal device-name="58" driver="dac" name="ch1">
+            <remap position="13" mask="1" id="1"/>
+          </signal>
           <signal device-name="98" driver="dac" instance="1" name="ch1">
             <remap position="13" mask="1" id="1"/>
           </signal>
@@ -247,7 +249,9 @@
           <signal driver="usart" instance="3" name="rx"/>
         </channel>
         <channel position="4">
-          <signal device-name="58" driver="dac" name="ch2"/>
+          <signal device-name="58" driver="dac" name="ch2">
+            <remap position="14" mask="1" id="1"/>
+          </signal>
           <signal device-name="98" driver="dac" instance="1" name="ch2">
             <remap position="14" mask="1" id="1"/>
           </signal>
@@ -277,8 +281,12 @@
         <channel position="6">
           <signal driver="i2c" instance="1" name="tx"/>
           <signal driver="tim" instance="1" name="ch3"/>
-          <signal driver="tim" instance="16" name="ch1"/>
-          <signal driver="tim" instance="16" name="up"/>
+          <signal driver="tim" instance="16" name="ch1">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
+          <signal driver="tim" instance="16" name="up">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
           <signal driver="tim" instance="3" name="ch1"/>
           <signal driver="tim" instance="3" name="trig"/>
           <signal driver="usart" instance="2" name="rx"/>
@@ -300,7 +308,6 @@
       <channels instance="2">
         <channel position="1">
           <signal driver="adc" instance="2">
-            <remap position="73" mask="1" id="0"/>
             <remap position="8" mask="1" id="0"/>
           </signal>
           <signal driver="spi" instance="3" name="rx"/>
@@ -309,7 +316,9 @@
           <signal driver="tim" instance="8" name="up"/>
         </channel>
         <channel position="2">
-          <signal driver="adc" instance="4"/>
+          <signal driver="adc" instance="4">
+            <remap position="8" mask="1" id="0"/>
+          </signal>
           <signal driver="spi" instance="3" name="tx"/>
           <signal device-name="98" driver="tim" instance="20" name="ch2"/>
           <signal driver="tim" instance="8" name="ch4"/>
@@ -318,10 +327,11 @@
         </channel>
         <channel position="3">
           <signal driver="adc" instance="2">
-            <remap position="73" mask="1" id="0"/>
             <remap position="8" mask="1" id="1"/>
           </signal>
-          <signal device-name="58" driver="dac" name="ch1"/>
+          <signal device-name="58" driver="dac" name="ch1">
+            <remap position="13" mask="1" id="0"/>
+          </signal>
           <signal device-name="98" driver="dac" instance="1" name="ch1">
             <remap position="13" mask="1" id="0"/>
           </signal>
@@ -334,8 +344,12 @@
           <signal device-pin="r|v" driver="uart" instance="4" name="rx"/>
         </channel>
         <channel position="4">
-          <signal driver="adc" instance="4"/>
-          <signal device-name="58" driver="dac" name="ch2"/>
+          <signal driver="adc" instance="4">
+            <remap position="8" mask="1" id="1"/>
+          </signal>
+          <signal device-name="58" driver="dac" name="ch2">
+            <remap position="14" mask="1" id="0"/>
+          </signal>
           <signal device-name="98" driver="dac" instance="1" name="ch2">
             <remap position="14" mask="1" id="0"/>
           </signal>
@@ -520,7 +534,7 @@
       </gpio>
       <gpio port="a" pin="12">
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal device-name="98" af="5" driver="i2s" name="ckin"/>
+        <signal device-name="98" af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
@@ -786,7 +800,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal device-name="98" af="3" driver="i2c" instance="3" name="sda"/>
         <signal af="4" driver="tim" instance="8" name="ch4"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="8" name="bkin2"/>
       </gpio>
       <gpio device-pin="r|v" port="c" pin="10">
diff --git a/devices/stm32/stm32f3-73_78.xml b/devices/stm32/stm32f3-73_78.xml
index a07396e6..a1d5914a 100644
--- a/devices/stm32/stm32f3-73_78.xml
+++ b/devices/stm32/stm32f3-73_78.xml
@@ -107,7 +107,7 @@
       <instance value="1"/>
     </driver>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
     </driver>
     <driver name="comp" type="stm32-v1.3">
       <instance value="1"/>
@@ -163,7 +163,6 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="ccm-wp"/>
       <feature value="cfgr2"/>
       <feature value="exti"/>
       <feature value="fpu"/>
@@ -270,8 +269,12 @@
         </channel>
         <channel position="6">
           <signal driver="i2c" instance="1" name="tx"/>
-          <signal driver="tim" instance="16" name="ch1"/>
-          <signal driver="tim" instance="16" name="up"/>
+          <signal driver="tim" instance="16" name="ch1">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
+          <signal driver="tim" instance="16" name="up">
+            <remap position="11" mask="1" id="1"/>
+          </signal>
           <signal driver="tim" instance="3" name="ch1"/>
           <signal driver="tim" instance="3" name="trig"/>
           <signal driver="usart" instance="2" name="rx"/>
diff --git a/devices/stm32/stm32f4-01_11.xml b/devices/stm32/stm32f4-01_11.xml
index 757819dd..a79a119f 100644
--- a/devices/stm32/stm32f4-01_11.xml
+++ b/devices/stm32/stm32f4-01_11.xml
@@ -136,15 +136,22 @@
     </driver>
     <driver name="crc" type="stm32"/>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="1800">
+      <latency device-name="11" vcore-min="1710">
         <wait-state ws="0" hclk-max="16000000"/>
         <wait-state ws="1" hclk-max="32000000"/>
         <wait-state ws="2" hclk-max="48000000"/>
         <wait-state ws="3" hclk-max="64000000"/>
         <wait-state ws="4" hclk-max="80000000"/>
-        <wait-state device-name="01" ws="5" hclk-max="84000000"/>
-        <wait-state device-name="11" ws="5" hclk-max="96000000"/>
-        <wait-state device-name="11" ws="6" hclk-max="100000000"/>
+        <wait-state ws="5" hclk-max="96000000"/>
+        <wait-state ws="6" hclk-max="100000000"/>
+      </latency>
+      <latency device-name="01" vcore-min="1800">
+        <wait-state ws="0" hclk-max="16000000"/>
+        <wait-state ws="1" hclk-max="32000000"/>
+        <wait-state ws="2" hclk-max="48000000"/>
+        <wait-state ws="3" hclk-max="64000000"/>
+        <wait-state ws="4" hclk-max="80000000"/>
+        <wait-state ws="5" hclk-max="84000000"/>
       </latency>
       <latency vcore-min="2100">
         <wait-state ws="0" hclk-max="18000000"/>
@@ -165,13 +172,15 @@
       </latency>
       <latency vcore-min="2700">
         <wait-state ws="0" hclk-max="30000000"/>
-        <wait-state ws="1" hclk-max="60000000"/>
+        <wait-state device-name="01" ws="1" hclk-max="60000000"/>
+        <wait-state device-name="11" ws="1" hclk-max="64000000"/>
         <wait-state device-name="01" ws="2" hclk-max="84000000"/>
         <wait-state device-name="11" ws="2" hclk-max="90000000"/>
         <wait-state device-name="11" ws="3" hclk-max="100000000"/>
       </latency>
     </driver>
     <driver name="i2c" type="stm32">
+      <feature value="dnf"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -552,7 +561,7 @@
         <signal af="1" driver="tim" instance="2" name="ch3"/>
         <signal af="2" driver="tim" instance="5" name="ch3"/>
         <signal af="3" driver="tim" instance="9" name="ch1"/>
-        <signal device-name="11" af="5" driver="i2s" name="ckin"/>
+        <signal device-name="11" af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="usart" instance="2" name="tx"/>
       </gpio>
       <gpio port="a" pin="3">
@@ -734,7 +743,7 @@
       <gpio device-package="h" port="b" pin="11">
         <signal af="1" driver="tim" instance="2" name="ch4"/>
         <signal af="4" driver="i2c" instance="2" name="sda"/>
-        <signal device-name="11" device-size="c|e" device-temperature="6" af="5" driver="i2s" name="ckin"/>
+        <signal device-name="11" device-size="c|e" device-temperature="6" af="5" driver="rcc" name="i2s_ckin"/>
       </gpio>
       <gpio port="b" pin="12">
         <signal af="1" driver="tim" instance="1" name="bkin"/>
@@ -811,7 +820,7 @@
         <signal af="0" driver="rcc" name="mco_2"/>
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="12" driver="sdio" name="d1"/>
       </gpio>
       <gpio device-pin="r|v" port="c" pin="10">
diff --git a/devices/stm32/stm32f4-05_07_15_17.xml b/devices/stm32/stm32f4-05_07_15_17.xml
index d3e110f1..c68e6a52 100644
--- a/devices/stm32/stm32f4-05_07_15_17.xml
+++ b/devices/stm32/stm32f4-05_07_15_17.xml
@@ -668,7 +668,7 @@
         <signal af="3" driver="tim" instance="8" name="ch1n"/>
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
-        <signal device-name="07|17" af="11" driver="eth" name="rcc_crs_dv"/>
+        <signal device-name="07|17" af="11" driver="eth" name="crs_dv"/>
         <signal device-name="07|17" af="11" driver="eth" name="rx_dv"/>
       </gpio>
       <gpio port="a" pin="8">
@@ -920,7 +920,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="12" driver="sdio" name="d1"/>
         <signal device-name="07|17" af="13" driver="dcmi" name="d3"/>
       </gpio>
diff --git a/devices/stm32/stm32f4-10.xml b/devices/stm32/stm32f4-10.xml
index e2cf756a..4d892cf7 100644
--- a/devices/stm32/stm32f4-10.xml
+++ b/devices/stm32/stm32f4-10.xml
@@ -98,7 +98,7 @@
       <feature value="status"/>
     </driver>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="1800">
+      <latency vcore-min="1710">
         <wait-state ws="0" hclk-max="16000000"/>
         <wait-state ws="1" hclk-max="32000000"/>
         <wait-state ws="2" hclk-max="48000000"/>
@@ -124,7 +124,7 @@
       </latency>
       <latency vcore-min="2700">
         <wait-state ws="0" hclk-max="30000000"/>
-        <wait-state ws="1" hclk-max="60000000"/>
+        <wait-state ws="1" hclk-max="64000000"/>
         <wait-state ws="2" hclk-max="90000000"/>
         <wait-state ws="3" hclk-max="100000000"/>
       </latency>
@@ -133,6 +133,7 @@
       <instance value="1"/>
     </driver>
     <driver name="i2c" type="stm32">
+      <feature value="dnf"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -156,6 +157,7 @@
       <instance device-pin="c|r" value="5"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
@@ -395,7 +397,7 @@
         <signal driver="adc" instance="1" name="in2"/>
         <signal af="2" driver="tim" instance="5" name="ch3"/>
         <signal af="3" driver="tim" instance="9" name="ch1"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="usart" instance="2" name="tx"/>
       </gpio>
       <gpio port="a" pin="3">
@@ -545,7 +547,7 @@
         <signal af="0" driver="sys" name="traced3"/>
         <signal af="2" driver="tim" instance="5" name="ch4"/>
         <signal af="4" driver="i2c" instance="2" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
       </gpio>
       <gpio port="b" pin="12">
         <signal af="1" driver="tim" instance="1" name="bkin"/>
@@ -621,7 +623,7 @@
       <gpio device-pin="r" port="c" pin="9">
         <signal af="0" driver="rcc" name="mco_2"/>
         <signal af="4" driver="fmpi2c" instance="1" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
       </gpio>
       <gpio device-pin="r" port="c" pin="10">
         <signal af="0" driver="sys" name="traced0"/>
diff --git a/devices/stm32/stm32f4-12.xml b/devices/stm32/stm32f4-12.xml
index 36c69cac..73f92b86 100644
--- a/devices/stm32/stm32f4-12.xml
+++ b/devices/stm32/stm32f4-12.xml
@@ -136,7 +136,7 @@
       <instance value="1"/>
     </driver>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="1800">
+      <latency vcore-min="1710">
         <wait-state ws="0" hclk-max="16000000"/>
         <wait-state ws="1" hclk-max="32000000"/>
         <wait-state ws="2" hclk-max="48000000"/>
@@ -162,7 +162,7 @@
       </latency>
       <latency vcore-min="2700">
         <wait-state ws="0" hclk-max="30000000"/>
-        <wait-state ws="1" hclk-max="60000000"/>
+        <wait-state ws="1" hclk-max="64000000"/>
         <wait-state ws="2" hclk-max="90000000"/>
         <wait-state ws="3" hclk-max="100000000"/>
       </latency>
@@ -172,6 +172,7 @@
     </driver>
     <driver device-pin="r|v|z" name="fsmc" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32">
+      <feature value="dnf"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -199,6 +200,7 @@
       <instance value="5"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
@@ -609,7 +611,7 @@
         <signal af="1" driver="tim" instance="2" name="ch3"/>
         <signal af="2" driver="tim" instance="5" name="ch3"/>
         <signal af="3" driver="tim" instance="9" name="ch1"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="usart" instance="2" name="tx"/>
         <signal device-pin="r|v|z" af="12" driver="fsmc" name="d4"/>
         <signal device-pin="r|v|z" af="12" driver="fsmc" name="da4"/>
@@ -823,13 +825,13 @@
       <gpio device-pin="v" device-package="h" port="b" pin="11">
         <signal af="1" driver="tim" instance="2" name="ch4"/>
         <signal af="4" driver="i2c" instance="2" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="usart" instance="3" name="rx"/>
       </gpio>
       <gpio device-pin="z" device-package="j|t" port="b" pin="11">
         <signal af="1" driver="tim" instance="2" name="ch4"/>
         <signal af="4" driver="i2c" instance="2" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="usart" instance="3" name="rx"/>
       </gpio>
       <gpio port="b" pin="12">
@@ -950,7 +952,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="9" driver="quadspi" name="bk1_io0"/>
         <signal af="12" driver="sdio" name="d1"/>
       </gpio>
diff --git a/devices/stm32/stm32f4-13_23.xml b/devices/stm32/stm32f4-13_23.xml
index 1685b535..a4c9bdc3 100644
--- a/devices/stm32/stm32f4-13_23.xml
+++ b/devices/stm32/stm32f4-13_23.xml
@@ -73,9 +73,8 @@
       <attribute-cmsis-header value="stm32f4xx"/>
       <memory device-size="g" name="flash" access="rx" start="0x8000000" size="1048576"/>
       <memory device-size="h" name="flash" access="rx" start="0x8000000" size="1572864"/>
-      <memory name="ccm" access="rw" start="0x10000000" size="65536"/>
-      <memory name="sram" access="rwx" start="0x20000000" size="327680"/>
-      <memory name="backup" access="rwx" start="0x40024000" size="4096"/>
+      <memory name="sram1" access="rwx" start="0x20000000" size="262144"/>
+      <memory name="sram2" access="rwx" start="0x20040000" size="65536"/>
       <vector position="0" name="WWDG"/>
       <vector position="1" name="PVD"/>
       <vector position="2" name="TAMP_STAMP"/>
@@ -191,7 +190,7 @@
       <instance value="2"/>
     </driver>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="1800">
+      <latency vcore-min="1710">
         <wait-state ws="0" hclk-max="16000000"/>
         <wait-state ws="1" hclk-max="32000000"/>
         <wait-state ws="2" hclk-max="48000000"/>
@@ -209,16 +208,16 @@
         <wait-state ws="5" hclk-max="100000000"/>
       </latency>
       <latency vcore-min="2400">
-        <wait-state ws="0" hclk-max="24000000"/>
-        <wait-state ws="1" hclk-max="48000000"/>
-        <wait-state ws="2" hclk-max="72000000"/>
-        <wait-state ws="3" hclk-max="96000000"/>
+        <wait-state ws="0" hclk-max="20000000"/>
+        <wait-state ws="1" hclk-max="40000000"/>
+        <wait-state ws="2" hclk-max="60000000"/>
+        <wait-state ws="3" hclk-max="80000000"/>
         <wait-state ws="4" hclk-max="100000000"/>
       </latency>
       <latency vcore-min="2700">
-        <wait-state ws="0" hclk-max="30000000"/>
-        <wait-state ws="1" hclk-max="60000000"/>
-        <wait-state ws="2" hclk-max="90000000"/>
+        <wait-state ws="0" hclk-max="25000000"/>
+        <wait-state ws="1" hclk-max="50000000"/>
+        <wait-state ws="2" hclk-max="75000000"/>
         <wait-state ws="3" hclk-max="100000000"/>
       </latency>
     </driver>
@@ -227,6 +226,7 @@
     </driver>
     <driver device-pin="m|r|v|z" name="fsmc" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32">
+      <feature value="dnf"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -260,6 +260,7 @@
       <instance value="5"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
@@ -771,7 +772,7 @@
         <signal af="1" driver="tim" instance="2" name="ch3"/>
         <signal af="2" driver="tim" instance="5" name="ch3"/>
         <signal af="3" driver="tim" instance="9" name="ch1"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="usart" instance="2" name="tx"/>
         <signal device-pin="m|r|v|z" af="12" driver="fsmc" name="d4"/>
         <signal device-pin="m|r|v|z" af="12" driver="fsmc" name="da4"/>
@@ -1030,13 +1031,13 @@
       <gpio device-pin="v" device-package="h" port="b" pin="11">
         <signal af="1" driver="tim" instance="2" name="ch4"/>
         <signal af="4" driver="i2c" instance="2" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="usart" instance="3" name="rx"/>
       </gpio>
       <gpio device-pin="z" device-package="j|t" port="b" pin="11">
         <signal af="1" driver="tim" instance="2" name="ch4"/>
         <signal af="4" driver="i2c" instance="2" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="usart" instance="3" name="rx"/>
       </gpio>
       <gpio port="b" pin="12">
@@ -1176,7 +1177,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="dfsdm" instance="2" name="datin3"/>
         <signal af="9" driver="quadspi" name="bk1_io0"/>
         <signal af="12" driver="sdio" name="d1"/>
diff --git a/devices/stm32/stm32f4-27_29_37_39.xml b/devices/stm32/stm32f4-27_29_37_39.xml
index 826ca0db..45f58ed9 100644
--- a/devices/stm32/stm32f4-27_29_37_39.xml
+++ b/devices/stm32/stm32f4-27_29_37_39.xml
@@ -785,7 +785,7 @@
         <signal af="3" driver="tim" instance="8" name="ch1n"/>
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
-        <signal af="11" driver="eth" name="rcc_crs_dv"/>
+        <signal af="11" driver="eth" name="crs_dv"/>
         <signal af="11" driver="eth" name="rx_dv"/>
       </gpio>
       <gpio port="a" pin="8">
@@ -1058,7 +1058,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="12" driver="sdio" name="d1"/>
         <signal af="13" driver="dcmi" name="d3"/>
       </gpio>
diff --git a/devices/stm32/stm32f4-46.xml b/devices/stm32/stm32f4-46.xml
index 8125cc32..dd54cf72 100644
--- a/devices/stm32/stm32f4-46.xml
+++ b/devices/stm32/stm32f4-46.xml
@@ -31,7 +31,9 @@
       <attribute-cmsis-header value="stm32f4xx"/>
       <memory device-size="c" name="flash" access="rx" start="0x8000000" size="262144"/>
       <memory device-size="e" name="flash" access="rx" start="0x8000000" size="524288"/>
-      <memory name="sram" access="rwx" start="0x20000000" size="131072"/>
+      <memory name="sram1" access="rwx" start="0x20000000" size="114688"/>
+      <memory name="sram2" access="rwx" start="0x2001C000" size="16384"/>
+      <memory name="backup" access="rwx" start="0x40024000" size="4096"/>
       <vector position="0" name="WWDG"/>
       <vector position="1" name="PVD"/>
       <vector position="2" name="TAMP_STAMP"/>
@@ -986,7 +988,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="quadspi" name="bk1_io0"/>
         <signal af="12" driver="sdio" name="d1"/>
diff --git a/devices/stm32/stm32f4-69_79.xml b/devices/stm32/stm32f4-69_79.xml
index 2b0c7e2b..f8f73461 100644
--- a/devices/stm32/stm32f4-69_79.xml
+++ b/devices/stm32/stm32f4-69_79.xml
@@ -768,7 +768,7 @@
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
         <signal af="10" driver="quadspi" name="clk"/>
-        <signal device-pin="b|i|n" af="11" driver="eth" name="rcc_crs_dv"/>
+        <signal device-pin="b|i|n" af="11" driver="eth" name="crs_dv"/>
         <signal device-pin="b|i|n" af="11" driver="eth" name="rx_dv"/>
         <signal af="12" driver="fmc" name="sdnwe"/>
       </gpio>
@@ -1053,7 +1053,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="9" driver="quadspi" name="bk1_io0"/>
         <signal af="12" driver="sdio" name="d1"/>
         <signal af="13" driver="dcmi" name="d3"/>
diff --git a/devices/stm32/stm32f7-22_23_30_32_33.xml b/devices/stm32/stm32f7-22_23_30_32_33.xml
index 83999867..9efe1660 100644
--- a/devices/stm32/stm32f7-22_23_30_32_33.xml
+++ b/devices/stm32/stm32f7-22_23_30_32_33.xml
@@ -71,12 +71,12 @@
       <attribute-cmsis-define device-name="33" value="STM32F733xx"/>
       <attribute-cmsis-header value="stm32f7xx"/>
       <memory name="itcm" access="rwx" start="0x00" size="16384"/>
+      <memory device-name="30" name="itcm_flash" access="rx" start="0x200000" size="65536"/>
       <memory device-size="c" name="itcm_flash" access="rx" start="0x200000" size="262144"/>
       <memory device-size="e" name="itcm_flash" access="rx" start="0x200000" size="524288"/>
-      <memory device-name="30" name="itcm_flash" access="rx" start="0x200000" size="1048576"/>
+      <memory device-name="30" name="flash" access="rx" start="0x8000000" size="65536" alias="itcm_flash"/>
       <memory device-size="c" name="flash" access="rx" start="0x8000000" size="262144" alias="itcm_flash"/>
       <memory device-size="e" name="flash" access="rx" start="0x8000000" size="524288" alias="itcm_flash"/>
-      <memory device-name="30" name="flash" access="rx" start="0x8000000" size="1048576" alias="itcm_flash"/>
       <memory name="dtcm" access="rwx" start="0x20000000" size="65536"/>
       <memory name="sram1" access="rwx" start="0x20010000" size="180224"/>
       <memory name="sram2" access="rwx" start="0x2003C000" size="16384"/>
@@ -175,7 +175,7 @@
     </driver>
     <driver device-name="30|32|33" name="aes" type="stm32-v1.0"/>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
       <instance value="1"/>
     </driver>
     <driver name="crc" type="stm32">
@@ -227,7 +227,8 @@
         <wait-state ws="3" hclk-max="120000000"/>
         <wait-state ws="4" hclk-max="150000000"/>
         <wait-state ws="5" hclk-max="180000000"/>
-        <wait-state ws="6" hclk-max="216000000"/>
+        <wait-state ws="6" hclk-max="210000000"/>
+        <wait-state ws="7" hclk-max="216000000"/>
       </latency>
     </driver>
     <driver device-pin="i|v|z" name="fmc" type="stm32-v2.0"/>
@@ -1071,7 +1072,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="quadspi" name="bk1_io0"/>
         <signal af="12" driver="sdmmc" instance="1" name="d1"/>
diff --git a/devices/stm32/stm32f7-45_46_50_56.xml b/devices/stm32/stm32f7-45_46_50_56.xml
index 20e91691..997705cd 100644
--- a/devices/stm32/stm32f7-45_46_50_56.xml
+++ b/devices/stm32/stm32f7-45_46_50_56.xml
@@ -66,10 +66,12 @@
       <attribute-cmsis-define device-name="56" value="STM32F756xx"/>
       <attribute-cmsis-header value="stm32f7xx"/>
       <memory name="itcm" access="rwx" start="0x00" size="16384"/>
+      <memory device-name="50" name="itcm_flash" access="rx" start="0x200000" size="65536"/>
       <memory device-size="e" name="itcm_flash" access="rx" start="0x200000" size="524288"/>
-      <memory device-size="8|g" name="itcm_flash" access="rx" start="0x200000" size="1048576"/>
+      <memory device-size="g" name="itcm_flash" access="rx" start="0x200000" size="1048576"/>
+      <memory device-name="50" name="flash" access="rx" start="0x8000000" size="65536" alias="itcm_flash"/>
       <memory device-size="e" name="flash" access="rx" start="0x8000000" size="524288" alias="itcm_flash"/>
-      <memory device-size="8|g" name="flash" access="rx" start="0x8000000" size="1048576" alias="itcm_flash"/>
+      <memory device-size="g" name="flash" access="rx" start="0x8000000" size="1048576" alias="itcm_flash"/>
       <memory name="dtcm" access="rwx" start="0x20000000" size="65536"/>
       <memory name="sram1" access="rwx" start="0x20010000" size="245760"/>
       <memory name="sram2" access="rwx" start="0x2004C000" size="16384"/>
@@ -237,7 +239,8 @@
         <wait-state ws="3" hclk-max="120000000"/>
         <wait-state ws="4" hclk-max="150000000"/>
         <wait-state ws="5" hclk-max="180000000"/>
-        <wait-state ws="6" hclk-max="216000000"/>
+        <wait-state ws="6" hclk-max="210000000"/>
+        <wait-state ws="7" hclk-max="216000000"/>
       </latency>
     </driver>
     <driver name="fmc" type="stm32-v2.0"/>
@@ -859,7 +862,7 @@
         <signal af="5" driver="i2s" instance="1" name="sd"/>
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
-        <signal af="11" driver="eth" name="rcc_crs_dv"/>
+        <signal af="11" driver="eth" name="crs_dv"/>
         <signal af="11" driver="eth" name="rx_dv"/>
         <signal af="12" driver="fmc" name="sdnwe"/>
       </gpio>
@@ -1164,7 +1167,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="quadspi" name="bk1_io0"/>
         <signal af="12" driver="sdmmc" instance="1" name="d1"/>
diff --git a/devices/stm32/stm32f7-65.xml b/devices/stm32/stm32f7-65.xml
index d287c994..e985f64a 100644
--- a/devices/stm32/stm32f7-65.xml
+++ b/devices/stm32/stm32f7-65.xml
@@ -210,7 +210,8 @@
         <wait-state ws="3" hclk-max="120000000"/>
         <wait-state ws="4" hclk-max="150000000"/>
         <wait-state ws="5" hclk-max="180000000"/>
-        <wait-state ws="6" hclk-max="216000000"/>
+        <wait-state ws="6" hclk-max="210000000"/>
+        <wait-state ws="7" hclk-max="216000000"/>
       </latency>
     </driver>
     <driver name="fmc" type="stm32-v2.0"/>
@@ -285,12 +286,14 @@
       <instance value="14"/>
     </driver>
     <driver name="uart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
       <instance value="8"/>
     </driver>
     <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -855,7 +858,7 @@
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="8" driver="spi" instance="6" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
-        <signal af="11" driver="eth" name="rcc_crs_dv"/>
+        <signal af="11" driver="eth" name="crs_dv"/>
         <signal af="11" driver="eth" name="rx_dv"/>
         <signal af="12" driver="fmc" name="sdnwe"/>
       </gpio>
@@ -1221,7 +1224,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="quadspi" name="bk1_io0"/>
         <signal af="12" driver="sdmmc" instance="1" name="d1"/>
diff --git a/devices/stm32/stm32f7-67_68_77_78.xml b/devices/stm32/stm32f7-67_68_77_78.xml
index c5701dca..8fb31617 100644
--- a/devices/stm32/stm32f7-67_68_77_78.xml
+++ b/devices/stm32/stm32f7-67_68_77_78.xml
@@ -229,7 +229,8 @@
         <wait-state ws="3" hclk-max="120000000"/>
         <wait-state ws="4" hclk-max="150000000"/>
         <wait-state ws="5" hclk-max="180000000"/>
-        <wait-state ws="6" hclk-max="216000000"/>
+        <wait-state ws="6" hclk-max="210000000"/>
+        <wait-state ws="7" hclk-max="216000000"/>
       </latency>
     </driver>
     <driver name="fmc" type="stm32-v2.0"/>
@@ -307,12 +308,14 @@
       <instance value="14"/>
     </driver>
     <driver name="uart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
       <instance value="8"/>
     </driver>
     <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -905,7 +908,7 @@
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="8" driver="spi" instance="6" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
-        <signal device-name="67|77" af="11" driver="eth" name="rcc_crs_dv"/>
+        <signal device-name="67|77" af="11" driver="eth" name="crs_dv"/>
         <signal device-name="67|77" af="11" driver="eth" name="rx_dv"/>
         <signal af="12" driver="fmc" name="sdnwe"/>
       </gpio>
@@ -1291,7 +1294,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="quadspi" name="bk1_io0"/>
         <signal af="10" driver="ltdc" name="g3"/>
diff --git a/devices/stm32/stm32f7-69_79.xml b/devices/stm32/stm32f7-69_79.xml
index f6ec16ed..8863c835 100644
--- a/devices/stm32/stm32f7-69_79.xml
+++ b/devices/stm32/stm32f7-69_79.xml
@@ -209,7 +209,8 @@
         <wait-state ws="3" hclk-max="120000000"/>
         <wait-state ws="4" hclk-max="150000000"/>
         <wait-state ws="5" hclk-max="180000000"/>
-        <wait-state ws="6" hclk-max="216000000"/>
+        <wait-state ws="6" hclk-max="210000000"/>
+        <wait-state ws="7" hclk-max="216000000"/>
       </latency>
     </driver>
     <driver name="fmc" type="stm32-v2.0"/>
@@ -287,12 +288,14 @@
       <instance value="14"/>
     </driver>
     <driver name="uart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
       <instance value="8"/>
     </driver>
     <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -885,7 +888,7 @@
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="8" driver="spi" instance="6" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
-        <signal device-pin="b|i|n" af="11" driver="eth" name="rcc_crs_dv"/>
+        <signal device-pin="b|i|n" af="11" driver="eth" name="crs_dv"/>
         <signal device-pin="b|i|n" af="11" driver="eth" name="rx_dv"/>
         <signal af="12" driver="fmc" name="sdnwe"/>
       </gpio>
@@ -1271,7 +1274,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="quadspi" name="bk1_io0"/>
         <signal af="10" driver="ltdc" name="g3"/>
diff --git a/devices/stm32/stm32g0-30_31_41.xml b/devices/stm32/stm32g0-30_31_41.xml
index 266c75ee..9c0226f3 100644
--- a/devices/stm32/stm32g0-30_31_41.xml
+++ b/devices/stm32/stm32g0-30_31_41.xml
@@ -111,6 +111,7 @@
     </driver>
     <driver device-name="41" name="aes" type="stm32-v1.0"/>
     <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="flash" type="stm32-v1.0">
@@ -158,7 +159,6 @@
     </driver>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
-      <feature value="exti"/>
       <feature value="itline"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
@@ -173,6 +173,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -440,7 +441,7 @@
         <signal af="1" driver="usart" instance="1" name="de"/>
         <signal af="1" driver="usart" instance="1" name="rts"/>
         <signal af="2" driver="tim" instance="1" name="etr"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="i2c" instance="2" name="sda"/>
       </gpio>
       <gpio port="a" pin="13">
diff --git a/devices/stm32/stm32g0-50_51_61.xml b/devices/stm32/stm32g0-50_51_61.xml
index 5d90f652..b399baee 100644
--- a/devices/stm32/stm32g0-50_51_61.xml
+++ b/devices/stm32/stm32g0-50_51_61.xml
@@ -95,6 +95,7 @@
       <instance value="2"/>
     </driver>
     <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver device-name="51|61" name="dac" type="stm32">
@@ -146,7 +147,6 @@
     </driver>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
-      <feature value="exti"/>
       <feature value="itline"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
@@ -166,6 +166,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -474,7 +475,7 @@
         <signal af="1" driver="usart" instance="1" name="de"/>
         <signal af="1" driver="usart" instance="1" name="rts"/>
         <signal af="2" driver="tim" instance="1" name="etr"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="i2c" instance="2" name="sda"/>
         <signal device-name="51|61" af="7" driver="comp" instance="2" name="out"/>
       </gpio>
diff --git a/devices/stm32/stm32g0-70_b0.xml b/devices/stm32/stm32g0-70_b0.xml
index 3c261553..05841e5e 100644
--- a/devices/stm32/stm32g0-70_b0.xml
+++ b/devices/stm32/stm32g0-70_b0.xml
@@ -61,6 +61,7 @@
       <instance value="1"/>
     </driver>
     <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="flash" type="stm32-v1.0">
@@ -106,7 +107,6 @@
     </driver>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
-      <feature value="exti"/>
       <feature value="itline"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
@@ -126,6 +126,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -430,7 +431,7 @@
         <signal device-name="b0" af="1" driver="i2s" instance="2" name="ws"/>
         <signal af="1" driver="spi" instance="2" name="nss"/>
         <signal af="2" driver="tim" instance="1" name="ch1"/>
-        <signal device-name="b0" af="4" name="crs1_sync"/>
+        <signal device-name="b0" af="4" driver="rcc" name="crs1_sync"/>
         <signal device-name="b0" af="8" driver="i2c" instance="2" name="smba"/>
       </gpio>
       <gpio port="a" pin="9">
@@ -471,7 +472,7 @@
         <signal af="1" driver="usart" instance="1" name="de"/>
         <signal af="1" driver="usart" instance="1" name="rts"/>
         <signal af="2" driver="tim" instance="1" name="etr"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="i2c" instance="2" name="sda"/>
       </gpio>
       <gpio port="a" pin="13">
@@ -695,7 +696,7 @@
         <signal af="2" driver="tim" instance="1" name="ch1"/>
       </gpio>
       <gpio device-pin="r|v" port="c" pin="9">
-        <signal af="0" driver="i2s" name="ckin"/>
+        <signal af="0" driver="rcc" name="i2s_ckin"/>
         <signal af="1" driver="tim" instance="3" name="ch4"/>
         <signal af="2" driver="tim" instance="1" name="ch2"/>
         <signal device-name="b0" device-pin="r|v" af="6" driver="usb" name="noe"/>
@@ -821,7 +822,7 @@
         <signal af="2" driver="tim" instance="4" name="ch3"/>
       </gpio>
       <gpio device-pin="v" port="d" pin="15">
-        <signal af="0" name="crs1_sync"/>
+        <signal af="0" driver="rcc" name="crs1_sync"/>
         <signal af="2" driver="tim" instance="4" name="ch4"/>
       </gpio>
       <gpio device-pin="v" port="e" pin="0">
@@ -893,7 +894,7 @@
       </gpio>
       <gpio device-pin="c|r|v" port="f" pin="0">
         <signal driver="rcc" name="osc_in"/>
-        <signal device-name="b0" device-pin="c|r|v" af="0" name="crs1_sync"/>
+        <signal device-name="b0" device-pin="c|r|v" af="0" driver="rcc" name="crs1_sync"/>
         <signal af="2" driver="tim" instance="14" name="ch1"/>
       </gpio>
       <gpio device-pin="c|r|v" port="f" pin="1">
diff --git a/devices/stm32/stm32g0-71_81.xml b/devices/stm32/stm32g0-71_81.xml
index 07878de5..d267514d 100644
--- a/devices/stm32/stm32g0-71_81.xml
+++ b/devices/stm32/stm32g0-71_81.xml
@@ -119,6 +119,7 @@
       <instance value="2"/>
     </driver>
     <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="dac" type="stm32">
@@ -171,7 +172,6 @@
     </driver>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
-      <feature value="exti"/>
       <feature value="itline"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
@@ -196,12 +196,12 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
       <instance value="4"/>
     </driver>
-    <driver name="usbpd" type="stm32-v1.5"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="dma" type="stm32-mux">
       <instance value="1"/>
@@ -560,7 +560,7 @@
         <signal af="1" driver="usart" instance="1" name="de"/>
         <signal af="1" driver="usart" instance="1" name="rts"/>
         <signal af="2" driver="tim" instance="1" name="etr"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="i2c" instance="2" name="sda"/>
         <signal af="7" driver="comp" instance="2" name="out"/>
       </gpio>
@@ -820,7 +820,7 @@
         <signal af="2" driver="tim" instance="1" name="ch1"/>
       </gpio>
       <gpio device-pin="r" port="c" pin="9">
-        <signal af="0" driver="i2s" name="ckin"/>
+        <signal af="0" driver="rcc" name="i2s_ckin"/>
         <signal af="1" driver="tim" instance="3" name="ch4"/>
         <signal af="2" driver="tim" instance="1" name="ch2"/>
       </gpio>
diff --git a/devices/stm32/stm32g0-b1_c1.xml b/devices/stm32/stm32g0-b1_c1.xml
index 00d4c827..263b892f 100644
--- a/devices/stm32/stm32g0-b1_c1.xml
+++ b/devices/stm32/stm32g0-b1_c1.xml
@@ -141,6 +141,7 @@
       <instance value="3"/>
     </driver>
     <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="dac" type="stm32">
@@ -202,7 +203,6 @@
     </driver>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
-      <feature value="exti"/>
       <feature value="itline"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
@@ -229,6 +229,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -237,7 +238,6 @@
       <instance value="6"/>
     </driver>
     <driver name="usb" type="stm32-v1.0"/>
-    <driver name="usbpd" type="stm32-v1.5"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="dma" type="stm32-mux">
       <instance value="1"/>
@@ -652,7 +652,7 @@
         <signal af="1" driver="i2s" instance="2" name="ws"/>
         <signal af="1" driver="spi" instance="2" name="nss"/>
         <signal af="2" driver="tim" instance="1" name="ch1"/>
-        <signal af="4" name="crs1_sync"/>
+        <signal af="4" driver="rcc" name="crs1_sync"/>
         <signal af="5" driver="lptim" instance="2" name="out"/>
         <signal af="8" driver="i2c" instance="2" name="smba"/>
       </gpio>
@@ -699,7 +699,7 @@
         <signal af="1" driver="usart" instance="1" name="rts"/>
         <signal af="2" driver="tim" instance="1" name="etr"/>
         <signal af="3" driver="fdcan" instance="1" name="tx"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="i2c" instance="2" name="sda"/>
         <signal af="7" driver="comp" instance="2" name="out"/>
       </gpio>
@@ -1125,7 +1125,7 @@
         <signal af="3" driver="lpuart" instance="2" name="cts"/>
       </gpio>
       <gpio device-pin="m|r|v" port="c" pin="9">
-        <signal af="0" driver="i2s" name="ckin"/>
+        <signal af="0" driver="rcc" name="i2s_ckin"/>
         <signal af="1" driver="tim" instance="3" name="ch4"/>
         <signal af="2" driver="tim" instance="1" name="ch2"/>
         <signal af="3" driver="lpuart" instance="2" name="de"/>
@@ -1333,7 +1333,7 @@
         <signal af="3" driver="fdcan" instance="2" name="rx"/>
       </gpio>
       <gpio device-pin="m|v" port="d" pin="15">
-        <signal af="0" name="crs1_sync"/>
+        <signal af="0" driver="rcc" name="crs1_sync"/>
         <signal af="1" driver="lpuart" instance="2" name="de"/>
         <signal af="1" driver="lpuart" instance="2" name="rts"/>
         <signal af="2" driver="tim" instance="4" name="ch4"/>
@@ -1410,7 +1410,7 @@
       </gpio>
       <gpio device-pin="c|m|n|r|v" port="f" pin="0">
         <signal driver="rcc" name="osc_in"/>
-        <signal af="0" name="crs1_sync"/>
+        <signal af="0" driver="rcc" name="crs1_sync"/>
         <signal af="2" driver="tim" instance="14" name="ch1"/>
       </gpio>
       <gpio device-pin="c|m|n|r|v" port="f" pin="1">
diff --git a/devices/stm32/stm32g4-11.xml b/devices/stm32/stm32g4-11.xml
index d779260e..31ca125b 100644
--- a/devices/stm32/stm32g4-11.xml
+++ b/devices/stm32/stm32g4-11.xml
@@ -101,6 +101,7 @@
       <vector position="101" name="FMAC"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance device-size="c" value="3"/>
@@ -109,10 +110,10 @@
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
-      <instance device-size="6|8|b" value="4"/>
     </driver>
     <driver name="cordic" type="stm32-v1.0"/>
     <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="dac" type="stm32">
@@ -126,20 +127,23 @@
     </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="8000000"/>
-        <wait-state ws="1" hclk-max="16000000"/>
+        <wait-state ws="0" hclk-max="12000000"/>
+        <wait-state ws="1" hclk-max="24000000"/>
         <wait-state ws="2" hclk-max="26000000"/>
       </latency>
+      <latency vcore-min="1200">
+        <wait-state ws="0" hclk-max="30000000"/>
+        <wait-state ws="1" hclk-max="60000000"/>
+        <wait-state ws="2" hclk-max="90000000"/>
+        <wait-state ws="3" hclk-max="120000000"/>
+        <wait-state ws="4" hclk-max="150000000"/>
+      </latency>
       <latency vcore-min="1280">
-        <wait-state ws="0" hclk-max="20000000"/>
-        <wait-state ws="1" hclk-max="40000000"/>
-        <wait-state ws="2" hclk-max="60000000"/>
-        <wait-state ws="3" hclk-max="80000000"/>
-        <wait-state ws="4" hclk-max="100000000"/>
-        <wait-state ws="5" hclk-max="120000000"/>
-        <wait-state ws="6" hclk-max="140000000"/>
-        <wait-state ws="7" hclk-max="160000000"/>
-        <wait-state ws="8" hclk-max="170000000"/>
+        <wait-state ws="0" hclk-max="34000000"/>
+        <wait-state ws="1" hclk-max="68000000"/>
+        <wait-state ws="2" hclk-max="102000000"/>
+        <wait-state ws="3" hclk-max="136000000"/>
+        <wait-state ws="4" hclk-max="170000000"/>
       </latency>
     </driver>
     <driver device-size="c" name="fmac" type="stm32-v1.0"/>
@@ -164,8 +168,6 @@
     </driver>
     <driver name="opamp" type="stm32-g4_tsmc90_fastopamp_cube">
       <instance value="1"/>
-      <instance device-size="6|8|b" value="2"/>
-      <instance device-size="6|8|b" value="3"/>
     </driver>
     <driver name="pwr" type="stm32-v1.0"/>
     <driver name="rcc" type="stm32-v1.0">
@@ -181,10 +183,10 @@
       <instance value="2"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="ccm-wp"/>
       <feature value="cfgr2"/>
       <feature value="exti"/>
       <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
@@ -206,14 +208,15 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="usbpd" type="stm32-v1.4"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="dma" type="stm32-mux">
       <instance value="1"/>
@@ -501,8 +504,6 @@
         <signal driver="comp" instance="1" name="inp"/>
         <signal driver="opamp" instance="1" name="vinp"/>
         <signal driver="opamp" instance="1" name="vinp_sec"/>
-        <signal device-size="6|8|b" driver="opamp" instance="3" name="vinp"/>
-        <signal device-size="6|8|b" driver="opamp" instance="3" name="vinp_sec"/>
         <signal af="0" driver="rtc" name="refin"/>
         <signal af="1" driver="tim" instance="2" name="ch2"/>
         <signal af="7" driver="usart" instance="2" name="de"/>
@@ -546,16 +547,12 @@
         <signal driver="adc" instance="2" name="in13"/>
         <signal driver="comp" instance="2" name="inm"/>
         <signal driver="dac" instance="1" name="out2"/>
-        <signal device-size="6|8|b" driver="opamp" instance="2" name="vinm"/>
-        <signal device-size="6|8|b" driver="opamp" instance="2" name="vinm0"/>
-        <signal device-size="6|8|b" driver="opamp" instance="2" name="vinm_sec"/>
         <signal af="1" driver="tim" instance="2" name="ch1"/>
         <signal af="2" driver="tim" instance="2" name="etr"/>
         <signal af="5" driver="spi" instance="1" name="sck"/>
       </gpio>
       <gpio port="a" pin="6">
         <signal driver="adc" instance="2" name="in3"/>
-        <signal device-size="6|8|b" driver="opamp" instance="2" name="vout"/>
         <signal af="1" driver="tim" instance="16" name="ch1"/>
         <signal af="2" driver="tim" instance="3" name="ch1"/>
         <signal af="4" driver="tim" instance="8" name="bkin"/>
@@ -569,8 +566,6 @@
         <signal driver="comp" instance="2" name="inp"/>
         <signal driver="opamp" instance="1" name="vinp"/>
         <signal driver="opamp" instance="1" name="vinp_sec"/>
-        <signal device-size="6|8|b" driver="opamp" instance="2" name="vinp"/>
-        <signal device-size="6|8|b" driver="opamp" instance="2" name="vinp_sec"/>
         <signal af="1" driver="tim" instance="17" name="ch1"/>
         <signal af="2" driver="tim" instance="3" name="ch2"/>
         <signal af="4" driver="tim" instance="8" name="ch1n"/>
@@ -618,7 +613,7 @@
       </gpio>
       <gpio port="a" pin="12">
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
@@ -660,11 +655,6 @@
       <gpio port="b" pin="0">
         <signal driver="adc" instance="1" name="in15"/>
         <signal device-size="c" driver="adc" instance="3" name="in12"/>
-        <signal device-size="6|8|b" driver="comp" instance="4" name="inp"/>
-        <signal device-size="6|8|b" driver="opamp" instance="2" name="vinp"/>
-        <signal device-size="6|8|b" driver="opamp" instance="2" name="vinp_sec"/>
-        <signal device-size="6|8|b" driver="opamp" instance="3" name="vinp"/>
-        <signal device-size="6|8|b" driver="opamp" instance="3" name="vinp_sec"/>
         <signal af="2" driver="tim" instance="3" name="ch3"/>
         <signal af="4" driver="tim" instance="8" name="ch2n"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
@@ -673,20 +663,14 @@
         <signal driver="adc" instance="1" name="in12"/>
         <signal device-size="c" driver="adc" instance="3" name="in1"/>
         <signal driver="comp" instance="1" name="inp"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" driver="opamp" instance="3" name="vout"/>
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="4" driver="tim" instance="8" name="ch3n"/>
         <signal af="6" driver="tim" instance="1" name="ch3n"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" af="8" driver="comp" instance="4" name="out"/>
         <signal af="12" driver="lpuart" instance="1" name="de"/>
         <signal af="12" driver="lpuart" instance="1" name="rts"/>
       </gpio>
       <gpio device-pin="c|m|r" port="b" pin="2">
         <signal driver="adc" instance="2" name="in12"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" driver="comp" instance="4" name="inm"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" driver="opamp" instance="3" name="vinm"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" driver="opamp" instance="3" name="vinm0"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" driver="opamp" instance="3" name="vinm_sec"/>
         <signal af="0" driver="rtc" name="out2"/>
         <signal af="1" driver="lptim" instance="1" name="out"/>
         <signal device-size="c" af="3" driver="tim" instance="20" name="ch1"/>
@@ -727,7 +711,6 @@
         <signal af="5" driver="tim" instance="8" name="ch1"/>
         <signal af="6" driver="tim" instance="8" name="etr"/>
         <signal af="7" driver="usart" instance="1" name="tx"/>
-        <signal device-size="6|8|b" af="8" driver="comp" instance="4" name="out"/>
         <signal af="10" driver="tim" instance="8" name="bkin2"/>
         <signal af="11" driver="lptim" instance="1" name="etr"/>
       </gpio>
@@ -762,9 +745,6 @@
         <signal af="12" driver="tim" instance="1" name="ch3n"/>
       </gpio>
       <gpio device-pin="c|m|r" port="b" pin="10">
-        <signal device-pin="c|m|r" device-size="6|8|b" driver="opamp" instance="3" name="vinm"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" driver="opamp" instance="3" name="vinm1"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" driver="opamp" instance="3" name="vinm_sec"/>
         <signal af="1" driver="tim" instance="2" name="ch3"/>
         <signal af="8" driver="lpuart" instance="1" name="rx"/>
         <signal af="12" driver="tim" instance="1" name="bkin"/>
@@ -786,8 +766,6 @@
       </gpio>
       <gpio device-pin="c|m|r" port="b" pin="13">
         <signal device-size="c" driver="adc" instance="3" name="in5"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" driver="opamp" instance="3" name="vinp"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" driver="opamp" instance="3" name="vinp_sec"/>
         <signal af="5" driver="i2s" instance="2" name="ck"/>
         <signal af="5" driver="spi" instance="2" name="sck"/>
         <signal af="6" driver="tim" instance="1" name="ch1n"/>
@@ -795,12 +773,9 @@
       </gpio>
       <gpio device-pin="c|m|r" port="b" pin="14">
         <signal driver="adc" instance="1" name="in5"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" driver="opamp" instance="2" name="vinp"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" driver="opamp" instance="2" name="vinp_sec"/>
         <signal af="1" driver="tim" instance="15" name="ch1"/>
         <signal af="5" driver="spi" instance="2" name="miso"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
-        <signal device-pin="c|m|r" device-size="6|8|b" af="8" driver="comp" instance="4" name="out"/>
       </gpio>
       <gpio device-pin="c|m|r" port="b" pin="15">
         <signal driver="adc" instance="2" name="in15"/>
@@ -860,9 +835,6 @@
         <signal driver="opamp" instance="1" name="vinm"/>
         <signal driver="opamp" instance="1" name="vinm1"/>
         <signal driver="opamp" instance="1" name="vinm_sec"/>
-        <signal device-pin="m|r" device-size="6|8|b" driver="opamp" instance="2" name="vinm"/>
-        <signal device-pin="m|r" device-size="6|8|b" driver="opamp" instance="2" name="vinm1"/>
-        <signal device-pin="m|r" device-size="6|8|b" driver="opamp" instance="2" name="vinm_sec"/>
         <signal driver="sys" name="wkup5"/>
         <signal af="2" driver="tim" instance="15" name="bkin"/>
         <signal af="6" driver="tim" instance="1" name="ch4n"/>
@@ -890,7 +862,7 @@
       <gpio device-pin="m|r" port="c" pin="9">
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="4" driver="tim" instance="8" name="ch4"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="8" name="bkin2"/>
       </gpio>
       <gpio device-pin="m|r" device-package="t" port="c" pin="10">
@@ -947,12 +919,10 @@
       </gpio>
       <gpio device-pin="m" port="e" pin="7">
         <signal device-size="c" driver="adc" instance="3" name="in4"/>
-        <signal device-size="6|8|b" driver="comp" instance="4" name="inp"/>
         <signal af="2" driver="tim" instance="1" name="etr"/>
       </gpio>
       <gpio device-pin="m" port="e" pin="8">
         <signal device-size="c" driver="adc" instance="3" name="in6"/>
-        <signal device-size="6|8|b" driver="comp" instance="4" name="inm"/>
         <signal af="2" driver="tim" instance="1" name="ch1n"/>
       </gpio>
       <gpio device-pin="m" port="e" pin="9">
diff --git a/devices/stm32/stm32g4-14.xml b/devices/stm32/stm32g4-14.xml
index 7a043647..01da83ea 100644
--- a/devices/stm32/stm32g4-14.xml
+++ b/devices/stm32/stm32g4-14.xml
@@ -16,7 +16,7 @@
       <memory device-size="b" name="flash" access="rx" start="0x8000000" size="131072"/>
       <memory device-size="c" name="flash" access="rx" start="0x8000000" size="262144"/>
       <memory name="ccm" access="rwx" start="0x10000000" size="20480"/>
-      <memory name="sram" access="rwx" start="0x20000000" size="110592"/>
+      <memory name="sram" access="rwx" start="0x20000000" size="40960"/>
       <vector position="0" name="WWDG"/>
       <vector position="1" name="PVD_PVM"/>
       <vector position="2" name="RTC_TAMP_LSECSS"/>
@@ -98,6 +98,7 @@
       <vector position="101" name="FMAC"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -113,6 +114,7 @@
     </driver>
     <driver name="cordic" type="stm32-v1.0"/>
     <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="dac" type="stm32">
@@ -128,20 +130,23 @@
     </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="8000000"/>
-        <wait-state ws="1" hclk-max="16000000"/>
+        <wait-state ws="0" hclk-max="12000000"/>
+        <wait-state ws="1" hclk-max="24000000"/>
         <wait-state ws="2" hclk-max="26000000"/>
       </latency>
+      <latency vcore-min="1200">
+        <wait-state ws="0" hclk-max="30000000"/>
+        <wait-state ws="1" hclk-max="60000000"/>
+        <wait-state ws="2" hclk-max="90000000"/>
+        <wait-state ws="3" hclk-max="120000000"/>
+        <wait-state ws="4" hclk-max="150000000"/>
+      </latency>
       <latency vcore-min="1280">
-        <wait-state ws="0" hclk-max="20000000"/>
-        <wait-state ws="1" hclk-max="40000000"/>
-        <wait-state ws="2" hclk-max="60000000"/>
-        <wait-state ws="3" hclk-max="80000000"/>
-        <wait-state ws="4" hclk-max="100000000"/>
-        <wait-state ws="5" hclk-max="120000000"/>
-        <wait-state ws="6" hclk-max="140000000"/>
-        <wait-state ws="7" hclk-max="160000000"/>
-        <wait-state ws="8" hclk-max="170000000"/>
+        <wait-state ws="0" hclk-max="34000000"/>
+        <wait-state ws="1" hclk-max="68000000"/>
+        <wait-state ws="2" hclk-max="102000000"/>
+        <wait-state ws="3" hclk-max="136000000"/>
+        <wait-state ws="4" hclk-max="170000000"/>
       </latency>
     </driver>
     <driver name="fmac" type="stm32-v1.0"/>
@@ -180,16 +185,15 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="ccm-wp"/>
       <feature value="cfgr2"/>
       <feature value="exti"/>
       <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
       <instance value="8"/>
-      <instance value="20"/>
     </driver>
     <driver name="tim" type="stm32-basic">
       <instance value="6"/>
@@ -205,16 +209,16 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
-      <instance value="3"/>
     </driver>
-    <driver name="usbpd" type="stm32-v1.4"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="dma" type="stm32-mux">
       <instance value="1"/>
@@ -295,12 +299,6 @@
         <request position="27">
           <signal driver="usart" instance="2" name="tx"/>
         </request>
-        <request position="28">
-          <signal driver="usart" instance="3" name="rx"/>
-        </request>
-        <request position="29">
-          <signal driver="usart" instance="3" name="tx"/>
-        </request>
         <request position="30">
           <signal driver="uart" instance="4" name="rx"/>
         </request>
@@ -439,33 +437,12 @@
         <request position="85">
           <signal driver="tim" instance="17" name="up"/>
         </request>
-        <request position="86">
-          <signal driver="tim" instance="20" name="ch1"/>
-        </request>
-        <request position="87">
-          <signal driver="tim" instance="20" name="ch2"/>
-        </request>
-        <request position="88">
-          <signal driver="tim" instance="20" name="ch3"/>
-        </request>
-        <request position="89">
-          <signal driver="tim" instance="20" name="ch4"/>
-        </request>
-        <request position="90">
-          <signal driver="tim" instance="20" name="up"/>
-        </request>
         <request position="91">
           <signal driver="aes" name="in"/>
         </request>
         <request position="92">
           <signal driver="aes" name="out"/>
         </request>
-        <request position="93">
-          <signal driver="tim" instance="20" name="trig"/>
-        </request>
-        <request position="94">
-          <signal driver="tim" instance="20" name="com"/>
-        </request>
         <request position="95">
           <signal driver="hrtim" instance="1" name="m"/>
         </request>
@@ -661,7 +638,7 @@
       </gpio>
       <gpio port="a" pin="12">
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal af="5" name="i2s_ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
@@ -677,8 +654,6 @@
         <signal af="1" driver="tim" instance="16" name="ch1n"/>
         <signal af="4" driver="i2c" instance="1" name="scl"/>
         <signal af="5" driver="irtim" name="out"/>
-        <signal af="7" driver="usart" instance="3" name="cts"/>
-        <signal af="7" driver="usart" instance="3" name="nss"/>
         <signal af="10" driver="tim" instance="4" name="ch3"/>
       </gpio>
       <gpio port="a" pin="14">
@@ -728,7 +703,6 @@
         <signal driver="comp" instance="4" name="inm"/>
         <signal af="0" driver="rtc" name="out2"/>
         <signal af="1" driver="lptim" instance="1" name="out"/>
-        <signal af="3" driver="tim" instance="20" name="ch1"/>
         <signal af="4" driver="i2c" instance="3" name="smba"/>
         <signal af="13" driver="hrtim" instance="1" name="scin"/>
       </gpio>
@@ -801,7 +775,6 @@
         <signal af="1" driver="tim" instance="16" name="ch1"/>
         <signal af="2" driver="tim" instance="4" name="ch3"/>
         <signal af="4" driver="i2c" instance="1" name="scl"/>
-        <signal af="7" driver="usart" instance="3" name="rx"/>
         <signal af="8" driver="comp" instance="1" name="out"/>
         <signal af="9" driver="fdcan" instance="1" name="rx"/>
         <signal af="10" driver="tim" instance="8" name="ch2"/>
@@ -813,7 +786,6 @@
         <signal af="2" driver="tim" instance="4" name="ch4"/>
         <signal af="4" driver="i2c" instance="1" name="sda"/>
         <signal af="6" driver="irtim" name="out"/>
-        <signal af="7" driver="usart" instance="3" name="tx"/>
         <signal af="8" driver="comp" instance="2" name="out"/>
         <signal af="9" driver="fdcan" instance="1" name="tx"/>
         <signal af="10" driver="tim" instance="8" name="ch3"/>
@@ -823,7 +795,6 @@
       <gpio port="b" pin="10">
         <signal driver="comp" instance="5" name="inm"/>
         <signal af="1" driver="tim" instance="2" name="ch3"/>
-        <signal af="7" driver="usart" instance="3" name="tx"/>
         <signal af="8" driver="lpuart" instance="1" name="rx"/>
         <signal af="12" driver="tim" instance="1" name="bkin"/>
         <signal af="13" driver="hrtim" instance="1" name="flt3"/>
@@ -833,7 +804,6 @@
         <signal driver="adc" instance="2" name="in14"/>
         <signal driver="comp" instance="6" name="inp"/>
         <signal af="1" driver="tim" instance="2" name="ch4"/>
-        <signal af="7" driver="usart" instance="3" name="rx"/>
         <signal af="8" driver="lpuart" instance="1" name="tx"/>
         <signal af="13" driver="hrtim" instance="1" name="flt4"/>
       </gpio>
@@ -843,7 +813,6 @@
         <signal af="4" driver="i2c" instance="2" name="smba"/>
         <signal af="5" driver="spi" instance="2" name="nss"/>
         <signal af="6" driver="tim" instance="1" name="bkin"/>
-        <signal af="7" driver="usart" instance="3" name="ck"/>
         <signal af="8" driver="lpuart" instance="1" name="de"/>
         <signal af="8" driver="lpuart" instance="1" name="rts"/>
         <signal af="13" driver="hrtim" instance="1" name="chc1"/>
@@ -852,8 +821,6 @@
         <signal driver="comp" instance="5" name="inp"/>
         <signal af="5" driver="spi" instance="2" name="sck"/>
         <signal af="6" driver="tim" instance="1" name="ch1n"/>
-        <signal af="7" driver="usart" instance="3" name="cts"/>
-        <signal af="7" driver="usart" instance="3" name="nss"/>
         <signal af="8" driver="lpuart" instance="1" name="cts"/>
         <signal af="13" driver="hrtim" instance="1" name="chc2"/>
       </gpio>
@@ -863,8 +830,6 @@
         <signal af="1" driver="tim" instance="15" name="ch1"/>
         <signal af="5" driver="spi" instance="2" name="miso"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
-        <signal af="7" driver="usart" instance="3" name="de"/>
-        <signal af="7" driver="usart" instance="3" name="rts"/>
         <signal af="8" driver="comp" instance="4" name="out"/>
         <signal af="13" driver="hrtim" instance="1" name="chd1"/>
       </gpio>
@@ -901,7 +866,6 @@
         <signal af="1" driver="lptim" instance="1" name="in2"/>
         <signal af="2" driver="tim" instance="1" name="ch3"/>
         <signal af="3" driver="comp" instance="3" name="out"/>
-        <signal af="6" driver="tim" instance="20" name="ch2"/>
       </gpio>
       <gpio device-pin="m|r|v" port="c" pin="3">
         <signal driver="adc" instance="1" name="in9"/>
@@ -955,7 +919,6 @@
         <signal af="2" driver="tim" instance="3" name="ch3"/>
         <signal af="3" driver="hrtim" instance="1" name="che1"/>
         <signal af="4" driver="tim" instance="8" name="ch3"/>
-        <signal af="6" driver="tim" instance="20" name="ch3"/>
         <signal af="7" driver="comp" instance="7" name="out"/>
         <signal af="8" driver="i2c" instance="3" name="scl"/>
       </gpio>
@@ -963,7 +926,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="hrtim" instance="1" name="che2"/>
         <signal af="4" driver="tim" instance="8" name="ch4"/>
-        <signal af="5" name="i2s_ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="8" name="bkin2"/>
         <signal af="8" driver="i2c" instance="3" name="sda"/>
       </gpio>
@@ -971,14 +934,12 @@
         <signal af="4" driver="tim" instance="8" name="ch1n"/>
         <signal af="5" driver="uart" instance="4" name="tx"/>
         <signal af="6" driver="spi" instance="3" name="sck"/>
-        <signal af="7" driver="usart" instance="3" name="tx"/>
         <signal af="13" driver="hrtim" instance="1" name="flt6"/>
       </gpio>
       <gpio device-pin="c" device-package="u" port="c" pin="10">
         <signal af="4" driver="tim" instance="8" name="ch1n"/>
         <signal af="5" driver="uart" instance="4" name="tx"/>
         <signal af="6" driver="spi" instance="3" name="sck"/>
-        <signal af="7" driver="usart" instance="3" name="tx"/>
         <signal af="13" driver="hrtim" instance="1" name="flt6"/>
       </gpio>
       <gpio device-pin="m|r|v" device-package="t" port="c" pin="11">
@@ -986,7 +947,6 @@
         <signal af="4" driver="tim" instance="8" name="ch2n"/>
         <signal af="5" driver="uart" instance="4" name="rx"/>
         <signal af="6" driver="spi" instance="3" name="miso"/>
-        <signal af="7" driver="usart" instance="3" name="rx"/>
         <signal af="8" driver="i2c" instance="3" name="sda"/>
       </gpio>
       <gpio device-pin="c" device-package="u" port="c" pin="11">
@@ -994,7 +954,6 @@
         <signal af="4" driver="tim" instance="8" name="ch2n"/>
         <signal af="5" driver="uart" instance="4" name="rx"/>
         <signal af="6" driver="spi" instance="3" name="miso"/>
-        <signal af="7" driver="usart" instance="3" name="rx"/>
         <signal af="8" driver="i2c" instance="3" name="sda"/>
       </gpio>
       <gpio device-pin="m|r|v" port="c" pin="12">
@@ -1002,7 +961,6 @@
         <signal af="4" driver="tim" instance="8" name="ch3n"/>
         <signal af="5" driver="uart" instance="5" name="tx"/>
         <signal af="6" driver="spi" instance="3" name="mosi"/>
-        <signal af="7" driver="usart" instance="3" name="ck"/>
       </gpio>
       <gpio port="c" pin="13">
         <signal driver="rtc" name="out1"/>
@@ -1055,26 +1013,17 @@
         <signal af="2" driver="tim" instance="2" name="ch3"/>
         <signal af="7" driver="usart" instance="2" name="ck"/>
       </gpio>
-      <gpio device-pin="m|v" port="d" pin="8">
-        <signal af="7" driver="usart" instance="3" name="tx"/>
-      </gpio>
-      <gpio device-pin="m|v" port="d" pin="9">
-        <signal af="7" driver="usart" instance="3" name="rx"/>
-      </gpio>
+      <gpio device-pin="m|v" port="d" pin="8"/>
+      <gpio device-pin="m|v" port="d" pin="9"/>
       <gpio device-pin="m|v" port="d" pin="10">
         <signal driver="comp" instance="6" name="inm"/>
-        <signal af="7" driver="usart" instance="3" name="ck"/>
       </gpio>
       <gpio device-pin="v" port="d" pin="11">
         <signal driver="comp" instance="6" name="inp"/>
-        <signal af="7" driver="usart" instance="3" name="cts"/>
-        <signal af="7" driver="usart" instance="3" name="nss"/>
       </gpio>
       <gpio device-pin="v" port="d" pin="12">
         <signal driver="comp" instance="5" name="inp"/>
         <signal af="2" driver="tim" instance="4" name="ch1"/>
-        <signal af="7" driver="usart" instance="3" name="de"/>
-        <signal af="7" driver="usart" instance="3" name="rts"/>
       </gpio>
       <gpio device-pin="v" port="d" pin="13">
         <signal driver="comp" instance="5" name="inm"/>
@@ -1091,41 +1040,33 @@
       </gpio>
       <gpio device-pin="v" port="e" pin="0">
         <signal af="2" driver="tim" instance="4" name="etr"/>
-        <signal af="3" driver="tim" instance="20" name="ch4n"/>
         <signal af="4" driver="tim" instance="16" name="ch1"/>
-        <signal af="6" driver="tim" instance="20" name="etr"/>
         <signal af="7" driver="usart" instance="1" name="tx"/>
       </gpio>
       <gpio device-pin="v" port="e" pin="1">
         <signal af="4" driver="tim" instance="17" name="ch1"/>
-        <signal af="6" driver="tim" instance="20" name="ch4"/>
         <signal af="7" driver="usart" instance="1" name="rx"/>
       </gpio>
       <gpio device-pin="v" port="e" pin="2">
         <signal af="0" driver="sys" name="traceclk"/>
         <signal af="2" driver="tim" instance="3" name="ch1"/>
-        <signal af="6" driver="tim" instance="20" name="ch1"/>
       </gpio>
       <gpio device-pin="v" port="e" pin="3">
         <signal af="0" driver="sys" name="traced0"/>
         <signal af="2" driver="tim" instance="3" name="ch2"/>
-        <signal af="6" driver="tim" instance="20" name="ch2"/>
       </gpio>
       <gpio device-pin="v" port="e" pin="4">
         <signal af="0" driver="sys" name="traced1"/>
         <signal af="2" driver="tim" instance="3" name="ch3"/>
-        <signal af="6" driver="tim" instance="20" name="ch1n"/>
       </gpio>
       <gpio device-pin="v" port="e" pin="5">
         <signal af="0" driver="sys" name="traced2"/>
         <signal af="2" driver="tim" instance="3" name="ch4"/>
-        <signal af="6" driver="tim" instance="20" name="ch2n"/>
       </gpio>
       <gpio device-pin="v" port="e" pin="6">
         <signal driver="rtc" name="tamp3"/>
         <signal driver="sys" name="wkup3"/>
         <signal af="0" driver="sys" name="traced3"/>
-        <signal af="6" driver="tim" instance="20" name="ch3n"/>
       </gpio>
       <gpio device-pin="m|v" port="e" pin="7">
         <signal driver="comp" instance="4" name="inp"/>
@@ -1157,7 +1098,6 @@
       <gpio device-pin="m|v" port="e" pin="15">
         <signal af="2" driver="tim" instance="1" name="bkin"/>
         <signal af="6" driver="tim" instance="1" name="ch4n"/>
-        <signal af="7" driver="usart" instance="3" name="rx"/>
       </gpio>
       <gpio port="f" pin="0">
         <signal driver="adc" instance="1" name="in10"/>
@@ -1173,16 +1113,13 @@
         <signal af="5" driver="spi" instance="2" name="sck"/>
       </gpio>
       <gpio device-pin="v" port="f" pin="2">
-        <signal af="2" driver="tim" instance="20" name="ch3"/>
         <signal af="4" driver="i2c" instance="2" name="smba"/>
       </gpio>
       <gpio device-pin="v" port="f" pin="9">
-        <signal af="2" driver="tim" instance="20" name="bkin"/>
         <signal af="3" driver="tim" instance="15" name="ch1"/>
         <signal af="5" driver="spi" instance="2" name="sck"/>
       </gpio>
       <gpio device-pin="v" port="f" pin="10">
-        <signal af="2" driver="tim" instance="20" name="bkin2"/>
         <signal af="3" driver="tim" instance="15" name="ch2"/>
         <signal af="5" driver="spi" instance="2" name="sck"/>
       </gpio>
diff --git a/devices/stm32/stm32g4-31_41.xml b/devices/stm32/stm32g4-31_41.xml
index 28e4e275..29bc8424 100644
--- a/devices/stm32/stm32g4-31_41.xml
+++ b/devices/stm32/stm32g4-31_41.xml
@@ -174,6 +174,7 @@
       <vector position="101" name="FMAC"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -186,6 +187,7 @@
     </driver>
     <driver name="cordic" type="stm32-v1.0"/>
     <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="dac" type="stm32">
@@ -199,20 +201,23 @@
     </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="8000000"/>
-        <wait-state ws="1" hclk-max="16000000"/>
+        <wait-state ws="0" hclk-max="12000000"/>
+        <wait-state ws="1" hclk-max="24000000"/>
         <wait-state ws="2" hclk-max="26000000"/>
       </latency>
+      <latency vcore-min="1200">
+        <wait-state ws="0" hclk-max="30000000"/>
+        <wait-state ws="1" hclk-max="60000000"/>
+        <wait-state ws="2" hclk-max="90000000"/>
+        <wait-state ws="3" hclk-max="120000000"/>
+        <wait-state ws="4" hclk-max="150000000"/>
+      </latency>
       <latency vcore-min="1280">
-        <wait-state ws="0" hclk-max="20000000"/>
-        <wait-state ws="1" hclk-max="40000000"/>
-        <wait-state ws="2" hclk-max="60000000"/>
-        <wait-state ws="3" hclk-max="80000000"/>
-        <wait-state ws="4" hclk-max="100000000"/>
-        <wait-state ws="5" hclk-max="120000000"/>
-        <wait-state ws="6" hclk-max="140000000"/>
-        <wait-state ws="7" hclk-max="160000000"/>
-        <wait-state ws="8" hclk-max="170000000"/>
+        <wait-state ws="0" hclk-max="34000000"/>
+        <wait-state ws="1" hclk-max="68000000"/>
+        <wait-state ws="2" hclk-max="102000000"/>
+        <wait-state ws="3" hclk-max="136000000"/>
+        <wait-state ws="4" hclk-max="170000000"/>
       </latency>
     </driver>
     <driver name="fmac" type="stm32-v1.0"/>
@@ -244,8 +249,7 @@
     </driver>
     <driver device-variant="z" name="pwr" type="stm32-v1.0"/>
     <driver name="rcc" type="stm32-v1.0">
-      <max-frequency device-name="41" value="150000000"/>
-      <max-frequency device-name="31" value="170000000"/>
+      <max-frequency value="170000000"/>
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v1.1"/>
@@ -261,10 +265,10 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="ccm-wp"/>
       <feature value="cfgr2"/>
       <feature value="exti"/>
       <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver device-variant="z" name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
@@ -285,18 +289,22 @@
     </driver>
     <driver device-pin="c|r" device-package="t" device-variant="z" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
     </driver>
     <driver device-pin="m|v" device-package="t" device-variant="" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
     </driver>
     <driver device-pin="c" device-package="u" device-variant="" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
     </driver>
     <driver device-pin="r" device-package="i|t" device-variant="" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
     </driver>
     <driver name="ucpd" type="stm32-v1.0">
@@ -304,12 +312,12 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance device-pin="c|m|r|v" value="3"/>
     </driver>
     <driver name="usb" type="stm32-v2.2"/>
-    <driver name="usbpd" type="stm32-v1.4"/>
     <driver device-variant="z" name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="dma" type="stm32-mux">
@@ -758,7 +766,7 @@
       <gpio port="a" pin="12">
         <signal driver="usb" name="dp"/>
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
@@ -1084,7 +1092,7 @@
       <gpio device-pin="m|r|v" port="c" pin="9">
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="4" driver="tim" instance="8" name="ch4"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="8" name="bkin2"/>
         <signal af="8" driver="i2c" instance="3" name="sda"/>
       </gpio>
diff --git a/devices/stm32/stm32g4-71.xml b/devices/stm32/stm32g4-71.xml
index 5be572ee..a79b57e4 100644
--- a/devices/stm32/stm32g4-71.xml
+++ b/devices/stm32/stm32g4-71.xml
@@ -133,6 +133,7 @@
       <vector position="101" name="FMAC"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -145,6 +146,7 @@
     </driver>
     <driver name="cordic" type="stm32-v1.0"/>
     <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="dac" type="stm32">
@@ -158,20 +160,23 @@
     </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="8000000"/>
-        <wait-state ws="1" hclk-max="16000000"/>
+        <wait-state ws="0" hclk-max="12000000"/>
+        <wait-state ws="1" hclk-max="24000000"/>
         <wait-state ws="2" hclk-max="26000000"/>
       </latency>
+      <latency vcore-min="1200">
+        <wait-state ws="0" hclk-max="30000000"/>
+        <wait-state ws="1" hclk-max="60000000"/>
+        <wait-state ws="2" hclk-max="90000000"/>
+        <wait-state ws="3" hclk-max="120000000"/>
+        <wait-state ws="4" hclk-max="150000000"/>
+      </latency>
       <latency vcore-min="1280">
-        <wait-state ws="0" hclk-max="20000000"/>
-        <wait-state ws="1" hclk-max="40000000"/>
-        <wait-state ws="2" hclk-max="60000000"/>
-        <wait-state ws="3" hclk-max="80000000"/>
-        <wait-state ws="4" hclk-max="100000000"/>
-        <wait-state ws="5" hclk-max="120000000"/>
-        <wait-state ws="6" hclk-max="140000000"/>
-        <wait-state ws="7" hclk-max="160000000"/>
-        <wait-state ws="8" hclk-max="170000000"/>
+        <wait-state ws="0" hclk-max="34000000"/>
+        <wait-state ws="1" hclk-max="68000000"/>
+        <wait-state ws="2" hclk-max="102000000"/>
+        <wait-state ws="3" hclk-max="136000000"/>
+        <wait-state ws="4" hclk-max="170000000"/>
       </latency>
     </driver>
     <driver name="fmac" type="stm32-v1.0"/>
@@ -201,7 +206,6 @@
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
-      <instance value="6"/>
     </driver>
     <driver name="quadspi" type="stm32-v4.1">
       <instance value="1"/>
@@ -224,10 +228,10 @@
       <instance device-pin="m|q|v" value="4"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="ccm-wp"/>
       <feature value="cfgr2"/>
       <feature value="exti"/>
       <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -242,28 +246,31 @@
       <instance value="2"/>
       <instance value="3"/>
       <instance value="4"/>
-      <instance value="5"/>
       <instance value="15"/>
       <instance value="16"/>
       <instance value="17"/>
     </driver>
     <driver device-pin="m|q|r" device-package="t" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|q|r|v" value="5"/>
     </driver>
     <driver device-pin="c" device-package="u" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|q|r|v" value="5"/>
     </driver>
     <driver device-pin="m" device-package="y" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|q|r|v" value="5"/>
     </driver>
     <driver device-pin="v" device-package="h|i|t" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|q|r|v" value="5"/>
     </driver>
@@ -272,12 +279,12 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
     </driver>
     <driver name="usb" type="stm32-v2.2"/>
-    <driver name="usbpd" type="stm32-v1.4"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="dma" type="stm32-mux">
       <instance value="1"/>
@@ -413,7 +420,7 @@
           <signal driver="adc" instance="3"/>
         </request>
         <request position="40">
-          <signal driver="quadspi"/>
+          <signal driver="quadspi" instance="1"/>
         </request>
         <request position="42">
           <signal driver="tim" instance="1" name="ch1"/>
@@ -505,24 +512,6 @@
         <request position="71">
           <signal driver="tim" instance="4" name="up"/>
         </request>
-        <request position="72">
-          <signal driver="tim" instance="5" name="ch1"/>
-        </request>
-        <request position="73">
-          <signal driver="tim" instance="5" name="ch2"/>
-        </request>
-        <request position="74">
-          <signal driver="tim" instance="5" name="ch3"/>
-        </request>
-        <request position="75">
-          <signal driver="tim" instance="5" name="ch4"/>
-        </request>
-        <request position="76">
-          <signal driver="tim" instance="5" name="up"/>
-        </request>
-        <request position="77">
-          <signal driver="tim" instance="5" name="trig"/>
-        </request>
         <request position="78">
           <signal driver="tim" instance="15" name="ch1"/>
         </request>
@@ -633,7 +622,6 @@
         <signal driver="rtc" name="tamp2"/>
         <signal driver="sys" name="wkup1"/>
         <signal af="1" driver="tim" instance="2" name="ch1"/>
-        <signal af="2" driver="tim" instance="5" name="ch1"/>
         <signal af="7" driver="usart" instance="2" name="cts"/>
         <signal af="7" driver="usart" instance="2" name="nss"/>
         <signal af="8" driver="comp" instance="1" name="out"/>
@@ -649,12 +637,8 @@
         <signal driver="opamp" instance="1" name="vinp_sec"/>
         <signal driver="opamp" instance="3" name="vinp"/>
         <signal driver="opamp" instance="3" name="vinp_sec"/>
-        <signal driver="opamp" instance="6" name="vinm"/>
-        <signal driver="opamp" instance="6" name="vinm0"/>
-        <signal driver="opamp" instance="6" name="vinm_sec"/>
         <signal af="0" driver="rtc" name="refin"/>
         <signal af="1" driver="tim" instance="2" name="ch2"/>
-        <signal af="2" driver="tim" instance="5" name="ch2"/>
         <signal af="7" driver="usart" instance="2" name="de"/>
         <signal af="7" driver="usart" instance="2" name="rts"/>
         <signal af="9" driver="tim" instance="15" name="ch1n"/>
@@ -666,7 +650,6 @@
         <signal driver="rcc" name="lsco"/>
         <signal driver="sys" name="wkup4"/>
         <signal af="1" driver="tim" instance="2" name="ch3"/>
-        <signal af="2" driver="tim" instance="5" name="ch3"/>
         <signal af="7" driver="usart" instance="2" name="tx"/>
         <signal af="8" driver="comp" instance="2" name="out"/>
         <signal af="9" driver="tim" instance="15" name="ch1"/>
@@ -684,7 +667,6 @@
         <signal driver="opamp" instance="1" name="vinp"/>
         <signal driver="opamp" instance="1" name="vinp_sec"/>
         <signal af="1" driver="tim" instance="2" name="ch4"/>
-        <signal af="2" driver="tim" instance="5" name="ch4"/>
         <signal af="3" driver="sai" instance="1" name="ck1"/>
         <signal af="7" driver="usart" instance="2" name="rx"/>
         <signal af="9" driver="tim" instance="15" name="ch2"/>
@@ -797,7 +779,7 @@
       <gpio port="a" pin="12">
         <signal driver="usb" name="dp"/>
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
@@ -869,9 +851,6 @@
         <signal driver="adc" instance="3" name="in1"/>
         <signal driver="comp" instance="1" name="inp"/>
         <signal driver="opamp" instance="3" name="vout"/>
-        <signal driver="opamp" instance="6" name="vinm"/>
-        <signal driver="opamp" instance="6" name="vinm1"/>
-        <signal driver="opamp" instance="6" name="vinm_sec"/>
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="4" driver="tim" instance="8" name="ch3n"/>
         <signal af="6" driver="tim" instance="1" name="ch3n"/>
@@ -888,7 +867,6 @@
         <signal driver="opamp" instance="3" name="vinm_sec"/>
         <signal af="0" driver="rtc" name="out2"/>
         <signal af="1" driver="lptim" instance="1" name="out"/>
-        <signal af="2" driver="tim" instance="5" name="ch1"/>
         <signal af="3" driver="tim" instance="20" name="ch1"/>
         <signal af="4" driver="i2c" instance="3" name="smba"/>
         <signal af="10" driver="quadspi" instance="1" name="bk2_io1"/>
@@ -1004,7 +982,6 @@
       <gpio port="b" pin="11">
         <signal driver="adc" instance="1" name="in14"/>
         <signal driver="adc" instance="2" name="in14"/>
-        <signal driver="opamp" instance="6" name="vout"/>
         <signal af="1" driver="tim" instance="2" name="ch4"/>
         <signal af="7" driver="usart" instance="3" name="rx"/>
         <signal af="8" driver="lpuart" instance="1" name="tx"/>
@@ -1012,9 +989,6 @@
       </gpio>
       <gpio port="b" pin="12">
         <signal driver="adc" instance="1" name="in11"/>
-        <signal driver="opamp" instance="6" name="vinp"/>
-        <signal driver="opamp" instance="6" name="vinp_sec"/>
-        <signal af="2" driver="tim" instance="5" name="etr"/>
         <signal af="4" driver="i2c" instance="2" name="smba"/>
         <signal af="5" driver="i2s" instance="2" name="ws"/>
         <signal af="5" driver="spi" instance="2" name="nss"/>
@@ -1028,8 +1002,6 @@
         <signal driver="adc" instance="3" name="in5"/>
         <signal driver="opamp" instance="3" name="vinp"/>
         <signal driver="opamp" instance="3" name="vinp_sec"/>
-        <signal driver="opamp" instance="6" name="vinp"/>
-        <signal driver="opamp" instance="6" name="vinp_sec"/>
         <signal af="5" driver="i2s" instance="2" name="ck"/>
         <signal af="5" driver="spi" instance="2" name="sck"/>
         <signal af="6" driver="tim" instance="1" name="ch1n"/>
@@ -1177,7 +1149,7 @@
       <gpio device-pin="m|q|r|v" port="c" pin="9">
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="4" driver="tim" instance="8" name="ch4"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="8" name="bkin2"/>
         <signal af="8" driver="i2c" instance="3" name="sda"/>
       </gpio>
@@ -1238,7 +1210,6 @@
         <signal af="8" driver="i2c" instance="3" name="sda"/>
       </gpio>
       <gpio device-pin="m|q|r|v" port="c" pin="12">
-        <signal af="1" driver="tim" instance="5" name="ch2"/>
         <signal af="4" driver="tim" instance="8" name="ch3n"/>
         <signal af="5" driver="uart" instance="5" name="tx"/>
         <signal af="6" driver="i2s" instance="3" name="sd"/>
@@ -1309,8 +1280,6 @@
         <signal af="7" driver="usart" instance="3" name="tx"/>
       </gpio>
       <gpio device-pin="m|q|v" port="d" pin="9">
-        <signal driver="opamp" instance="6" name="vinp"/>
-        <signal driver="opamp" instance="6" name="vinp_sec"/>
         <signal af="7" driver="usart" instance="3" name="rx"/>
       </gpio>
       <gpio device-pin="m|q|v" port="d" pin="10">
@@ -1319,21 +1288,18 @@
       </gpio>
       <gpio device-pin="m" device-package="y" port="d" pin="11">
         <signal driver="adc" instance="3" name="in8"/>
-        <signal af="1" driver="tim" instance="5" name="etr"/>
         <signal af="4" driver="i2c" instance="4" name="smba"/>
         <signal af="7" driver="usart" instance="3" name="cts"/>
         <signal af="7" driver="usart" instance="3" name="nss"/>
       </gpio>
       <gpio device-pin="q" device-package="t" port="d" pin="11">
         <signal driver="adc" instance="3" name="in8"/>
-        <signal af="1" driver="tim" instance="5" name="etr"/>
         <signal af="4" driver="i2c" instance="4" name="smba"/>
         <signal af="7" driver="usart" instance="3" name="cts"/>
         <signal af="7" driver="usart" instance="3" name="nss"/>
       </gpio>
       <gpio device-pin="v" device-package="h|i|t" port="d" pin="11">
         <signal driver="adc" instance="3" name="in8"/>
-        <signal af="1" driver="tim" instance="5" name="etr"/>
         <signal af="4" driver="i2c" instance="4" name="smba"/>
         <signal af="7" driver="usart" instance="3" name="cts"/>
         <signal af="7" driver="usart" instance="3" name="nss"/>
@@ -1419,13 +1385,11 @@
       <gpio device-pin="m|q|v" port="e" pin="8">
         <signal driver="adc" instance="3" name="in6"/>
         <signal driver="comp" instance="4" name="inm"/>
-        <signal af="1" driver="tim" instance="5" name="ch3"/>
         <signal af="2" driver="tim" instance="1" name="ch1n"/>
         <signal af="13" driver="sai" instance="1" name="sck_b"/>
       </gpio>
       <gpio device-pin="m|q|v" port="e" pin="9">
         <signal driver="adc" instance="3" name="in2"/>
-        <signal af="1" driver="tim" instance="5" name="ch4"/>
         <signal af="2" driver="tim" instance="1" name="ch1"/>
         <signal af="13" driver="sai" instance="1" name="fs_b"/>
       </gpio>
@@ -1497,23 +1461,19 @@
         <signal af="2" driver="tim" instance="20" name="ch2n"/>
       </gpio>
       <gpio device-pin="q" port="f" pin="6">
-        <signal af="1" driver="tim" instance="5" name="etr"/>
         <signal af="2" driver="tim" instance="4" name="ch4"/>
         <signal af="3" driver="sai" instance="1" name="sd_b"/>
         <signal af="4" driver="i2c" instance="2" name="scl"/>
-        <signal af="6" driver="tim" instance="5" name="ch1"/>
         <signal af="7" driver="usart" instance="3" name="rts"/>
         <signal af="10" driver="quadspi" instance="1" name="bk1_io3"/>
       </gpio>
       <gpio device-pin="q" port="f" pin="7">
         <signal af="2" driver="tim" instance="20" name="bkin"/>
-        <signal af="6" driver="tim" instance="5" name="ch2"/>
         <signal af="10" driver="quadspi" instance="1" name="bk1_io2"/>
         <signal af="13" driver="sai" instance="1" name="mclk_b"/>
       </gpio>
       <gpio device-pin="q" port="f" pin="8">
         <signal af="2" driver="tim" instance="20" name="bkin2"/>
-        <signal af="6" driver="tim" instance="5" name="ch3"/>
         <signal af="10" driver="quadspi" instance="1" name="bk1_io0"/>
         <signal af="13" driver="sai" instance="1" name="sck_b"/>
       </gpio>
@@ -1521,7 +1481,6 @@
         <signal af="2" driver="tim" instance="20" name="bkin"/>
         <signal af="3" driver="tim" instance="15" name="ch1"/>
         <signal af="5" driver="spi" instance="2" name="sck"/>
-        <signal af="6" driver="tim" instance="5" name="ch4"/>
         <signal af="10" driver="quadspi" instance="1" name="bk1_io1"/>
         <signal af="13" driver="sai" instance="1" name="fs_b"/>
       </gpio>
diff --git a/devices/stm32/stm32g4-73_83.xml b/devices/stm32/stm32g4-73_83.xml
index 9c263efb..f882ff92 100644
--- a/devices/stm32/stm32g4-73_83.xml
+++ b/devices/stm32/stm32g4-73_83.xml
@@ -188,6 +188,7 @@
       <vector position="101" name="FMAC"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -206,6 +207,7 @@
     </driver>
     <driver name="cordic" type="stm32-v1.0"/>
     <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="dac" type="stm32">
@@ -223,20 +225,23 @@
     </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="8000000"/>
-        <wait-state ws="1" hclk-max="16000000"/>
+        <wait-state ws="0" hclk-max="12000000"/>
+        <wait-state ws="1" hclk-max="24000000"/>
         <wait-state ws="2" hclk-max="26000000"/>
       </latency>
+      <latency vcore-min="1200">
+        <wait-state ws="0" hclk-max="30000000"/>
+        <wait-state ws="1" hclk-max="60000000"/>
+        <wait-state ws="2" hclk-max="90000000"/>
+        <wait-state ws="3" hclk-max="120000000"/>
+        <wait-state ws="4" hclk-max="150000000"/>
+      </latency>
       <latency vcore-min="1280">
-        <wait-state ws="0" hclk-max="20000000"/>
-        <wait-state ws="1" hclk-max="40000000"/>
-        <wait-state ws="2" hclk-max="60000000"/>
-        <wait-state ws="3" hclk-max="80000000"/>
-        <wait-state ws="4" hclk-max="100000000"/>
-        <wait-state ws="5" hclk-max="120000000"/>
-        <wait-state ws="6" hclk-max="140000000"/>
-        <wait-state ws="7" hclk-max="160000000"/>
-        <wait-state ws="8" hclk-max="170000000"/>
+        <wait-state ws="0" hclk-max="34000000"/>
+        <wait-state ws="1" hclk-max="68000000"/>
+        <wait-state ws="2" hclk-max="102000000"/>
+        <wait-state ws="3" hclk-max="136000000"/>
+        <wait-state ws="4" hclk-max="170000000"/>
       </latency>
     </driver>
     <driver name="fmac" type="stm32-v1.0"/>
@@ -277,8 +282,7 @@
       <instance value="1"/>
     </driver>
     <driver name="rcc" type="stm32-v1.0">
-      <max-frequency device-name="83" value="170000000"/>
-      <max-frequency device-name="73" value="150000000"/>
+      <max-frequency value="170000000"/>
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v1.1"/>
@@ -295,10 +299,10 @@
       <instance device-pin="m|p|q|v" value="4"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="ccm-wp"/>
       <feature value="cfgr2"/>
       <feature value="exti"/>
       <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver device-variant="z" name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
@@ -321,26 +325,31 @@
     </driver>
     <driver device-pin="m|q|r" device-package="t" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|p|q|r|v" value="5"/>
     </driver>
     <driver device-pin="c" device-package="u" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|p|q|r|v" value="5"/>
     </driver>
     <driver device-pin="m" device-package="y" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|p|q|r|v" value="5"/>
     </driver>
     <driver device-pin="p" device-package="i" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|p|q|r|v" value="5"/>
     </driver>
     <driver device-pin="v" device-package="h|t" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|p|q|r|v" value="5"/>
     </driver>
@@ -349,12 +358,12 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
     </driver>
     <driver name="usb" type="stm32-v2.2"/>
-    <driver name="usbpd" type="stm32-v1.4"/>
     <driver device-variant="z" name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="dma" type="stm32-mux">
@@ -503,7 +512,7 @@
           <signal driver="adc" instance="5"/>
         </request>
         <request position="40">
-          <signal driver="quadspi"/>
+          <signal driver="quadspi" instance="1"/>
         </request>
         <request position="41">
           <signal driver="dac" instance="2" name="ch1"/>
@@ -913,7 +922,7 @@
       <gpio port="a" pin="12">
         <signal driver="usb" name="dp"/>
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
@@ -1345,7 +1354,7 @@
       <gpio device-pin="m|p|q|r|v" port="c" pin="9">
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="4" driver="tim" instance="8" name="ch4"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="8" name="bkin2"/>
         <signal af="8" driver="i2c" instance="3" name="sda"/>
       </gpio>
diff --git a/devices/stm32/stm32g4-74_84.xml b/devices/stm32/stm32g4-74_84.xml
index 7e88005c..eb5ce985 100644
--- a/devices/stm32/stm32g4-74_84.xml
+++ b/devices/stm32/stm32g4-74_84.xml
@@ -194,6 +194,7 @@
       <vector position="101" name="FMAC"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -212,6 +213,7 @@
     </driver>
     <driver name="cordic" type="stm32-v1.0"/>
     <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="dac" type="stm32">
@@ -228,20 +230,23 @@
     </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="8000000"/>
-        <wait-state ws="1" hclk-max="16000000"/>
+        <wait-state ws="0" hclk-max="12000000"/>
+        <wait-state ws="1" hclk-max="24000000"/>
         <wait-state ws="2" hclk-max="26000000"/>
       </latency>
+      <latency vcore-min="1200">
+        <wait-state ws="0" hclk-max="30000000"/>
+        <wait-state ws="1" hclk-max="60000000"/>
+        <wait-state ws="2" hclk-max="90000000"/>
+        <wait-state ws="3" hclk-max="120000000"/>
+        <wait-state ws="4" hclk-max="150000000"/>
+      </latency>
       <latency vcore-min="1280">
-        <wait-state ws="0" hclk-max="20000000"/>
-        <wait-state ws="1" hclk-max="40000000"/>
-        <wait-state ws="2" hclk-max="60000000"/>
-        <wait-state ws="3" hclk-max="80000000"/>
-        <wait-state ws="4" hclk-max="100000000"/>
-        <wait-state ws="5" hclk-max="120000000"/>
-        <wait-state ws="6" hclk-max="140000000"/>
-        <wait-state ws="7" hclk-max="160000000"/>
-        <wait-state ws="8" hclk-max="170000000"/>
+        <wait-state ws="0" hclk-max="34000000"/>
+        <wait-state ws="1" hclk-max="68000000"/>
+        <wait-state ws="2" hclk-max="102000000"/>
+        <wait-state ws="3" hclk-max="136000000"/>
+        <wait-state ws="4" hclk-max="170000000"/>
       </latency>
     </driver>
     <driver name="fmac" type="stm32-v1.0"/>
@@ -283,8 +288,7 @@
       <instance value="1"/>
     </driver>
     <driver name="rcc" type="stm32-v1.0">
-      <max-frequency device-name="84" value="150000000"/>
-      <max-frequency device-name="74" value="170000000"/>
+      <max-frequency value="170000000"/>
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v1.1"/>
@@ -301,10 +305,10 @@
       <instance device-pin="m|p|q|v" value="4"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="ccm-wp"/>
       <feature value="cfgr2"/>
       <feature value="exti"/>
       <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -326,26 +330,31 @@
     </driver>
     <driver device-pin="m|q|r" device-package="t" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|p|q|r|v" value="5"/>
     </driver>
     <driver device-pin="c" device-package="u" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|p|q|r|v" value="5"/>
     </driver>
     <driver device-pin="m" device-package="y" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|p|q|r|v" value="5"/>
     </driver>
     <driver device-pin="p" device-package="i" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|p|q|r|v" value="5"/>
     </driver>
     <driver device-pin="v" device-package="h|t" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|p|q|r|v" value="5"/>
     </driver>
@@ -354,12 +363,12 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
     </driver>
     <driver name="usb" type="stm32-v2.2"/>
-    <driver name="usbpd" type="stm32-v1.4"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="dma" type="stm32-mux">
       <instance value="1"/>
@@ -507,7 +516,7 @@
           <signal driver="adc" instance="5"/>
         </request>
         <request position="40">
-          <signal driver="quadspi"/>
+          <signal driver="quadspi" instance="1"/>
         </request>
         <request position="41">
           <signal driver="dac" instance="2" name="ch1"/>
@@ -942,7 +951,7 @@
       <gpio port="a" pin="12">
         <signal driver="usb" name="dp"/>
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
@@ -1408,7 +1417,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="hrtim" instance="1" name="che2"/>
         <signal af="4" driver="tim" instance="8" name="ch4"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="8" name="bkin2"/>
         <signal af="8" driver="i2c" instance="3" name="sda"/>
       </gpio>
diff --git a/devices/stm32/stm32g4-91_a1.xml b/devices/stm32/stm32g4-91_a1.xml
index 0e9f2320..eeedb33a 100644
--- a/devices/stm32/stm32g4-91_a1.xml
+++ b/devices/stm32/stm32g4-91_a1.xml
@@ -135,6 +135,7 @@
       <vector position="101" name="FMAC"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -148,6 +149,7 @@
     </driver>
     <driver name="cordic" type="stm32-v1.0"/>
     <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
       <feature value="reverse"/>
     </driver>
     <driver name="dac" type="stm32">
@@ -162,20 +164,23 @@
     </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="8000000"/>
-        <wait-state ws="1" hclk-max="16000000"/>
+        <wait-state ws="0" hclk-max="12000000"/>
+        <wait-state ws="1" hclk-max="24000000"/>
         <wait-state ws="2" hclk-max="26000000"/>
       </latency>
+      <latency vcore-min="1200">
+        <wait-state ws="0" hclk-max="30000000"/>
+        <wait-state ws="1" hclk-max="60000000"/>
+        <wait-state ws="2" hclk-max="90000000"/>
+        <wait-state ws="3" hclk-max="120000000"/>
+        <wait-state ws="4" hclk-max="150000000"/>
+      </latency>
       <latency vcore-min="1280">
-        <wait-state ws="0" hclk-max="20000000"/>
-        <wait-state ws="1" hclk-max="40000000"/>
-        <wait-state ws="2" hclk-max="60000000"/>
-        <wait-state ws="3" hclk-max="80000000"/>
-        <wait-state ws="4" hclk-max="100000000"/>
-        <wait-state ws="5" hclk-max="120000000"/>
-        <wait-state ws="6" hclk-max="140000000"/>
-        <wait-state ws="7" hclk-max="160000000"/>
-        <wait-state ws="8" hclk-max="170000000"/>
+        <wait-state ws="0" hclk-max="34000000"/>
+        <wait-state ws="1" hclk-max="68000000"/>
+        <wait-state ws="2" hclk-max="102000000"/>
+        <wait-state ws="3" hclk-max="136000000"/>
+        <wait-state ws="4" hclk-max="170000000"/>
       </latency>
     </driver>
     <driver name="fmac" type="stm32-v1.0"/>
@@ -227,10 +232,10 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="ccm-wp"/>
       <feature value="cfgr2"/>
       <feature value="exti"/>
       <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver device-variant="z" name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
@@ -252,21 +257,25 @@
     </driver>
     <driver device-name="91" device-pin="c" device-package="u" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|r|v" value="5"/>
     </driver>
     <driver device-name="91|a1" device-pin="m" device-package="s|t" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|r|v" value="5"/>
     </driver>
     <driver device-name="91|a1" device-pin="r" device-package="i|t|y" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|r|v" value="5"/>
     </driver>
     <driver device-name="91|a1" device-pin="v" device-package="t" name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|r|v" value="5"/>
     </driver>
@@ -275,12 +284,12 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance device-pin="c|m|r|v" value="3"/>
     </driver>
     <driver name="usb" type="stm32-v2.2"/>
-    <driver name="usbpd" type="stm32-v1.4"/>
     <driver device-variant="z" name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="dma" type="stm32-mux">
@@ -411,7 +420,7 @@
           <signal driver="adc" instance="3"/>
         </request>
         <request position="40">
-          <signal driver="quadspi"/>
+          <signal driver="quadspi" instance="1"/>
         </request>
         <request position="42">
           <signal driver="tim" instance="1" name="ch1"/>
@@ -773,7 +782,7 @@
       <gpio port="a" pin="12">
         <signal driver="usb" name="dp"/>
         <signal af="1" driver="tim" instance="16" name="ch1"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="1" name="ch2n"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
@@ -1144,7 +1153,7 @@
       <gpio device-pin="m|r|v" port="c" pin="9">
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="4" driver="tim" instance="8" name="ch4"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="tim" instance="8" name="bkin2"/>
         <signal af="8" driver="i2c" instance="3" name="sda"/>
       </gpio>
diff --git a/devices/stm32/stm32h5-03.xml b/devices/stm32/stm32h5-03.xml
index 345d9f2e..57536bba 100644
--- a/devices/stm32/stm32h5-03.xml
+++ b/devices/stm32/stm32h5-03.xml
@@ -95,12 +95,16 @@
       <vector position="133" name="COMP1"/>
     </driver>
     <driver name="adc" type="stm32-h5">
+      <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver name="comp" type="stm32-tsmc90_h5_cube">
       <instance value="1"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -166,7 +170,9 @@
       <instance value="2"/>
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v2.2">
       <instance value="1"/>
       <instance value="2"/>
@@ -191,9 +197,7 @@
       <instance value="2"/>
       <instance value="3"/>
     </driver>
-    <driver name="sys" type="stm32">
-      <feature value="exti"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -208,6 +212,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -352,7 +357,7 @@
         <signal af="5" driver="i2s" instance="1" name="sdo"/>
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="6" driver="i2s" instance="2" name="mck"/>
-        <signal af="7" name="audioclk"/>
+        <signal af="7" driver="rcc" name="audioclk"/>
         <signal af="8" driver="usart" instance="1" name="de"/>
         <signal af="8" driver="usart" instance="1" name="rts"/>
         <signal af="9" driver="usart" instance="3" name="de"/>
@@ -604,7 +609,7 @@
         <signal af="2" driver="tim" instance="3" name="etr"/>
         <signal af="3" driver="i3c" instance="1" name="sda"/>
         <signal af="4" driver="i2c" instance="1" name="sda"/>
-        <signal af="5" name="audioclk"/>
+        <signal af="5" driver="rcc" name="audioclk"/>
         <signal af="6" driver="i2s" instance="3" name="ck"/>
         <signal af="6" driver="spi" instance="3" name="sck"/>
         <signal af="7" driver="usart" instance="1" name="rx"/>
@@ -813,7 +818,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="i3c" instance="1" name="sda"/>
         <signal af="4" driver="i2c" instance="1" name="sda"/>
-        <signal af="5" name="audioclk"/>
+        <signal af="5" driver="rcc" name="audioclk"/>
         <signal af="6" driver="spi" instance="3" name="rdy"/>
         <signal af="7" driver="usart" instance="3" name="de"/>
         <signal af="7" driver="usart" instance="3" name="rts"/>
diff --git a/devices/stm32/stm32h5-23_33.xml b/devices/stm32/stm32h5-23_33.xml
index 37f76b01..20ee7909 100644
--- a/devices/stm32/stm32h5-23_33.xml
+++ b/devices/stm32/stm32h5-23_33.xml
@@ -153,11 +153,15 @@
       <vector position="132" name="I3C2_ER"/>
     </driver>
     <driver name="adc" type="stm32-h5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
     <driver device-name="33" name="aes" type="stm32-v2.0"/>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -236,7 +240,9 @@
       <instance value="2"/>
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v2.2">
       <instance value="1"/>
       <instance value="2"/>
@@ -271,9 +277,7 @@
       <instance value="3"/>
       <instance device-pin="c|r|v|z" value="4"/>
     </driver>
-    <driver name="sys" type="stm32">
-      <feature value="exti"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="sys_s" type="stm32-v1.0"/>
     <driver name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
@@ -294,6 +298,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
     </driver>
@@ -302,13 +307,13 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance device-pin="c|r|v|z" value="3"/>
       <instance device-pin="r|v|z" value="6"/>
     </driver>
     <driver name="usb" type="stm32-v1.0"/>
-    <driver name="usbpd" type="stm32-v4.1"/>
     <driver name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="gpio" type="stm32">
@@ -835,7 +840,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" name="audioclk"/>
+        <signal af="5" driver="rcc" name="audioclk"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="octospi" instance="1" name="io0"/>
         <signal device-pin="v|z" af="11" driver="fmc" name="cle"/>
diff --git a/devices/stm32/stm32h5-43_53.xml b/devices/stm32/stm32h5-43_53.xml
index 9fb35465..29357e99 100644
--- a/devices/stm32/stm32h5-43_53.xml
+++ b/devices/stm32/stm32h5-43_53.xml
@@ -165,6 +165,7 @@
       <vector position="149" name="ADC3"/>
     </driver>
     <driver name="adc" type="stm32-h5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -176,7 +177,10 @@
       <instance value="2"/>
     </driver>
     <driver name="cordic" type="stm32-v1.0"/>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -254,7 +258,9 @@
       <instance value="2"/>
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v2.2">
       <instance value="1"/>
       <instance value="2"/>
@@ -290,9 +296,7 @@
       <instance value="3"/>
       <instance value="4"/>
     </driver>
-    <driver name="sys" type="stm32">
-      <feature value="exti"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="sys_s" type="stm32-v1.2"/>
     <driver name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
@@ -313,6 +317,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
@@ -323,13 +328,13 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
       <instance value="6"/>
     </driver>
     <driver name="usb" type="stm32-v1.0"/>
-    <driver name="usbpd" type="stm32-v4.1"/>
     <driver device-pin="u|v|z" name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="gpio" type="stm32">
@@ -460,7 +465,7 @@
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="10" driver="octospi" instance="1" name="io2"/>
         <signal device-pin="r|u|v|z" af="11" driver="eth" name="mii_rx_dv"/>
-        <signal device-pin="r|u|v|z" af="11" driver="eth" name="rmii_rcc_crs_dv"/>
+        <signal device-pin="r|u|v|z" af="11" driver="eth" name="rmii_crs_dv"/>
         <signal device-pin="v|z" af="12" driver="fmc" name="sdnwe"/>
         <signal device-pin="v|z" af="13" driver="fmc" name="nwe"/>
       </gpio>
@@ -900,7 +905,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" name="audioclk"/>
+        <signal af="5" driver="rcc" name="audioclk"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="octospi" instance="1" name="io0"/>
         <signal af="10" driver="i3c" instance="2" name="sda"/>
@@ -964,7 +969,7 @@
         <signal af="8" driver="uart" instance="4" name="tx"/>
         <signal af="9" driver="fdcan" instance="1" name="tx"/>
         <signal af="11" driver="eth" name="mii_rx_dv"/>
-        <signal af="11" driver="eth" name="rmii_rcc_crs_dv"/>
+        <signal af="11" driver="eth" name="rmii_crs_dv"/>
         <signal af="12" driver="fmc" name="d3"/>
         <signal af="12" driver="fmc" name="da3"/>
       </gpio>
diff --git a/devices/stm32/stm32h5-62_63_73.xml b/devices/stm32/stm32h5-62_63_73.xml
index b7fdc8ec..bc14f09c 100644
--- a/devices/stm32/stm32h5-62_63_73.xml
+++ b/devices/stm32/stm32h5-62_63_73.xml
@@ -207,12 +207,16 @@
       <vector position="130" name="LPTIM6"/>
     </driver>
     <driver name="adc" type="stm32-h5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
     <driver device-name="73" name="aes" type="stm32-v2.0"/>
     <driver name="cordic" type="stm32-v1.0"/>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -293,7 +297,9 @@
       <instance value="1"/>
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v2.2">
       <instance value="1"/>
       <instance value="2"/>
@@ -339,9 +345,7 @@
       <instance device-pin="a|i|l|z" value="5"/>
       <instance value="6"/>
     </driver>
-    <driver name="sys" type="stm32">
-      <feature value="exti"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="sys_s" type="stm32-v1.0"/>
     <driver name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
@@ -366,6 +370,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
@@ -378,6 +383,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -386,7 +392,6 @@
       <instance value="11"/>
     </driver>
     <driver name="usb" type="stm32-v1.0"/>
-    <driver name="usbpd" type="stm32-v4.1"/>
     <driver name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="gpio" type="stm32">
@@ -526,8 +531,8 @@
         <signal af="10" driver="octospi" instance="1" name="io2"/>
         <signal device-name="63|73" device-pin="a|i|l|m" device-variant="q" af="11" driver="eth" name="mii_rx_dv"/>
         <signal device-name="63|73" device-pin="a|i|r|v|z" device-variant="" af="11" driver="eth" name="mii_rx_dv"/>
-        <signal device-name="63|73" device-pin="a|i|l|m" device-variant="q" af="11" driver="eth" name="rmii_rcc_crs_dv"/>
-        <signal device-name="63|73" device-pin="a|i|r|v|z" device-variant="" af="11" driver="eth" name="rmii_rcc_crs_dv"/>
+        <signal device-name="63|73" device-pin="a|i|l|m" device-variant="q" af="11" driver="eth" name="rmii_crs_dv"/>
+        <signal device-name="63|73" device-pin="a|i|r|v|z" device-variant="" af="11" driver="eth" name="rmii_crs_dv"/>
         <signal device-pin="a|i|l|m|v|z" af="12" driver="fmc" name="sdnwe"/>
         <signal device-pin="a|i|l|m|v|z" af="13" driver="fmc" name="nwe"/>
       </gpio>
@@ -1222,7 +1227,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" name="audioclk"/>
+        <signal af="5" driver="rcc" name="audioclk"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="octospi" instance="1" name="io0"/>
         <signal device-pin="a|i|l|m|v|z" af="11" driver="fmc" name="cle"/>
diff --git a/devices/stm32/stm32h5-e4_e5_f4_f5-.xml b/devices/stm32/stm32h5-e4_e5_f4_f5-.xml
index b2409a34..1d8fa212 100644
--- a/devices/stm32/stm32h5-e4_e5_f4_f5-.xml
+++ b/devices/stm32/stm32h5-e4_e5_f4_f5-.xml
@@ -211,6 +211,7 @@
       <vector device-name="e5|f5" position="161" name="OTG_HS"/>
     </driver>
     <driver name="adc" type="stm32-h5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -225,7 +226,10 @@
       <instance value="2"/>
     </driver>
     <driver name="cordic" type="stm32-v1.0"/>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -310,7 +314,9 @@
       <instance value="2"/>
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="jpeg" type="stm32-v1.0"/>
     <driver name="lptim" type="stm32-v2.2">
       <instance value="1"/>
@@ -370,9 +376,7 @@
       <instance device-pin="a|i|z" value="5"/>
       <instance value="6"/>
     </driver>
-    <driver name="sys" type="stm32">
-      <feature value="exti"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="sys_s" type="stm32-v1.0"/>
     <driver name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
@@ -397,6 +401,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
@@ -409,6 +414,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -418,7 +424,6 @@
     </driver>
     <driver name="usb_otg_fs" type="stm32-v3.0"/>
     <driver device-name="e5|f5" name="usb_otg_hs" type="stm32-v3.0"/>
-    <driver name="usbpd" type="stm32-v4.1"/>
     <driver name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="gpio" type="stm32">
@@ -501,7 +506,6 @@
         <signal driver="adc" instance="2" name="inp18"/>
         <signal driver="dac" instance="1" name="out1"/>
         <signal driver="opamp" instance="1" name="vinm"/>
-        <signal device-name="e5|f5" driver="usb_otg_hs" name="sof"/>
         <signal af="2" driver="tim" instance="5" name="etr"/>
         <signal af="3" driver="lptim" instance="2" name="ch1"/>
         <signal af="5" driver="i2s" instance="1" name="ws"/>
@@ -510,6 +514,7 @@
         <signal af="6" driver="spi" instance="3" name="nss"/>
         <signal af="7" driver="usart" instance="2" name="ck"/>
         <signal af="8" driver="spi" instance="6" name="nss"/>
+        <signal device-name="e5|f5" af="10" driver="usb_otg_hs" name="sof"/>
         <signal device-pin="a|i|v" device-size="j|k" af="12" driver="fmc" name="nbl2"/>
         <signal device-pin="z" device-size="j" af="12" driver="fmc" name="nbl2"/>
         <signal af="13" driver="dcmi" name="hsync"/>
@@ -570,7 +575,7 @@
         <signal af="9" driver="tim" instance="14" name="ch1"/>
         <signal af="10" driver="octospim" name="p1_io2"/>
         <signal af="11" driver="eth" name="mii_rx_dv"/>
-        <signal af="11" driver="eth" name="rmii_rcc_crs_dv"/>
+        <signal af="11" driver="eth" name="rmii_crs_dv"/>
         <signal device-pin="a|i|v" device-size="j|k" af="12" driver="fmc" name="sdnwe"/>
         <signal device-pin="z" device-size="j" af="12" driver="fmc" name="sdnwe"/>
         <signal device-pin="a|i|v" device-size="j|k" af="13" driver="fmc" name="nwe"/>
@@ -578,7 +583,6 @@
         <signal af="14" driver="ltdc" name="b2"/>
       </gpio>
       <gpio port="a" pin="8">
-        <signal driver="usb_otg_fs" name="sof"/>
         <signal af="0" driver="rcc" name="mco_1"/>
         <signal af="1" driver="tim" instance="1" name="ch1"/>
         <signal af="3" driver="tim" instance="8" name="bkin2"/>
@@ -586,6 +590,7 @@
         <signal af="5" driver="spi" instance="1" name="rdy"/>
         <signal af="7" driver="usart" instance="1" name="ck"/>
         <signal af="9" driver="octospim" name="p2_dqs"/>
+        <signal af="10" driver="usb_otg_fs" name="sof"/>
         <signal af="11" driver="uart" instance="7" name="rx"/>
         <signal device-pin="a|i|v" device-size="j|k" af="12" driver="fmc" name="noe"/>
         <signal device-pin="z" device-size="j" af="12" driver="fmc" name="noe"/>
@@ -1182,7 +1187,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" name="audioclk"/>
+        <signal af="5" driver="rcc" name="audioclk"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="octospim" name="p1_io0"/>
         <signal device-pin="a|i|v" device-size="j|k" af="10" driver="fmc" name="sdncas"/>
@@ -1281,7 +1286,7 @@
         <signal af="9" driver="fdcan" instance="1" name="tx"/>
         <signal af="10" driver="octospim" name="p2_dqs"/>
         <signal af="11" driver="eth" name="mii_rx_dv"/>
-        <signal af="11" driver="eth" name="rmii_rcc_crs_dv"/>
+        <signal af="11" driver="eth" name="rmii_crs_dv"/>
         <signal device-pin="a|i|v" device-size="j|k" af="12" driver="fmc" name="d3"/>
         <signal device-pin="z" device-size="j" af="12" driver="fmc" name="d3"/>
         <signal device-pin="a|i|v" device-size="j|k" af="12" driver="fmc" name="da3"/>
@@ -1410,7 +1415,7 @@
       <gpio port="d" pin="10">
         <signal af="2" driver="tim" instance="14" name="ch1"/>
         <signal af="3" driver="lptim" instance="2" name="ch2"/>
-        <signal af="5" name="audioclk"/>
+        <signal af="5" driver="rcc" name="audioclk"/>
         <signal af="7" driver="usart" instance="3" name="ck"/>
         <signal af="8" driver="eth" name="mii_crs"/>
         <signal af="9" driver="fdcan" instance="3" name="rx"/>
diff --git a/devices/stm32/stm32h5-e4_e5_f4_f5-q.xml b/devices/stm32/stm32h5-e4_e5_f4_f5-q.xml
index e3f0510c..8b2fc6c6 100644
--- a/devices/stm32/stm32h5-e4_e5_f4_f5-q.xml
+++ b/devices/stm32/stm32h5-e4_e5_f4_f5-q.xml
@@ -214,6 +214,7 @@
       <vector device-name="e5|f5" position="161" name="OTG_HS"/>
     </driver>
     <driver name="adc" type="stm32-h5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -228,7 +229,10 @@
       <instance value="2"/>
     </driver>
     <driver name="cordic" type="stm32-v1.0"/>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -312,7 +316,9 @@
       <instance value="2"/>
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="jpeg" type="stm32-v1.0"/>
     <driver name="lptim" type="stm32-v2.2">
       <instance value="1"/>
@@ -372,9 +378,7 @@
       <instance device-pin="a|i|l|z" value="5"/>
       <instance value="6"/>
     </driver>
-    <driver name="sys" type="stm32">
-      <feature value="exti"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="sys_s" type="stm32-v1.0"/>
     <driver name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
@@ -399,6 +403,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
@@ -411,6 +416,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -420,7 +426,6 @@
     </driver>
     <driver name="usb_otg_fs" type="stm32-v3.0"/>
     <driver device-name="e5|f5" name="usb_otg_hs" type="stm32-v3.0"/>
-    <driver name="usbpd" type="stm32-v4.1"/>
     <driver name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="gpio" type="stm32">
@@ -503,7 +508,6 @@
         <signal driver="adc" instance="2" name="inp18"/>
         <signal driver="dac" instance="1" name="out1"/>
         <signal driver="opamp" instance="1" name="vinm"/>
-        <signal device-name="e5|f5" driver="usb_otg_hs" name="sof"/>
         <signal af="2" driver="tim" instance="5" name="etr"/>
         <signal af="3" driver="lptim" instance="2" name="ch1"/>
         <signal af="5" driver="i2s" instance="1" name="ws"/>
@@ -512,6 +516,7 @@
         <signal af="6" driver="spi" instance="3" name="nss"/>
         <signal af="7" driver="usart" instance="2" name="ck"/>
         <signal af="8" driver="spi" instance="6" name="nss"/>
+        <signal device-name="e5|f5" af="10" driver="usb_otg_hs" name="sof"/>
         <signal af="12" driver="fmc" name="nbl2"/>
         <signal af="13" driver="dcmi" name="hsync"/>
         <signal af="13" driver="pssi" name="de"/>
@@ -570,13 +575,12 @@
         <signal af="9" driver="tim" instance="14" name="ch1"/>
         <signal af="10" driver="octospim" name="p1_io2"/>
         <signal af="11" driver="eth" name="mii_rx_dv"/>
-        <signal af="11" driver="eth" name="rmii_rcc_crs_dv"/>
+        <signal af="11" driver="eth" name="rmii_crs_dv"/>
         <signal af="12" driver="fmc" name="sdnwe"/>
         <signal af="13" driver="fmc" name="nwe"/>
         <signal af="14" driver="ltdc" name="b2"/>
       </gpio>
       <gpio port="a" pin="8">
-        <signal driver="usb_otg_fs" name="sof"/>
         <signal af="0" driver="rcc" name="mco_1"/>
         <signal af="1" driver="tim" instance="1" name="ch1"/>
         <signal af="3" driver="tim" instance="8" name="bkin2"/>
@@ -584,6 +588,7 @@
         <signal af="5" driver="spi" instance="1" name="rdy"/>
         <signal af="7" driver="usart" instance="1" name="ck"/>
         <signal af="9" driver="octospim" name="p2_dqs"/>
+        <signal af="10" driver="usb_otg_fs" name="sof"/>
         <signal af="11" driver="uart" instance="7" name="rx"/>
         <signal af="12" driver="fmc" name="noe"/>
         <signal af="13" driver="dcmi" name="d3"/>
@@ -1278,7 +1283,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" name="audioclk"/>
+        <signal af="5" driver="rcc" name="audioclk"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="octospim" name="p1_io0"/>
         <signal af="10" driver="fmc" name="sdncas"/>
@@ -1372,7 +1377,7 @@
         <signal af="9" driver="fdcan" instance="1" name="tx"/>
         <signal af="10" driver="octospim" name="p2_dqs"/>
         <signal af="11" driver="eth" name="mii_rx_dv"/>
-        <signal af="11" driver="eth" name="rmii_rcc_crs_dv"/>
+        <signal af="11" driver="eth" name="rmii_crs_dv"/>
         <signal af="12" driver="fmc" name="d3"/>
         <signal af="12" driver="fmc" name="da3"/>
         <signal af="13" driver="ltdc" name="de"/>
@@ -1489,7 +1494,7 @@
       <gpio port="d" pin="10">
         <signal af="2" driver="tim" instance="14" name="ch1"/>
         <signal af="3" driver="lptim" instance="2" name="ch2"/>
-        <signal af="5" name="audioclk"/>
+        <signal af="5" driver="rcc" name="audioclk"/>
         <signal af="7" driver="usart" instance="3" name="ck"/>
         <signal af="8" driver="eth" name="mii_crs"/>
         <signal af="9" driver="fdcan" instance="3" name="rx"/>
@@ -2897,7 +2902,7 @@
         <signal af="7" driver="usart" instance="6" name="ck"/>
         <signal af="10" driver="octospim" name="p2_io7"/>
         <signal af="12" driver="eth" name="mii_rx_dv"/>
-        <signal af="12" driver="eth" name="rmii_rcc_crs_dv"/>
+        <signal af="12" driver="eth" name="rmii_crs_dv"/>
         <signal af="14" driver="ltdc" name="g0"/>
       </gpio>
       <package device-name="e4|f4" device-pin="v" name="LQFP100">
diff --git a/devices/stm32/stm32h7-23_30_33.xml b/devices/stm32/stm32h7-23_30_33.xml
index 42676414..a58d5e9e 100644
--- a/devices/stm32/stm32h7-23_30_33.xml
+++ b/devices/stm32/stm32h7-23_30_33.xml
@@ -182,6 +182,7 @@
       <vector position="162" name="TIM24"/>
     </driver>
     <driver name="adc" type="stm32-h7">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -312,8 +313,6 @@
       <instance value="2"/>
       <instance value="3"/>
       <instance value="4"/>
-    </driver>
-    <driver name="i2c" type="stm32-v1.1">
       <instance value="5"/>
     </driver>
     <driver name="i2s" type="stm32-v1.1">
@@ -323,6 +322,7 @@
       <instance value="6"/>
     </driver>
     <driver name="iwdg" type="stm32">
+      <feature value="window"/>
       <instance value="1"/>
     </driver>
     <driver name="lptim" type="stm32-v1.1">
@@ -367,9 +367,7 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="spdifrx" type="stm32-spdifrx1_h7_cube">
-      <instance value="1"/>
-    </driver>
+    <driver name="spdifrx" type="stm32-spdifrx1_h7_cube"/>
     <driver name="spi" type="stm32-extended">
       <instance value="1"/>
       <instance value="2"/>
@@ -408,6 +406,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
@@ -416,6 +415,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -694,10 +694,10 @@
           <signal driver="sai" instance="1" name="b"/>
         </request>
         <request position="91">
-          <signal driver="swpmi" name="rx"/>
+          <signal driver="swpmi" instance="1" name="rx"/>
         </request>
         <request position="92">
-          <signal driver="swpmi" name="tx"/>
+          <signal driver="swpmi" instance="1" name="tx"/>
         </request>
         <request position="93">
           <signal driver="spdifrx" name="dt"/>
@@ -971,7 +971,7 @@
         <signal af="8" driver="spi" instance="6" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
         <signal af="10" driver="octospim" name="p1_io2"/>
-        <signal af="11" driver="eth" name="rcc_crs_dv"/>
+        <signal af="11" driver="eth" name="crs_dv"/>
         <signal af="11" driver="eth" name="rx_dv"/>
         <signal af="12" driver="fmc" name="sdnwe"/>
         <signal af="14" driver="ltdc" name="vsync"/>
@@ -1364,17 +1364,15 @@
         <signal device-package="i|k" driver="adc" instance="3" name="inn11"/>
         <signal device-package="h|t" driver="adc" instance="3" name="inp0"/>
         <signal device-package="i|k" driver="adc" instance="3" name="inp12"/>
-        <signal device-package="i|k" driver="eth" name="txd2"/>
         <signal driver="pwr" name="cstop"/>
-        <signal device-package="i|k" driver="usb_otg_hs" name="ulpi_dir"/>
         <signal af="3" driver="dfsdm" instance="1" name="ckin1"/>
         <signal af="4" driver="octospim" name="p1_io5"/>
         <signal af="5" driver="i2s" instance="2" name="sdi"/>
         <signal af="5" driver="spi" instance="2" name="miso"/>
         <signal af="6" driver="dfsdm" instance="1" name="ckout"/>
         <signal af="9" driver="octospim" name="p1_io2"/>
-        <signal device-package="h|t" af="10" driver="usb_otg_hs" name="ulpi_dir"/>
-        <signal device-package="h|t" af="11" driver="eth" name="txd2"/>
+        <signal af="10" driver="usb_otg_hs" name="ulpi_dir"/>
+        <signal af="11" driver="eth" name="txd2"/>
         <signal af="12" driver="fmc" name="sdne0"/>
       </gpio>
       <gpio port="c" pin="3">
@@ -1383,16 +1381,14 @@
         <signal device-package="i|k" driver="adc" instance="2" name="inn12"/>
         <signal device-package="i|k" driver="adc" instance="2" name="inp13"/>
         <signal device-package="h|t" driver="adc" instance="3" name="inp1"/>
-        <signal device-package="i|k" driver="eth" name="tx_clk"/>
         <signal driver="pwr" name="csleep"/>
-        <signal device-package="i|k" driver="usb_otg_hs" name="ulpi_nxt"/>
         <signal af="3" driver="dfsdm" instance="1" name="datin1"/>
         <signal af="4" driver="octospim" name="p1_io6"/>
         <signal af="5" driver="i2s" instance="2" name="sdo"/>
         <signal af="5" driver="spi" instance="2" name="mosi"/>
         <signal af="9" driver="octospim" name="p1_io0"/>
-        <signal device-package="h|t" af="10" driver="usb_otg_hs" name="ulpi_nxt"/>
-        <signal device-package="h|t" af="11" driver="eth" name="tx_clk"/>
+        <signal af="10" driver="usb_otg_hs" name="ulpi_nxt"/>
+        <signal af="11" driver="eth" name="tx_clk"/>
         <signal af="12" driver="fmc" name="sdcke0"/>
       </gpio>
       <gpio port="c" pin="4">
@@ -1477,7 +1473,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="i2c" instance="5" name="sda"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="octospim" name="p1_io0"/>
diff --git a/devices/stm32/stm32h7-25_35.xml b/devices/stm32/stm32h7-25_35.xml
index f2a1e1c8..aa20fe6d 100644
--- a/devices/stm32/stm32h7-25_35.xml
+++ b/devices/stm32/stm32h7-25_35.xml
@@ -203,6 +203,7 @@
       <vector position="162" name="TIM24"/>
     </driver>
     <driver name="adc" type="stm32-h7">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -333,8 +334,6 @@
       <instance device-pin="a|i|v|z" value="2"/>
       <instance value="3"/>
       <instance value="4"/>
-    </driver>
-    <driver name="i2c" type="stm32-v1.1">
       <instance value="5"/>
     </driver>
     <driver name="i2s" type="stm32-v1.1">
@@ -344,6 +343,7 @@
       <instance value="6"/>
     </driver>
     <driver name="iwdg" type="stm32">
+      <feature value="window"/>
       <instance value="1"/>
     </driver>
     <driver name="lptim" type="stm32-v1.1">
@@ -388,9 +388,7 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="spdifrx" type="stm32-spdifrx1_h7_cube">
-      <instance value="1"/>
-    </driver>
+    <driver name="spdifrx" type="stm32-spdifrx1_h7_cube"/>
     <driver name="spi" type="stm32-extended">
       <instance value="1"/>
       <instance value="2"/>
@@ -429,6 +427,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
@@ -440,6 +439,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -739,10 +739,10 @@
           <signal driver="sai" instance="1" name="b"/>
         </request>
         <request position="91">
-          <signal driver="swpmi" name="rx"/>
+          <signal driver="swpmi" instance="1" name="rx"/>
         </request>
         <request position="92">
-          <signal driver="swpmi" name="tx"/>
+          <signal driver="swpmi" instance="1" name="tx"/>
         </request>
         <request position="93">
           <signal driver="spdifrx" name="dt"/>
@@ -1034,7 +1034,7 @@
         <signal af="8" driver="spi" instance="6" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
         <signal af="10" driver="octospim" name="p1_io2"/>
-        <signal device-pin="a|i|v|z" af="11" driver="eth" name="rcc_crs_dv"/>
+        <signal device-pin="a|i|v|z" af="11" driver="eth" name="crs_dv"/>
         <signal device-pin="a|i|v|z" af="11" driver="eth" name="rx_dv"/>
         <signal device-pin="a|i|v|z" af="12" driver="fmc" name="sdnwe"/>
         <signal af="14" driver="ltdc" name="vsync"/>
@@ -1427,17 +1427,15 @@
         <signal device-package="i|k" driver="adc" instance="3" name="inn11"/>
         <signal device-package="h|t" driver="adc" instance="3" name="inp0"/>
         <signal device-package="i|k" driver="adc" instance="3" name="inp12"/>
-        <signal device-package="i|k" driver="eth" name="txd2"/>
         <signal driver="pwr" name="cstop"/>
-        <signal device-package="i|k" driver="usb_otg_hs" name="ulpi_dir"/>
         <signal af="3" driver="dfsdm" instance="1" name="ckin1"/>
         <signal af="4" driver="octospim" name="p1_io5"/>
         <signal af="5" driver="i2s" instance="2" name="sdi"/>
         <signal af="5" driver="spi" instance="2" name="miso"/>
         <signal af="6" driver="dfsdm" instance="1" name="ckout"/>
         <signal af="9" driver="octospim" name="p1_io2"/>
-        <signal device-package="h|t" af="10" driver="usb_otg_hs" name="ulpi_dir"/>
-        <signal device-package="h|t" af="11" driver="eth" name="txd2"/>
+        <signal af="10" driver="usb_otg_hs" name="ulpi_dir"/>
+        <signal af="11" driver="eth" name="txd2"/>
         <signal af="12" driver="fmc" name="sdne0"/>
       </gpio>
       <gpio device-package="h|i|k|t" port="c" pin="3">
@@ -1446,16 +1444,14 @@
         <signal device-package="i|k" driver="adc" instance="2" name="inn12"/>
         <signal device-package="i|k" driver="adc" instance="2" name="inp13"/>
         <signal device-package="h|t" driver="adc" instance="3" name="inp1"/>
-        <signal device-package="i|k" driver="eth" name="tx_clk"/>
         <signal driver="pwr" name="csleep"/>
-        <signal device-package="i|k" driver="usb_otg_hs" name="ulpi_nxt"/>
         <signal af="3" driver="dfsdm" instance="1" name="datin1"/>
         <signal af="4" driver="octospim" name="p1_io6"/>
         <signal af="5" driver="i2s" instance="2" name="sdo"/>
         <signal af="5" driver="spi" instance="2" name="mosi"/>
         <signal af="9" driver="octospim" name="p1_io0"/>
-        <signal device-package="h|t" af="10" driver="usb_otg_hs" name="ulpi_nxt"/>
-        <signal device-package="h|t" af="11" driver="eth" name="tx_clk"/>
+        <signal af="10" driver="usb_otg_hs" name="ulpi_nxt"/>
+        <signal af="11" driver="eth" name="tx_clk"/>
         <signal af="12" driver="fmc" name="sdcke0"/>
       </gpio>
       <gpio port="c" pin="4">
@@ -1540,7 +1536,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="6" driver="i2c" instance="5" name="sda"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="octospim" name="p1_io0"/>
diff --git a/devices/stm32/stm32h7-42_43_50_53.xml b/devices/stm32/stm32h7-42_43_50_53.xml
index 24fc86ce..346158df 100644
--- a/devices/stm32/stm32h7-42_43_50_53.xml
+++ b/devices/stm32/stm32h7-42_43_50_53.xml
@@ -65,11 +65,10 @@
       <memory device-name="42" name="d1_sram" access="rwx" start="0x24000000" size="393216"/>
       <memory device-name="43|50|53" name="d1_sram" access="rwx" start="0x24000000" size="524288"/>
       <memory device-name="42" name="d2_sram1" access="rwx" start="0x30000000" size="32768"/>
-      <memory device-name="43|53" name="d2_sram1" access="rwx" start="0x30000000" size="131072"/>
-      <memory device-name="50" name="d2_sram1" access="rwx" start="0x30000000" size="294912"/>
+      <memory device-name="43|50|53" name="d2_sram1" access="rwx" start="0x30000000" size="131072"/>
       <memory device-name="42" name="d2_sram2" access="rwx" start="0x30020000" size="16384"/>
-      <memory device-name="43|53" name="d2_sram2" access="rwx" start="0x30020000" size="131072"/>
-      <memory device-name="43|53" name="d2_sram3" access="rwx" start="0x30040000" size="32768"/>
+      <memory device-name="43|50|53" name="d2_sram2" access="rwx" start="0x30020000" size="131072"/>
+      <memory device-name="43|50|53" name="d2_sram3" access="rwx" start="0x30040000" size="32768"/>
       <memory name="d3_sram" access="rwx" start="0x38000000" size="65536"/>
       <memory name="backup" access="rwx" start="0x38800000" size="4096"/>
       <vector position="0" name="WWDG"/>
@@ -215,6 +214,7 @@
       <vector position="149" name="WAKEUP_PIN"/>
     </driver>
     <driver name="adc" type="stm32-h7">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -354,6 +354,7 @@
       <instance value="3"/>
     </driver>
     <driver name="iwdg" type="stm32">
+      <feature value="window"/>
       <instance value="1"/>
     </driver>
     <driver device-name="43|50|53" name="jpeg" type="stm32-v1.0"/>
@@ -392,9 +393,7 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="spdifrx" type="stm32-spdifrx1_h7_cube">
-      <instance value="1"/>
-    </driver>
+    <driver name="spdifrx" type="stm32-spdifrx1_h7_cube"/>
     <driver name="spi" type="stm32-extended">
       <instance value="1"/>
       <instance value="2"/>
@@ -431,6 +430,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
@@ -438,6 +438,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -721,10 +722,10 @@
           <signal driver="sai" instance="2" name="b"/>
         </request>
         <request position="91">
-          <signal driver="swpmi" name="rx"/>
+          <signal driver="swpmi" instance="1" name="rx"/>
         </request>
         <request position="92">
-          <signal driver="swpmi" name="tx"/>
+          <signal driver="swpmi" instance="1" name="tx"/>
         </request>
         <request position="93">
           <signal driver="spdifrx" name="dt"/>
@@ -919,7 +920,7 @@
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="8" driver="spi" instance="6" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
-        <signal af="11" driver="eth" name="rcc_crs_dv"/>
+        <signal af="11" driver="eth" name="crs_dv"/>
         <signal af="11" driver="eth" name="rx_dv"/>
         <signal af="12" driver="fmc" name="sdnwe"/>
       </gpio>
@@ -1387,7 +1388,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="quadspi" name="bk1_io0"/>
         <signal device-name="43|50|53" af="10" driver="ltdc" name="g3"/>
diff --git a/devices/stm32/stm32h7-45_47_55_57.xml b/devices/stm32/stm32h7-45_47_55_57.xml
index dbc5a0cc..3a1a49f6 100644
--- a/devices/stm32/stm32h7-45_47_55_57.xml
+++ b/devices/stm32/stm32h7-45_47_55_57.xml
@@ -120,9 +120,9 @@
       <memory device-size="i" device-core="m7" name="flash1" access="rx" start="0x8000000" size="1048576"/>
       <memory device-size="g" device-core="m4" name="flash2" access="rx" start="0x8100000" size="524288"/>
       <memory device-size="i" device-core="m4" name="flash2" access="rx" start="0x8100000" size="1048576"/>
-      <memory device-core="m4" name="d2_sram1" access="rwx" start="0x10000000" size="131072"/>
-      <memory device-core="m4" name="d2_sram2" access="rwx" start="0x10020000" size="131072"/>
-      <memory device-core="m4" name="d2_sram3" access="rwx" start="0x10040000" size="32768"/>
+      <memory device-name="55|57" device-core="m4" name="d2_sram1" access="rwx" start="0x10000000" size="262144"/>
+      <memory device-name="45|47" device-core="m4" name="d2_sram1" access="rwx" start="0x10000000" size="294912"/>
+      <memory device-name="55|57" device-core="m4" name="d2_sram3" access="rwx" start="0x10040000" size="32768"/>
       <memory device-core="m7" name="dtcm" access="rwx" start="0x20000000" size="131072"/>
       <memory device-core="m7" name="d1_sram" access="rwx" start="0x24000000" size="524288"/>
       <memory name="d3_sram" access="rwx" start="0x38000000" size="65536"/>
@@ -276,6 +276,7 @@
       <vector position="149" name="WAKEUP_PIN"/>
     </driver>
     <driver name="adc" type="stm32-h7">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -416,6 +417,7 @@
       <instance value="3"/>
     </driver>
     <driver name="iwdg" type="stm32">
+      <feature value="window"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -444,7 +446,6 @@
       <max-frequency device-core="m4" value="240000000"/>
       <max-frequency device-core="m7" value="480000000"/>
     </driver>
-    <driver name="resmgr_utility" type="stm32-stm32h7_cube"/>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v2.7"/>
     <driver name="sai" type="stm32-sai1_h7_cube">
@@ -457,9 +458,7 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="spdifrx" type="stm32-spdifrx1_h7_cube">
-      <instance value="1"/>
-    </driver>
+    <driver name="spdifrx" type="stm32-spdifrx1_h7_cube"/>
     <driver name="spi" type="stm32-extended">
       <instance value="1"/>
       <instance value="2"/>
@@ -497,6 +496,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
@@ -504,6 +504,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -788,10 +789,10 @@
           <signal driver="sai" instance="2" name="b"/>
         </request>
         <request position="91">
-          <signal driver="swpmi" name="rx"/>
+          <signal driver="swpmi" instance="1" name="rx"/>
         </request>
         <request position="92">
-          <signal driver="swpmi" name="tx"/>
+          <signal driver="swpmi" instance="1" name="tx"/>
         </request>
         <request position="93">
           <signal driver="spdifrx" name="dt"/>
@@ -986,7 +987,7 @@
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="8" driver="spi" instance="6" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
-        <signal af="11" driver="eth" name="rcc_crs_dv"/>
+        <signal af="11" driver="eth" name="crs_dv"/>
         <signal af="11" driver="eth" name="rx_dv"/>
         <signal af="12" driver="fmc" name="sdnwe"/>
       </gpio>
@@ -1456,7 +1457,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="quadspi" name="bk1_io0"/>
         <signal af="10" driver="ltdc" name="g3"/>
diff --git a/devices/stm32/stm32h7-a3_b0_b3-.xml b/devices/stm32/stm32h7-a3_b0_b3-.xml
index 5cd586a7..60f89c8a 100644
--- a/devices/stm32/stm32h7-a3_b0_b3-.xml
+++ b/devices/stm32/stm32h7-a3_b0_b3-.xml
@@ -42,7 +42,8 @@
       <memory device-size="i" name="flash2" access="rx" start="0x8100000" size="1048576"/>
       <memory name="dtcm" access="rwx" start="0x20000000" size="131072"/>
       <memory name="d1_sram" access="rwx" start="0x24000000" size="1048576"/>
-      <memory name="d2_sram1" access="rwx" start="0x30000000" size="131072"/>
+      <memory name="d2_sram1" access="rwx" start="0x30000000" size="65536"/>
+      <memory name="d2_sram2" access="rwx" start="0x30010000" size="65536"/>
       <memory name="d3_sram" access="rwx" start="0x38000000" size="32768"/>
       <memory name="backup" access="rwx" start="0x38800000" size="4096"/>
       <vector position="0" name="WWDG"/>
@@ -185,6 +186,7 @@
       <vector position="154" name="BDMA1"/>
     </driver>
     <driver name="adc" type="stm32-h7">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -329,6 +331,7 @@
       <instance value="6"/>
     </driver>
     <driver name="iwdg" type="stm32">
+      <feature value="window"/>
       <instance value="1"/>
     </driver>
     <driver name="jpeg" type="stm32-v1.0"/>
@@ -410,6 +413,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
@@ -418,6 +422,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -702,10 +707,10 @@
           <signal driver="sai" instance="2" name="b"/>
         </request>
         <request position="91">
-          <signal driver="swpmi" name="rx"/>
+          <signal driver="swpmi" instance="1" name="rx"/>
         </request>
         <request position="92">
-          <signal driver="swpmi" name="tx"/>
+          <signal driver="swpmi" instance="1" name="tx"/>
         </request>
         <request position="93">
           <signal driver="spdifrx" name="dt"/>
@@ -1369,7 +1374,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="octospim" name="p1_io0"/>
         <signal af="10" driver="ltdc" name="g3"/>
diff --git a/devices/stm32/stm32h7-a3_b0_b3-q.xml b/devices/stm32/stm32h7-a3_b0_b3-q.xml
index 6095bd60..041022ef 100644
--- a/devices/stm32/stm32h7-a3_b0_b3-q.xml
+++ b/devices/stm32/stm32h7-a3_b0_b3-q.xml
@@ -42,7 +42,8 @@
       <memory device-size="i" name="flash2" access="rx" start="0x8100000" size="1048576"/>
       <memory name="dtcm" access="rwx" start="0x20000000" size="131072"/>
       <memory name="d1_sram" access="rwx" start="0x24000000" size="1048576"/>
-      <memory name="d2_sram1" access="rwx" start="0x30000000" size="131072"/>
+      <memory name="d2_sram1" access="rwx" start="0x30000000" size="65536"/>
+      <memory name="d2_sram2" access="rwx" start="0x30010000" size="65536"/>
       <memory name="d3_sram" access="rwx" start="0x38000000" size="32768"/>
       <memory name="backup" access="rwx" start="0x38800000" size="4096"/>
       <vector position="0" name="WWDG"/>
@@ -185,6 +186,7 @@
       <vector position="154" name="BDMA1"/>
     </driver>
     <driver name="adc" type="stm32-h7">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -329,6 +331,7 @@
       <instance value="6"/>
     </driver>
     <driver name="iwdg" type="stm32">
+      <feature value="window"/>
       <instance value="1"/>
     </driver>
     <driver name="jpeg" type="stm32-v1.0"/>
@@ -414,6 +417,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
@@ -422,6 +426,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -710,10 +715,10 @@
           <signal driver="sai" instance="2" name="b"/>
         </request>
         <request position="91">
-          <signal driver="swpmi" name="rx"/>
+          <signal driver="swpmi" instance="1" name="rx"/>
         </request>
         <request position="92">
-          <signal driver="swpmi" name="tx"/>
+          <signal driver="swpmi" instance="1" name="tx"/>
         </request>
         <request device-pin="l|v" device-package="h" position="93">
           <signal driver="spdifrx" name="dt"/>
@@ -1447,7 +1452,7 @@
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="3" driver="tim" instance="8" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="octospim" name="p1_io0"/>
         <signal af="10" driver="ltdc" name="g3"/>
diff --git a/devices/stm32/stm32h7-r3_s3.xml b/devices/stm32/stm32h7-r3_s3.xml
index 09c9b689..8d40687c 100644
--- a/devices/stm32/stm32h7-r3_s3.xml
+++ b/devices/stm32/stm32h7-r3_s3.xml
@@ -30,12 +30,12 @@
       <attribute-cmsis-define device-name="r3" value="STM32H7R3xx"/>
       <attribute-cmsis-define device-name="s3" value="STM32H7S3xx"/>
       <attribute-cmsis-header value="stm32h7rsxx"/>
-      <memory name="itcm_ram" access="rwx" start="0x00" size="65536"/>
       <memory name="itcm" access="rwx" start="0x00" size="65536"/>
       <memory name="flash" access="rx" start="0x8000000" size="65536"/>
       <memory name="dtcm" access="rwx" start="0x20000000" size="65536"/>
       <memory name="d1_sram" access="rwx" start="0x24000000" size="466944"/>
-      <memory name="d2_sram1" access="rwx" start="0x30000000" size="32768"/>
+      <memory name="d2_sram1" access="rwx" start="0x30000000" size="16384"/>
+      <memory name="d2_sram2" access="rwx" start="0x30004000" size="16384"/>
       <memory name="backup" access="rwx" start="0x38800000" size="4096"/>
       <vector position="0" name="PVD_PVM"/>
       <vector position="2" name="DTS"/>
@@ -180,7 +180,8 @@
       <vector position="154" name="FDCAN2_IT0"/>
       <vector position="155" name="FDCAN2_IT1"/>
     </driver>
-    <driver name="adc" type="stm32-h7">
+    <driver name="adc" type="stm32-h5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -198,39 +199,28 @@
     <driver name="dma2d" type="stm32"/>
     <driver name="dts" type="stm32-v1.0"/>
     <driver device-pin="a|i|l|z" name="eth" type="stm32-v3.1"/>
-    <driver name="extmem_loader" type="stm32-v1.0"/>
-    <driver name="extmem_manager" type="stm32-v1.0"/>
-    <driver name="extmem_manager_appli" type="stm32-v1.0"/>
-    <driver name="fdcan" type="stm32-h7">
+    <driver name="fdcan" type="stm32">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="950">
-        <wait-state ws="0" hclk-max="45000000"/>
-        <wait-state ws="1" hclk-max="90000000"/>
-        <wait-state ws="2" hclk-max="135000000"/>
-        <wait-state ws="3" hclk-max="180000000"/>
-        <wait-state ws="4" hclk-max="225000000"/>
-      </latency>
-      <latency vcore-min="1050">
-        <wait-state ws="0" hclk-max="55000000"/>
-        <wait-state ws="1" hclk-max="110000000"/>
-        <wait-state ws="2" hclk-max="165000000"/>
-        <wait-state ws="3" hclk-max="225000000"/>
-      </latency>
       <latency vcore-min="1150">
-        <wait-state ws="0" hclk-max="70000000"/>
-        <wait-state ws="1" hclk-max="140000000"/>
-        <wait-state ws="2" hclk-max="210000000"/>
-        <wait-state ws="3" hclk-max="225000000"/>
+        <wait-state ws="0" hclk-max="36000000"/>
+        <wait-state ws="1" hclk-max="72000000"/>
+        <wait-state ws="2" hclk-max="108000000"/>
+        <wait-state ws="3" hclk-max="144000000"/>
+        <wait-state ws="4" hclk-max="180000000"/>
+        <wait-state ws="5" hclk-max="216000000"/>
       </latency>
-      <latency vcore-min="1260">
-        <wait-state ws="0" hclk-max="70000000"/>
-        <wait-state ws="1" hclk-max="140000000"/>
-        <wait-state ws="2" hclk-max="210000000"/>
-        <wait-state ws="3" hclk-max="225000000"/>
-        <wait-state ws="4" hclk-max="240000000"/>
+      <latency vcore-min="1300">
+        <wait-state ws="0" hclk-max="40000000"/>
+        <wait-state ws="1" hclk-max="80000000"/>
+        <wait-state ws="2" hclk-max="120000000"/>
+        <wait-state ws="3" hclk-max="160000000"/>
+        <wait-state ws="4" hclk-max="200000000"/>
+        <wait-state ws="5" hclk-max="240000000"/>
+        <wait-state ws="6" hclk-max="280000000"/>
+        <wait-state ws="7" hclk-max="320000000"/>
       </latency>
     </driver>
     <driver name="fmc" type="stm32-v3.1"/>
@@ -260,7 +250,9 @@
     <driver name="i3c" type="stm32-v1.0">
       <instance value="1"/>
     </driver>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="jpeg" type="stm32-v1.0"/>
     <driver name="lptim" type="stm32-v2.2">
       <instance device-pin="a" device-package="i" value="1"/>
@@ -287,7 +279,16 @@
     <driver name="pwr" type="stm32-v1.0"/>
     <driver name="ramecc" type="stm32-v1.0"/>
     <driver name="rcc" type="stm32-v1.0">
-      <max-frequency value="550000000"/>
+      <max-frequency device-name="r3|s3" device-pin="v|z" device-package="t" value="600000000"/>
+      <max-frequency device-name="r3|s3" device-pin="a" device-package="i" value="600000000"/>
+      <max-frequency device-name="r3|s3" device-pin="r" device-package="v" value="600000000"/>
+      <max-frequency device-name="r3" device-pin="i" device-package="k|t" value="600000000"/>
+      <max-frequency device-name="r3" device-pin="z" device-package="j|t" value="600000000"/>
+      <max-frequency device-name="s3" device-pin="i" device-package="k" value="600000000"/>
+      <max-frequency device-name="r3|s3" device-pin="l|v" device-package="h" value="550000000"/>
+      <max-frequency device-name="r3|s3" device-pin="v" device-package="y" value="550000000"/>
+      <max-frequency device-name="s3" device-pin="i" device-package="t" value="550000000"/>
+      <max-frequency device-name="s3" device-pin="z" device-package="j" value="550000000"/>
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-rtc2_v2_u5_cube"/>
@@ -314,9 +315,7 @@
       <instance value="5"/>
       <instance device-pin="a|i|l|v|z" value="6"/>
     </driver>
-    <driver name="sys" type="stm32">
-      <feature value="exti"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -345,6 +344,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
@@ -355,6 +355,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance device-pin="a" device-package="i" value="2"/>
       <instance device-pin="i" device-package="k|t" value="2"/>
@@ -366,7 +367,6 @@
     </driver>
     <driver name="usb_otg_fs" type="stm32-v3.0"/>
     <driver device-pin="a|i|l|v|z" name="usb_otg_hs" type="stm32-v2.0"/>
-    <driver device-pin="a|i|l|v|z" name="usbpd" type="stm32-v1.4"/>
     <driver name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="xspi" type="stm32-v2.1">
@@ -663,7 +663,7 @@
         <signal device-pin="a|i|l|v|z" af="8" driver="spi" instance="6" name="mosi"/>
         <signal af="9" driver="tim" instance="14" name="ch1"/>
         <signal device-pin="a|i|l|z" af="11" driver="eth" name="mii_rx_dv"/>
-        <signal device-pin="a|i|l|z" af="11" driver="eth" name="rmii_rcc_crs_dv"/>
+        <signal device-pin="a|i|l|z" af="11" driver="eth" name="rmii_crs_dv"/>
         <signal af="12" driver="fmc" name="int"/>
       </gpio>
       <gpio port="a" pin="8">
@@ -1094,7 +1094,7 @@
         <signal af="0" driver="rcc" name="mco_2"/>
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="pssi" name="d3"/>
         <signal af="11" driver="sdmmc" instance="1" name="d1"/>
diff --git a/devices/stm32/stm32h7-r7_s7.xml b/devices/stm32/stm32h7-r7_s7.xml
index 43848494..2c22df01 100644
--- a/devices/stm32/stm32h7-r7_s7.xml
+++ b/devices/stm32/stm32h7-r7_s7.xml
@@ -20,12 +20,12 @@
       <attribute-cmsis-define device-name="r7" value="STM32H7R7xx"/>
       <attribute-cmsis-define device-name="s7" value="STM32H7S7xx"/>
       <attribute-cmsis-header value="stm32h7rsxx"/>
-      <memory name="itcm_ram" access="rwx" start="0x00" size="65536"/>
       <memory name="itcm" access="rwx" start="0x00" size="65536"/>
       <memory name="flash" access="rx" start="0x8000000" size="65536"/>
       <memory name="dtcm" access="rwx" start="0x20000000" size="65536"/>
       <memory name="d1_sram" access="rwx" start="0x24000000" size="466944"/>
-      <memory name="d2_sram1" access="rwx" start="0x30000000" size="32768"/>
+      <memory name="d2_sram1" access="rwx" start="0x30000000" size="16384"/>
+      <memory name="d2_sram2" access="rwx" start="0x30004000" size="16384"/>
       <memory name="backup" access="rwx" start="0x38800000" size="4096"/>
       <vector position="0" name="PVD_PVM"/>
       <vector position="2" name="DTS"/>
@@ -175,7 +175,8 @@
       <vector position="154" name="FDCAN2_IT0"/>
       <vector position="155" name="FDCAN2_IT1"/>
     </driver>
-    <driver name="adc" type="stm32-h7">
+    <driver name="adc" type="stm32-h5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -193,39 +194,28 @@
     <driver name="dma2d" type="stm32"/>
     <driver name="dts" type="stm32-v1.0"/>
     <driver name="eth" type="stm32-v3.1"/>
-    <driver name="extmem_loader" type="stm32-v1.0"/>
-    <driver name="extmem_manager" type="stm32-v1.0"/>
-    <driver name="extmem_manager_appli" type="stm32-v1.0"/>
-    <driver name="fdcan" type="stm32-h7">
+    <driver name="fdcan" type="stm32">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="950">
-        <wait-state ws="0" hclk-max="45000000"/>
-        <wait-state ws="1" hclk-max="90000000"/>
-        <wait-state ws="2" hclk-max="135000000"/>
-        <wait-state ws="3" hclk-max="180000000"/>
-        <wait-state ws="4" hclk-max="225000000"/>
-      </latency>
-      <latency vcore-min="1050">
-        <wait-state ws="0" hclk-max="55000000"/>
-        <wait-state ws="1" hclk-max="110000000"/>
-        <wait-state ws="2" hclk-max="165000000"/>
-        <wait-state ws="3" hclk-max="225000000"/>
-      </latency>
       <latency vcore-min="1150">
-        <wait-state ws="0" hclk-max="70000000"/>
-        <wait-state ws="1" hclk-max="140000000"/>
-        <wait-state ws="2" hclk-max="210000000"/>
-        <wait-state ws="3" hclk-max="225000000"/>
+        <wait-state ws="0" hclk-max="36000000"/>
+        <wait-state ws="1" hclk-max="72000000"/>
+        <wait-state ws="2" hclk-max="108000000"/>
+        <wait-state ws="3" hclk-max="144000000"/>
+        <wait-state ws="4" hclk-max="180000000"/>
+        <wait-state ws="5" hclk-max="216000000"/>
       </latency>
-      <latency vcore-min="1260">
-        <wait-state ws="0" hclk-max="70000000"/>
-        <wait-state ws="1" hclk-max="140000000"/>
-        <wait-state ws="2" hclk-max="210000000"/>
-        <wait-state ws="3" hclk-max="225000000"/>
-        <wait-state ws="4" hclk-max="240000000"/>
+      <latency vcore-min="1300">
+        <wait-state ws="0" hclk-max="40000000"/>
+        <wait-state ws="1" hclk-max="80000000"/>
+        <wait-state ws="2" hclk-max="120000000"/>
+        <wait-state ws="3" hclk-max="160000000"/>
+        <wait-state ws="4" hclk-max="200000000"/>
+        <wait-state ws="5" hclk-max="240000000"/>
+        <wait-state ws="6" hclk-max="280000000"/>
+        <wait-state ws="7" hclk-max="320000000"/>
       </latency>
     </driver>
     <driver name="fmc" type="stm32-v3.1"/>
@@ -259,7 +249,9 @@
     <driver name="icache" type="stm32-v1.0">
       <instance value="_gpu2d"/>
     </driver>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="jpeg" type="stm32-v1.0"/>
     <driver name="lptim" type="stm32-v2.2">
       <instance device-pin="l" value="1"/>
@@ -283,7 +275,8 @@
     <driver name="pwr" type="stm32-v1.0"/>
     <driver name="ramecc" type="stm32-v1.0"/>
     <driver name="rcc" type="stm32-v1.0">
-      <max-frequency value="550000000"/>
+      <max-frequency device-pin="a|i|z" value="600000000"/>
+      <max-frequency device-pin="l" value="550000000"/>
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-rtc2_v2_u5_cube"/>
@@ -306,9 +299,7 @@
       <instance value="5"/>
       <instance value="6"/>
     </driver>
-    <driver name="sys" type="stm32">
-      <feature value="exti"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="tamp" type="stm32-v2.8"/>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -332,6 +323,7 @@
     </driver>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
       <instance value="7"/>
@@ -342,13 +334,13 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
     </driver>
     <driver name="usb_otg_fs" type="stm32-v3.0"/>
     <driver device-pin="l" name="usb_otg_hs" type="stm32-v2.0"/>
-    <driver device-pin="l" name="usbpd" type="stm32-v1.4"/>
     <driver name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="xspi" type="stm32-v2.1">
@@ -495,7 +487,7 @@
         <signal af="9" driver="tim" instance="14" name="ch1"/>
         <signal af="10" driver="ltdc" name="r4"/>
         <signal af="11" driver="eth" name="mii_rx_dv"/>
-        <signal af="11" driver="eth" name="rmii_rcc_crs_dv"/>
+        <signal af="11" driver="eth" name="rmii_crs_dv"/>
         <signal af="12" driver="fmc" name="int"/>
         <signal af="13" driver="ltdc" name="b1"/>
       </gpio>
@@ -945,7 +937,7 @@
         <signal af="0" driver="rcc" name="mco_2"/>
         <signal af="2" driver="tim" instance="3" name="ch4"/>
         <signal af="4" driver="i2c" instance="3" name="sda"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="8" driver="uart" instance="5" name="cts"/>
         <signal af="9" driver="pssi" name="d3"/>
         <signal device-pin="a|i|l" af="11" driver="sdmmc" instance="1" name="d1"/>
diff --git a/devices/stm32/stm32l0-10.xml b/devices/stm32/stm32l0-10.xml
index 87349fd0..4eb2f44b 100644
--- a/devices/stm32/stm32l0-10.xml
+++ b/devices/stm32/stm32l0-10.xml
@@ -55,7 +55,10 @@
       <feature value="oversampler"/>
       <feature value="prescaler"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1050">
         <wait-state ws="0" hclk-max="4200000"/>
@@ -71,10 +74,11 @@
     </driver>
     <driver name="i2c" type="stm32-extended">
       <feature value="dnf"/>
-      <feature value="fmp"/>
       <instance value="1"/>
     </driver>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
     </driver>
@@ -95,6 +99,7 @@
       <instance value="1"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
     </driver>
     <driver name="tim" type="stm32-general-purpose">
@@ -104,6 +109,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="2"/>
     </driver>
     <driver name="wwdg" type="stm32-v1.0"/>
diff --git a/devices/stm32/stm32l0-11_21.xml b/devices/stm32/stm32l0-11_21.xml
index 170c94f8..374ffa47 100644
--- a/devices/stm32/stm32l0-11_21.xml
+++ b/devices/stm32/stm32l0-11_21.xml
@@ -84,7 +84,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1050">
         <wait-state ws="0" hclk-max="4200000"/>
@@ -103,7 +106,9 @@
       <feature value="fmp"/>
       <instance value="1"/>
     </driver>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
     </driver>
@@ -118,6 +123,7 @@
       <instance value="1"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
     </driver>
     <driver name="tim" type="stm32-general-purpose">
@@ -126,6 +132,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="2"/>
     </driver>
     <driver name="wwdg" type="stm32-v1.0"/>
diff --git a/devices/stm32/stm32l0-31_41.xml b/devices/stm32/stm32l0-31_41.xml
index 157280b6..be2857fb 100644
--- a/devices/stm32/stm32l0-31_41.xml
+++ b/devices/stm32/stm32l0-31_41.xml
@@ -97,7 +97,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1050">
         <wait-state ws="0" hclk-max="4200000"/>
@@ -116,7 +119,9 @@
       <feature value="fmp"/>
       <instance value="1"/>
     </driver>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
     </driver>
@@ -131,6 +136,7 @@
       <instance value="1"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
     </driver>
     <driver name="tim" type="stm32-general-purpose">
@@ -140,6 +146,7 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="2"/>
     </driver>
     <driver name="wwdg" type="stm32-v1.0"/>
diff --git a/devices/stm32/stm32l0-51_52_53_62_63.xml b/devices/stm32/stm32l0-51_52_53_62_63.xml
index 7db51489..fa3a9002 100644
--- a/devices/stm32/stm32l0-51_52_53_62_63.xml
+++ b/devices/stm32/stm32l0-51_52_53_62_63.xml
@@ -140,7 +140,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver device-name="52|53|62|63" name="dac" type="stm32">
       <feature value="status"/>
     </driver>
@@ -166,7 +169,9 @@
     <driver device-pin="c|r" name="i2s" type="stm32-v3.1">
       <instance value="2"/>
     </driver>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver device-name="53|63" name="lcd" type="stm32-v1.3"/>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
@@ -184,6 +189,7 @@
       <instance device-pin="c|r" value="2"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
     </driver>
     <driver name="tim" type="stm32-basic">
@@ -197,6 +203,7 @@
     <driver device-name="52|53|62|63" name="tsc" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
diff --git a/devices/stm32/stm32l0-71_72_73_81_82_83.xml b/devices/stm32/stm32l0-71_72_73_81_82_83.xml
index 3fd06f4d..52ce28c2 100644
--- a/devices/stm32/stm32l0-71_72_73_81_82_83.xml
+++ b/devices/stm32/stm32l0-71_72_73_81_82_83.xml
@@ -234,7 +234,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver device-name="72|73|82|83" name="dac" type="stm32">
       <feature value="status"/>
     </driver>
@@ -261,7 +264,9 @@
     <driver device-pin="c|r|v" name="i2s" type="stm32-v3.1">
       <instance value="2"/>
     </driver>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver device-name="73|83" name="lcd" type="stm32-v1.3"/>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
@@ -279,6 +284,7 @@
       <instance device-pin="c|r|v" value="2"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
     </driver>
     <driver name="tim" type="stm32-basic">
@@ -294,6 +300,7 @@
     <driver device-name="72|73|82|83" name="tsc" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
       <feature value="over8"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="4"/>
diff --git a/devices/stm32/stm32l1-00.xml b/devices/stm32/stm32l1-00.xml
index 24d883fe..643e34e1 100644
--- a/devices/stm32/stm32l1-00.xml
+++ b/devices/stm32/stm32l1-00.xml
@@ -100,10 +100,10 @@
     </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1200">
-        <wait-state device-size="c" ws="0" hclk-max="2100000"/>
-        <wait-state device-size="6|8|b" ws="0" hclk-max="4200000"/>
-        <wait-state device-size="c" ws="1" hclk-max="4200000"/>
-        <wait-state device-size="6|8|b" ws="1" hclk-max="8000000"/>
+        <wait-state device-size="6|8|b" device-variant="" ws="0" hclk-max="2100000"/>
+        <wait-state device-size="6|8|b" device-variant="a" ws="0" hclk-max="4200000"/>
+        <wait-state device-size="c" device-variant="" ws="0" hclk-max="4200000"/>
+        <wait-state device-size="6|8|b" device-variant="" ws="1" hclk-max="4200000"/>
       </latency>
       <latency vcore-min="1500">
         <wait-state ws="0" hclk-max="8000000"/>
diff --git a/devices/stm32/stm32l1-51_52-6_8_b.xml b/devices/stm32/stm32l1-51_52-6_8_b.xml
index 6ecf5f63..d0d35cc4 100644
--- a/devices/stm32/stm32l1-51_52-6_8_b.xml
+++ b/devices/stm32/stm32l1-51_52-6_8_b.xml
@@ -156,8 +156,9 @@
     </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1200">
-        <wait-state ws="0" hclk-max="4200000"/>
-        <wait-state ws="1" hclk-max="8000000"/>
+        <wait-state device-variant="" ws="0" hclk-max="2100000"/>
+        <wait-state device-variant="a" ws="0" hclk-max="4200000"/>
+        <wait-state device-variant="" ws="1" hclk-max="4200000"/>
       </latency>
       <latency vcore-min="1500">
         <wait-state ws="0" hclk-max="8000000"/>
diff --git a/devices/stm32/stm32l1-51_52_62-c.xml b/devices/stm32/stm32l1-51_52_62-c.xml
index e36412dc..a5e76d7a 100644
--- a/devices/stm32/stm32l1-51_52_62-c.xml
+++ b/devices/stm32/stm32l1-51_52_62-c.xml
@@ -117,8 +117,7 @@
     </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1200">
-        <wait-state ws="0" hclk-max="2100000"/>
-        <wait-state ws="1" hclk-max="4200000"/>
+        <wait-state ws="0" hclk-max="4200000"/>
       </latency>
       <latency vcore-min="1500">
         <wait-state ws="0" hclk-max="8000000"/>
diff --git a/devices/stm32/stm32l1-51_52_62-c_d.xml b/devices/stm32/stm32l1-51_52_62-c_d.xml
index f843abd1..692c5bc4 100644
--- a/devices/stm32/stm32l1-51_52_62-c_d.xml
+++ b/devices/stm32/stm32l1-51_52_62-c_d.xml
@@ -119,8 +119,7 @@
     </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1200">
-        <wait-state ws="0" hclk-max="2100000"/>
-        <wait-state ws="1" hclk-max="4200000"/>
+        <wait-state ws="0" hclk-max="4200000"/>
       </latency>
       <latency vcore-min="1500">
         <wait-state ws="0" hclk-max="8000000"/>
diff --git a/devices/stm32/stm32l1-51_52_62-d_e.xml b/devices/stm32/stm32l1-51_52_62-d_e.xml
index 0fc591f2..3b54fd08 100644
--- a/devices/stm32/stm32l1-51_52_62-d_e.xml
+++ b/devices/stm32/stm32l1-51_52_62-d_e.xml
@@ -116,8 +116,7 @@
     </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1200">
-        <wait-state ws="0" hclk-max="2100000"/>
-        <wait-state ws="1" hclk-max="4200000"/>
+        <wait-state ws="0" hclk-max="4200000"/>
       </latency>
       <latency vcore-min="1500">
         <wait-state ws="0" hclk-max="8000000"/>
diff --git a/devices/stm32/stm32l4-12_22.xml b/devices/stm32/stm32l4-12_22.xml
index ed41c7aa..f7b13ebe 100644
--- a/devices/stm32/stm32l4-12_22.xml
+++ b/devices/stm32/stm32l4-12_22.xml
@@ -109,6 +109,7 @@
       <vector position="82" name="CRS"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -116,7 +117,10 @@
     <driver name="comp" type="stm32-tsmc90_orca128_cube">
       <instance value="1"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1000">
         <wait-state ws="0" hclk-max="6000000"/>
@@ -140,7 +144,9 @@
       <instance value="3"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
       <instance value="2"/>
@@ -165,7 +171,10 @@
       <instance device-pin="c|r" value="2"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -180,6 +189,7 @@
     </driver>
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance device-pin="c|r" value="3"/>
@@ -352,7 +362,7 @@
             <signal driver="usart" instance="1" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="tx"/>
+            <signal driver="lpuart" instance="1" name="tx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="rx"/>
@@ -366,7 +376,7 @@
             <signal driver="quadspi"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="rx"/>
+            <signal driver="lpuart" instance="1" name="rx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="tx"/>
diff --git a/devices/stm32/stm32l4-31_33_43.xml b/devices/stm32/stm32l4-31_33_43.xml
index 52f14669..554911d7 100644
--- a/devices/stm32/stm32l4-31_33_43.xml
+++ b/devices/stm32/stm32l4-31_33_43.xml
@@ -160,18 +160,22 @@
       <vector position="82" name="CRS"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver device-name="43" name="aes" type="stm32-v1.0"/>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
       <instance value="1"/>
     </driver>
     <driver name="comp" type="stm32-tsmc90_cube">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -199,7 +203,9 @@
       <instance value="3"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver device-name="33|43" name="lcd" type="stm32-v1.2"/>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
@@ -235,7 +241,10 @@
       <instance value="1"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -251,6 +260,7 @@
     </driver>
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance device-pin="c|r|v" value="3"/>
@@ -301,7 +311,7 @@
             <signal driver="tim" instance="16" name="up"/>
           </request>
           <request position="6">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="7">
@@ -319,7 +329,7 @@
             <signal driver="i2c" instance="2" name="tx"/>
           </request>
           <request position="5">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
             <signal driver="tim" instance="7" name="up"/>
           </request>
           <request position="7">
@@ -391,7 +401,7 @@
             <signal driver="spi" instance="3" name="rx"/>
           </request>
           <request position="4">
-            <signal driver="swpmi" name="rx"/>
+            <signal driver="swpmi" instance="1" name="rx"/>
           </request>
           <request device-name="43" position="6">
             <signal driver="aes" name="in"/>
@@ -405,7 +415,7 @@
             <signal driver="spi" instance="3" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="swpmi" name="tx"/>
+            <signal driver="swpmi" instance="1" name="tx"/>
           </request>
           <request device-name="43" position="6">
             <signal driver="aes" name="out"/>
@@ -424,7 +434,7 @@
         </channel>
         <channel position="4">
           <request position="3">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="4">
@@ -437,7 +447,7 @@
         </channel>
         <channel position="5">
           <request position="3">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
             <signal driver="tim" instance="7" name="up"/>
           </request>
           <request device-name="43" position="6">
@@ -456,7 +466,7 @@
             <signal driver="usart" instance="1" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="tx"/>
+            <signal driver="lpuart" instance="1" name="tx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="rx"/>
@@ -473,7 +483,7 @@
             <signal driver="quadspi"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="rx"/>
+            <signal driver="lpuart" instance="1" name="rx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="tx"/>
diff --git a/devices/stm32/stm32l4-32_42.xml b/devices/stm32/stm32l4-32_42.xml
index dbdf24dd..9da01c2e 100644
--- a/devices/stm32/stm32l4-32_42.xml
+++ b/devices/stm32/stm32l4-32_42.xml
@@ -76,18 +76,22 @@
       <vector position="82" name="CRS"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver device-name="42" name="aes" type="stm32-v1.0"/>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
       <instance value="1"/>
     </driver>
     <driver name="comp" type="stm32-tsmc90_cube">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -114,7 +118,9 @@
       <instance value="3"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
       <instance value="2"/>
@@ -145,7 +151,10 @@
       <instance value="1"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -161,6 +170,7 @@
     </driver>
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -204,7 +214,7 @@
             <signal driver="tim" instance="16" name="up"/>
           </request>
           <request position="6">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="7">
@@ -216,7 +226,7 @@
             <signal driver="usart" instance="1" name="tx"/>
           </request>
           <request position="5">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
             <signal driver="tim" instance="7" name="up"/>
           </request>
           <request position="7">
@@ -282,7 +292,7 @@
             <signal driver="spi" instance="3" name="rx"/>
           </request>
           <request position="4">
-            <signal driver="swpmi" name="rx"/>
+            <signal driver="swpmi" instance="1" name="rx"/>
           </request>
           <request device-name="42" position="6">
             <signal driver="aes" name="in"/>
@@ -296,7 +306,7 @@
             <signal driver="spi" instance="3" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="swpmi" name="tx"/>
+            <signal driver="swpmi" instance="1" name="tx"/>
           </request>
           <request device-name="42" position="6">
             <signal driver="aes" name="out"/>
@@ -315,7 +325,7 @@
         </channel>
         <channel position="4">
           <request position="3">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="4">
@@ -324,7 +334,7 @@
         </channel>
         <channel position="5">
           <request position="3">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
             <signal driver="tim" instance="7" name="up"/>
           </request>
           <request device-name="42" position="6">
@@ -339,7 +349,7 @@
             <signal driver="usart" instance="1" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="tx"/>
+            <signal driver="lpuart" instance="1" name="tx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="rx"/>
@@ -356,7 +366,7 @@
             <signal driver="quadspi"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="rx"/>
+            <signal driver="lpuart" instance="1" name="rx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="tx"/>
diff --git a/devices/stm32/stm32l4-51_71.xml b/devices/stm32/stm32l4-51_71.xml
index 6e36d3ba..dfed2898 100644
--- a/devices/stm32/stm32l4-51_71.xml
+++ b/devices/stm32/stm32l4-51_71.xml
@@ -51,9 +51,8 @@
       <attribute-cmsis-define device-name="71" value="STM32L471xx"/>
       <attribute-cmsis-header value="stm32l4xx"/>
       <memory device-size="c" name="flash" access="rx" start="0x8000000" size="262144"/>
-      <memory device-size="e" device-package="i|j|t|u|y" name="flash" access="rx" start="0x8000000" size="524288"/>
-      <memory device-size="g" device-package="j" name="flash" access="rx" start="0x8000000" size="524288"/>
-      <memory device-size="g" device-package="i|t" name="flash" access="rx" start="0x8000000" size="1048576"/>
+      <memory device-size="e" name="flash" access="rx" start="0x8000000" size="524288"/>
+      <memory device-size="g" name="flash" access="rx" start="0x8000000" size="1048576"/>
       <memory name="ccm" access="rw" start="0x10000000" size="32768"/>
       <memory device-name="71" name="sram1" access="rwx" start="0x20000000" size="98304"/>
       <memory device-name="51" name="sram1" access="rwx" start="0x20000000" size="131072"/>
@@ -143,12 +142,13 @@
       <vector device-name="51" position="84" name="I2C4_ER"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance device-name="71" value="2"/>
       <instance device-name="71" value="3"/>
     </driver>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
       <instance value="1"/>
     </driver>
     <driver device-name="71" name="comp" type="stm32-tsmc90_cube">
@@ -159,7 +159,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -192,7 +195,9 @@
       <instance device-name="51" value="4"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
       <instance value="2"/>
@@ -230,7 +235,10 @@
       <instance value="1"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -251,10 +259,12 @@
     </driver>
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="uart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-name="71" value="5"/>
     </driver>
     <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -324,7 +334,7 @@
             <signal driver="tim" instance="3" name="up"/>
           </request>
           <request position="6">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="7">
@@ -345,7 +355,7 @@
             <signal driver="i2c" instance="2" name="tx"/>
           </request>
           <request position="5">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
             <signal device-name="71" driver="tim" instance="7" name="up"/>
           </request>
           <request device-name="71" position="6">
@@ -455,7 +465,7 @@
             <signal driver="spi" instance="3" name="rx"/>
           </request>
           <request device-name="71" position="4">
-            <signal driver="swpmi" name="rx"/>
+            <signal driver="swpmi" instance="1" name="rx"/>
           </request>
           <request device-name="71" position="5">
             <signal driver="tim" instance="5" name="ch4"/>
@@ -481,7 +491,7 @@
             <signal driver="spi" instance="3" name="tx"/>
           </request>
           <request device-name="71" position="4">
-            <signal driver="swpmi" name="tx"/>
+            <signal driver="swpmi" instance="1" name="tx"/>
           </request>
           <request device-name="71" position="5">
             <signal driver="tim" instance="5" name="ch3"/>
@@ -515,7 +525,7 @@
             <signal driver="sai" instance="2" name="b"/>
           </request>
           <request position="3">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="4">
@@ -537,7 +547,7 @@
             <signal driver="uart" instance="4" name="rx"/>
           </request>
           <request position="3">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
             <signal device-name="71" driver="tim" instance="7" name="up"/>
           </request>
           <request device-name="71" position="5">
@@ -556,7 +566,7 @@
             <signal driver="usart" instance="1" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="tx"/>
+            <signal driver="lpuart" instance="1" name="tx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="rx"/>
@@ -576,7 +586,7 @@
             <signal driver="quadspi"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="rx"/>
+            <signal driver="lpuart" instance="1" name="rx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="tx"/>
diff --git a/devices/stm32/stm32l4-52_62.xml b/devices/stm32/stm32l4-52_62.xml
index 41343b16..dc1b4f67 100644
--- a/devices/stm32/stm32l4-52_62.xml
+++ b/devices/stm32/stm32l4-52_62.xml
@@ -131,18 +131,22 @@
       <vector position="84" name="I2C4_ER"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver device-name="62" name="aes" type="stm32-v1.1"/>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
       <instance value="1"/>
     </driver>
     <driver name="comp" type="stm32-tsmc90_orca512_cube">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -174,7 +178,9 @@
       <instance value="4"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
       <instance value="2"/>
@@ -209,7 +215,10 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -225,9 +234,11 @@
     </driver>
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="uart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="4"/>
     </driver>
     <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -285,7 +296,7 @@
             <signal driver="tim" instance="3" name="up"/>
           </request>
           <request position="6">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="7">
@@ -306,7 +317,7 @@
             <signal driver="i2c" instance="2" name="tx"/>
           </request>
           <request position="5">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
           </request>
           <request position="7">
             <signal driver="tim" instance="1" name="ch4"/>
@@ -426,7 +437,7 @@
         </channel>
         <channel position="4">
           <request position="3">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="4">
@@ -446,7 +457,7 @@
             <signal driver="uart" instance="4" name="rx"/>
           </request>
           <request position="3">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
           </request>
           <request device-name="62" position="6">
             <signal driver="aes" name="in"/>
@@ -468,7 +479,7 @@
             <signal driver="usart" instance="1" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="tx"/>
+            <signal driver="lpuart" instance="1" name="tx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="rx"/>
@@ -485,7 +496,7 @@
             <signal driver="quadspi"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="rx"/>
+            <signal driver="lpuart" instance="1" name="rx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="tx"/>
diff --git a/devices/stm32/stm32l4-75.xml b/devices/stm32/stm32l4-75.xml
index f4dfe419..1709bbe2 100644
--- a/devices/stm32/stm32l4-75.xml
+++ b/devices/stm32/stm32l4-75.xml
@@ -103,19 +103,23 @@
       <vector position="81" name="FPU"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
     </driver>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
       <instance value="1"/>
     </driver>
     <driver name="comp" type="stm32-tsmc90_cube">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -147,7 +151,9 @@
       <instance value="3"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
       <instance value="2"/>
@@ -184,7 +190,10 @@
       <instance value="1"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -205,10 +214,12 @@
     </driver>
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="uart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
     </driver>
     <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -279,7 +290,7 @@
             <signal driver="tim" instance="3" name="up"/>
           </request>
           <request position="6">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="7">
@@ -300,7 +311,7 @@
             <signal driver="i2c" instance="2" name="tx"/>
           </request>
           <request position="5">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
             <signal driver="tim" instance="7" name="up"/>
           </request>
           <request position="6">
@@ -407,7 +418,7 @@
             <signal driver="spi" instance="3" name="rx"/>
           </request>
           <request position="4">
-            <signal driver="swpmi" name="rx"/>
+            <signal driver="swpmi" instance="1" name="rx"/>
           </request>
           <request position="5">
             <signal driver="tim" instance="5" name="ch4"/>
@@ -430,7 +441,7 @@
             <signal driver="spi" instance="3" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="swpmi" name="tx"/>
+            <signal driver="swpmi" instance="1" name="tx"/>
           </request>
           <request position="5">
             <signal driver="tim" instance="5" name="ch3"/>
@@ -464,7 +475,7 @@
             <signal driver="sai" instance="2" name="b"/>
           </request>
           <request position="3">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="4">
@@ -486,7 +497,7 @@
             <signal driver="uart" instance="4" name="rx"/>
           </request>
           <request position="3">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
             <signal driver="tim" instance="7" name="up"/>
           </request>
           <request position="5">
@@ -505,7 +516,7 @@
             <signal driver="usart" instance="1" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="tx"/>
+            <signal driver="lpuart" instance="1" name="tx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="rx"/>
@@ -525,7 +536,7 @@
             <signal driver="quadspi"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="rx"/>
+            <signal driver="lpuart" instance="1" name="rx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="tx"/>
diff --git a/devices/stm32/stm32l4-76_86.xml b/devices/stm32/stm32l4-76_86.xml
index 3b5df4d7..92b3ff4a 100644
--- a/devices/stm32/stm32l4-76_86.xml
+++ b/devices/stm32/stm32l4-76_86.xml
@@ -55,11 +55,9 @@
       <attribute-cmsis-define device-name="76" value="STM32L476xx"/>
       <attribute-cmsis-define device-name="86" value="STM32L486xx"/>
       <attribute-cmsis-header value="stm32l4xx"/>
-      <memory device-pin="r|v" device-size="c" device-variant="" name="flash" access="rx" start="0x8000000" size="262144"/>
-      <memory device-pin="z" device-size="g" device-variant="p" name="flash" access="rx" start="0x8000000" size="262144"/>
+      <memory device-size="c" name="flash" access="rx" start="0x8000000" size="262144"/>
       <memory device-size="e" name="flash" access="rx" start="0x8000000" size="524288"/>
-      <memory device-pin="j|q|v" device-size="g" device-variant="|p" name="flash" access="rx" start="0x8000000" size="1048576"/>
-      <memory device-pin="m|r|z" device-size="g" device-variant="" name="flash" access="rx" start="0x8000000" size="1048576"/>
+      <memory device-size="g" name="flash" access="rx" start="0x8000000" size="1048576"/>
       <memory name="ccm" access="rw" start="0x10000000" size="32768"/>
       <memory name="sram1" access="rwx" start="0x20000000" size="98304"/>
       <vector position="0" name="WWDG"/>
@@ -146,20 +144,24 @@
       <vector position="81" name="FPU"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
     </driver>
     <driver device-name="86" name="aes" type="stm32-v1.0"/>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
       <instance value="1"/>
     </driver>
     <driver name="comp" type="stm32-tsmc90_cube">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -193,7 +195,9 @@
       <instance value="3"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lcd" type="stm32-v1.2"/>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
@@ -231,7 +235,10 @@
       <instance value="1"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -252,10 +259,12 @@
     </driver>
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="uart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
     </driver>
     <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -326,7 +335,7 @@
             <signal driver="tim" instance="3" name="up"/>
           </request>
           <request position="6">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="7">
@@ -347,7 +356,7 @@
             <signal driver="i2c" instance="2" name="tx"/>
           </request>
           <request position="5">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
             <signal driver="tim" instance="7" name="up"/>
           </request>
           <request position="6">
@@ -454,7 +463,7 @@
             <signal driver="spi" instance="3" name="rx"/>
           </request>
           <request position="4">
-            <signal driver="swpmi" name="rx"/>
+            <signal driver="swpmi" instance="1" name="rx"/>
           </request>
           <request position="5">
             <signal driver="tim" instance="5" name="ch4"/>
@@ -480,7 +489,7 @@
             <signal driver="spi" instance="3" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="swpmi" name="tx"/>
+            <signal driver="swpmi" instance="1" name="tx"/>
           </request>
           <request position="5">
             <signal driver="tim" instance="5" name="ch3"/>
@@ -520,7 +529,7 @@
             <signal driver="sai" instance="2" name="b"/>
           </request>
           <request position="3">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="4">
@@ -542,7 +551,7 @@
             <signal driver="uart" instance="4" name="rx"/>
           </request>
           <request position="3">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
             <signal driver="tim" instance="7" name="up"/>
           </request>
           <request position="5">
@@ -564,7 +573,7 @@
             <signal driver="usart" instance="1" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="tx"/>
+            <signal driver="lpuart" instance="1" name="tx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="rx"/>
@@ -584,7 +593,7 @@
             <signal driver="quadspi"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="rx"/>
+            <signal driver="lpuart" instance="1" name="rx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="tx"/>
diff --git a/devices/stm32/stm32l4-96_a6.xml b/devices/stm32/stm32l4-96_a6.xml
index 67a9c32e..f3c5c54d 100644
--- a/devices/stm32/stm32l4-96_a6.xml
+++ b/devices/stm32/stm32l4-96_a6.xml
@@ -69,9 +69,8 @@
       <attribute-cmsis-define device-name="96" value="STM32L496xx"/>
       <attribute-cmsis-define device-name="a6" value="STM32L4A6xx"/>
       <attribute-cmsis-header value="stm32l4xx"/>
-      <memory device-pin="q|r|v|z" device-size="e" name="flash" access="rx" start="0x8000000" size="524288"/>
-      <memory device-pin="q|r|v|w|z" device-size="g" name="flash" access="rx" start="0x8000000" size="1048576"/>
-      <memory device-pin="a" device-size="e|g" name="flash" access="rx" start="0x8000000" size="1048576"/>
+      <memory device-size="e" name="flash" access="rx" start="0x8000000" size="524288"/>
+      <memory device-size="g" name="flash" access="rx" start="0x8000000" size="1048576"/>
       <memory name="ccm" access="rw" start="0x10000000" size="65536"/>
       <memory name="sram1" access="rwx" start="0x20000000" size="262144"/>
       <vector position="0" name="WWDG"/>
@@ -168,6 +167,7 @@
       <vector position="90" name="DMA2D"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -182,7 +182,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -218,7 +221,9 @@
       <instance value="4"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lcd" type="stm32-v1.2"/>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
@@ -268,7 +273,10 @@
       <instance value="1"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -289,10 +297,12 @@
     </driver>
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="uart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
     </driver>
     <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -363,7 +373,7 @@
             <signal driver="tim" instance="3" name="up"/>
           </request>
           <request position="6">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="7">
@@ -384,7 +394,7 @@
             <signal driver="i2c" instance="2" name="tx"/>
           </request>
           <request position="5">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
             <signal driver="tim" instance="7" name="up"/>
           </request>
           <request position="6">
@@ -494,7 +504,7 @@
             <signal driver="spi" instance="3" name="rx"/>
           </request>
           <request position="4">
-            <signal driver="swpmi" name="rx"/>
+            <signal driver="swpmi" instance="1" name="rx"/>
           </request>
           <request position="5">
             <signal driver="tim" instance="5" name="ch4"/>
@@ -523,7 +533,7 @@
             <signal driver="spi" instance="3" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="swpmi" name="tx"/>
+            <signal driver="swpmi" instance="1" name="tx"/>
           </request>
           <request position="5">
             <signal driver="tim" instance="5" name="ch3"/>
@@ -563,7 +573,7 @@
             <signal driver="sai" instance="2" name="b"/>
           </request>
           <request position="3">
-            <signal driver="dac" name="ch1"/>
+            <signal driver="dac" instance="1" name="ch1"/>
             <signal driver="tim" instance="6" name="up"/>
           </request>
           <request position="4">
@@ -601,7 +611,7 @@
             <signal driver="uart" instance="4" name="rx"/>
           </request>
           <request position="3">
-            <signal driver="dac" name="ch2"/>
+            <signal driver="dac" instance="1" name="ch2"/>
             <signal driver="tim" instance="7" name="up"/>
           </request>
           <request position="4">
@@ -645,7 +655,7 @@
             <signal driver="usart" instance="1" name="tx"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="tx"/>
+            <signal driver="lpuart" instance="1" name="tx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="rx"/>
@@ -665,7 +675,7 @@
             <signal driver="quadspi"/>
           </request>
           <request position="4">
-            <signal driver="lpuart" name="rx"/>
+            <signal driver="lpuart" instance="1" name="rx"/>
           </request>
           <request position="5">
             <signal driver="i2c" instance="1" name="tx"/>
diff --git a/devices/stm32/stm32l4-p5.xml b/devices/stm32/stm32l4-p5.xml
index 5dd2d174..c35836cd 100644
--- a/devices/stm32/stm32l4-p5.xml
+++ b/devices/stm32/stm32l4-p5.xml
@@ -125,18 +125,22 @@
       <vector position="94" name="DMAMUX1_OVR"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
       <instance value="1"/>
     </driver>
     <driver name="comp" type="stm32-tsmc90_cube">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -157,7 +161,14 @@
         <wait-state ws="1" hclk-max="40000000"/>
         <wait-state ws="2" hclk-max="60000000"/>
         <wait-state ws="3" hclk-max="80000000"/>
-        <wait-state ws="4" hclk-max="120000000"/>
+      </latency>
+      <latency vcore-min="1280">
+        <wait-state ws="0" hclk-max="20000000"/>
+        <wait-state ws="1" hclk-max="40000000"/>
+        <wait-state ws="2" hclk-max="60000000"/>
+        <wait-state ws="3" hclk-max="80000000"/>
+        <wait-state ws="4" hclk-max="100000000"/>
+        <wait-state ws="5" hclk-max="120000000"/>
       </latency>
     </driver>
     <driver device-pin="a|q|v|z" name="fmc" type="stm32-v2.2"/>
@@ -171,7 +182,9 @@
       <instance value="4"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
       <instance value="2"/>
@@ -191,7 +204,7 @@
     </driver>
     <driver device-pin="a|q|r|v|z" name="pssi" type="stm32-v3.0"/>
     <driver name="rcc" type="stm32-v1.0">
-      <max-frequency value="80000000"/>
+      <max-frequency value="120000000"/>
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v2.9"/>
@@ -212,7 +225,10 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -234,11 +250,13 @@
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="a|q|v|z" value="5"/>
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32l4-q5.xml b/devices/stm32/stm32l4-q5.xml
index ae14349e..837f4050 100644
--- a/devices/stm32/stm32l4-q5.xml
+++ b/devices/stm32/stm32l4-q5.xml
@@ -121,19 +121,23 @@
       <vector position="94" name="DMAMUX1_OVR"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
     <driver name="aes" type="stm32-v1.0"/>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
       <instance value="1"/>
     </driver>
     <driver name="comp" type="stm32-tsmc90_cube">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -154,7 +158,14 @@
         <wait-state ws="1" hclk-max="40000000"/>
         <wait-state ws="2" hclk-max="60000000"/>
         <wait-state ws="3" hclk-max="80000000"/>
-        <wait-state ws="4" hclk-max="120000000"/>
+      </latency>
+      <latency vcore-min="1280">
+        <wait-state ws="0" hclk-max="20000000"/>
+        <wait-state ws="1" hclk-max="40000000"/>
+        <wait-state ws="2" hclk-max="60000000"/>
+        <wait-state ws="3" hclk-max="80000000"/>
+        <wait-state ws="4" hclk-max="100000000"/>
+        <wait-state ws="5" hclk-max="120000000"/>
       </latency>
     </driver>
     <driver device-pin="a|q|v|z" name="fmc" type="stm32-v2.2"/>
@@ -168,7 +179,9 @@
       <instance value="4"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
       <instance value="2"/>
@@ -189,7 +202,7 @@
     <driver name="pka" type="stm32-v1.0"/>
     <driver device-pin="a|q|r|v|z" name="pssi" type="stm32-v3.0"/>
     <driver name="rcc" type="stm32-v1.0">
-      <max-frequency value="80000000"/>
+      <max-frequency value="120000000"/>
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v2.9"/>
@@ -210,7 +223,10 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -232,12 +248,14 @@
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="a|q|v|z" device-variant="|p" value="5"/>
       <instance device-pin="r" device-variant="" value="5"/>
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32l4-r5_r7_r9.xml b/devices/stm32/stm32l4-r5_r7_r9.xml
index 56d5b072..0d4bf363 100644
--- a/devices/stm32/stm32l4-r5_r7_r9.xml
+++ b/devices/stm32/stm32l4-r5_r7_r9.xml
@@ -133,17 +133,21 @@
       <vector position="94" name="DMAMUX1_OVR"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
       <instance value="1"/>
     </driver>
     <driver name="comp" type="stm32-tsmc90_cube">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -165,7 +169,14 @@
         <wait-state ws="1" hclk-max="40000000"/>
         <wait-state ws="2" hclk-max="60000000"/>
         <wait-state ws="3" hclk-max="80000000"/>
-        <wait-state ws="4" hclk-max="120000000"/>
+      </latency>
+      <latency vcore-min="1280">
+        <wait-state ws="0" hclk-max="20000000"/>
+        <wait-state ws="1" hclk-max="40000000"/>
+        <wait-state ws="2" hclk-max="60000000"/>
+        <wait-state ws="3" hclk-max="80000000"/>
+        <wait-state ws="4" hclk-max="100000000"/>
+        <wait-state ws="5" hclk-max="120000000"/>
       </latency>
     </driver>
     <driver name="fmc" type="stm32-v2.1"/>
@@ -179,7 +190,9 @@
       <instance value="4"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
       <instance value="2"/>
@@ -198,7 +211,7 @@
       <instance value="2"/>
     </driver>
     <driver name="rcc" type="stm32-v1.0">
-      <max-frequency value="80000000"/>
+      <max-frequency value="120000000"/>
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v2.4"/>
@@ -218,7 +231,10 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -240,11 +256,13 @@
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32l4-s5_s7_s9.xml b/devices/stm32/stm32l4-s5_s7_s9.xml
index 2ceb11e4..e7c2dfb3 100644
--- a/devices/stm32/stm32l4-s5_s7_s9.xml
+++ b/devices/stm32/stm32l4-s5_s7_s9.xml
@@ -124,18 +124,22 @@
       <vector position="94" name="DMAMUX1_OVR"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver name="aes" type="stm32-v1.0"/>
     <driver name="can" type="stm32">
-      <feature value="filter-28"/>
+      <feature value="filter-14"/>
       <instance value="1"/>
     </driver>
     <driver name="comp" type="stm32-tsmc90_cube">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -157,7 +161,14 @@
         <wait-state ws="1" hclk-max="40000000"/>
         <wait-state ws="2" hclk-max="60000000"/>
         <wait-state ws="3" hclk-max="80000000"/>
-        <wait-state ws="4" hclk-max="120000000"/>
+      </latency>
+      <latency vcore-min="1280">
+        <wait-state ws="0" hclk-max="20000000"/>
+        <wait-state ws="1" hclk-max="40000000"/>
+        <wait-state ws="2" hclk-max="60000000"/>
+        <wait-state ws="3" hclk-max="80000000"/>
+        <wait-state ws="4" hclk-max="100000000"/>
+        <wait-state ws="5" hclk-max="120000000"/>
       </latency>
     </driver>
     <driver name="fmc" type="stm32-v2.1"/>
@@ -172,7 +183,9 @@
       <instance value="4"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v1.0">
       <instance value="1"/>
       <instance value="2"/>
@@ -191,7 +204,7 @@
       <instance value="2"/>
     </driver>
     <driver name="rcc" type="stm32-v1.0">
-      <max-frequency value="80000000"/>
+      <max-frequency value="120000000"/>
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v2.4"/>
@@ -211,7 +224,10 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -233,11 +249,13 @@
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance value="5"/>
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32l5-52_62.xml b/devices/stm32/stm32l5-52_62.xml
index a7aa7032..4f304dc0 100644
--- a/devices/stm32/stm32l5-52_62.xml
+++ b/devices/stm32/stm32l5-52_62.xml
@@ -167,6 +167,7 @@
       <vector device-name="62" position="108" name="OTFDEC1"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -207,7 +208,8 @@
         <wait-state ws="1" hclk-max="40000000"/>
         <wait-state ws="2" hclk-max="60000000"/>
         <wait-state ws="3" hclk-max="80000000"/>
-        <wait-state ws="4" hclk-max="110000000"/>
+        <wait-state ws="4" hclk-max="100000000"/>
+        <wait-state ws="5" hclk-max="110000000"/>
       </latency>
     </driver>
     <driver device-pin="q|v|z" name="fmc" type="stm32-v2.2"/>
@@ -278,8 +280,6 @@
     </driver>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
-      <feature value="exti"/>
-      <feature value="imr"/>
       <feature value="sram2-wp"/>
     </driver>
     <driver name="sys_s" type="stm32-v1.0"/>
@@ -304,6 +304,7 @@
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="uart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="4"/>
       <instance device-pin="m|q|r|v|z" value="5"/>
     </driver>
@@ -312,12 +313,12 @@
     </driver>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
     </driver>
     <driver name="usb" type="stm32-v2.2"/>
-    <driver name="usbpd" type="stm32-v1.4"/>
     <driver name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="dma" type="stm32-mux">
diff --git a/devices/stm32/stm32u0-31.xml b/devices/stm32/stm32u0-31.xml
index e7fa0eea..c73f92c5 100644
--- a/devices/stm32/stm32u0-31.xml
+++ b/devices/stm32/stm32u0-31.xml
@@ -59,13 +59,19 @@
       <vector position="30" name="USART4"/>
       <vector position="31" name="RNG"/>
     </driver>
-    <driver name="adc" type="stm32-u0">
+    <driver name="adc" type="stm32-g0">
+      <feature value="calfact"/>
+      <feature value="oversampler"/>
+      <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver name="comp" type="stm32-tsmc90_u0_cube">
       <instance value="1"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -75,7 +81,7 @@
       <latency vcore-min="1000">
         <wait-state ws="0" hclk-max="8000000"/>
         <wait-state ws="1" hclk-max="16000000"/>
-        <wait-state ws="2" hclk-max="16000000"/>
+        <wait-state ws="2" hclk-max="18000000"/>
       </latency>
       <latency vcore-min="1200">
         <wait-state ws="0" hclk-max="24000000"/>
@@ -83,13 +89,17 @@
         <wait-state ws="2" hclk-max="56000000"/>
       </latency>
     </driver>
-    <driver name="i2c" type="stm32-v1.1">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v2.3">
       <instance value="1"/>
       <instance value="2"/>
@@ -116,7 +126,6 @@
     </driver>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
-      <feature value="exti"/>
       <feature value="itline"/>
     </driver>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -136,6 +145,7 @@
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -158,10 +168,10 @@
           <signal driver="dma" name="generator3"/>
         </request>
         <request position="5">
-          <signal driver="adc"/>
+          <signal driver="adc" instance="1"/>
         </request>
         <request position="8">
-          <signal driver="dac" name="ch1"/>
+          <signal driver="dac" instance="1" name="ch1"/>
         </request>
         <request position="9">
           <signal driver="i2c" instance="1" name="rx"/>
@@ -352,8 +362,7 @@
         <signal driver="opamp" instance="1" name="vinp"/>
         <signal driver="pwr" name="wkup1"/>
         <signal driver="tamp" name="in2"/>
-        <signal device-pin="c|r" driver="tim" instance="2" name="ch1"/>
-        <signal device-pin="f|g|k" af="1" driver="tim" instance="2" name="ch1"/>
+        <signal af="1" driver="tim" instance="2" name="ch1"/>
         <signal af="7" driver="usart" instance="2" name="cts"/>
         <signal af="8" driver="usart" instance="4" name="tx"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
@@ -441,36 +450,22 @@
       </gpio>
       <gpio port="a" pin="9">
         <signal driver="comp" instance="1" name="inp"/>
-        <signal device-pin="f" driver="i2c" instance="1" name="scl"/>
-        <signal device-pin="f" driver="i2c" instance="2" name="scl"/>
-        <signal device-pin="f" driver="rcc" name="mco"/>
-        <signal device-pin="f" driver="tim" instance="1" name="ch2"/>
-        <signal device-pin="f" driver="tim" instance="15" name="bkin"/>
-        <signal device-pin="f" driver="tsc" name="g7_io2"/>
-        <signal device-pin="f" driver="usart" instance="1" name="tx"/>
-        <signal device-pin="c|g|k|r" af="0" driver="rcc" name="mco"/>
-        <signal device-pin="c|g|k|r" af="1" driver="tim" instance="1" name="ch2"/>
-        <signal device-pin="c|g|k|r" af="4" driver="i2c" instance="1" name="scl"/>
-        <signal device-pin="c|g|k|r" af="5" driver="i2c" instance="2" name="scl"/>
-        <signal device-pin="c|g|k|r" af="7" driver="usart" instance="1" name="tx"/>
-        <signal device-pin="c|g|k|r" af="9" driver="tsc" name="g7_io2"/>
-        <signal device-pin="c|g|k|r" af="14" driver="tim" instance="15" name="bkin"/>
+        <signal af="0" driver="rcc" name="mco"/>
+        <signal af="1" driver="tim" instance="1" name="ch2"/>
+        <signal af="4" driver="i2c" instance="1" name="scl"/>
+        <signal af="5" driver="i2c" instance="2" name="scl"/>
+        <signal af="7" driver="usart" instance="1" name="tx"/>
+        <signal af="9" driver="tsc" name="g7_io2"/>
+        <signal af="14" driver="tim" instance="15" name="bkin"/>
       </gpio>
       <gpio port="a" pin="10">
-        <signal device-pin="f" driver="i2c" instance="1" name="sda"/>
-        <signal device-pin="f" driver="i2c" instance="2" name="sda"/>
-        <signal device-pin="f" driver="rcc" name="mco2"/>
-        <signal device-pin="f" driver="spi" instance="2" name="nss"/>
-        <signal device-pin="f" driver="tim" instance="1" name="ch3"/>
-        <signal device-pin="f" driver="tsc" name="g7_io3"/>
-        <signal device-pin="f" driver="usart" instance="1" name="rx"/>
-        <signal device-pin="c|g|k|r" af="1" driver="tim" instance="1" name="ch3"/>
-        <signal device-pin="c|g|k|r" af="3" driver="rcc" name="mco2"/>
-        <signal device-pin="c|g|k|r" af="4" driver="i2c" instance="1" name="sda"/>
-        <signal device-pin="c|g|k|r" af="5" driver="i2c" instance="2" name="sda"/>
-        <signal device-pin="c|g|k|r" af="6" driver="spi" instance="2" name="nss"/>
-        <signal device-pin="c|g|k|r" af="7" driver="usart" instance="1" name="rx"/>
-        <signal device-pin="c|g|k|r" af="9" driver="tsc" name="g7_io3"/>
+        <signal af="1" driver="tim" instance="1" name="ch3"/>
+        <signal af="3" driver="rcc" name="mco2"/>
+        <signal af="4" driver="i2c" instance="1" name="sda"/>
+        <signal af="5" driver="i2c" instance="2" name="sda"/>
+        <signal af="6" driver="spi" instance="2" name="nss"/>
+        <signal af="7" driver="usart" instance="1" name="rx"/>
+        <signal af="9" driver="tsc" name="g7_io3"/>
       </gpio>
       <gpio port="a" pin="11">
         <signal af="1" driver="tim" instance="1" name="ch4"/>
diff --git a/devices/stm32/stm32u0-73_83.xml b/devices/stm32/stm32u0-73_83.xml
index bdbe75fa..1718bf33 100644
--- a/devices/stm32/stm32u0-73_83.xml
+++ b/devices/stm32/stm32u0-73_83.xml
@@ -78,7 +78,10 @@
       <vector position="30" name="USART4_LPUART3"/>
       <vector position="31" name="RNG_CRYP"/>
     </driver>
-    <driver name="adc" type="stm32-u0">
+    <driver name="adc" type="stm32-g0">
+      <feature value="calfact"/>
+      <feature value="oversampler"/>
+      <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver device-name="83" name="aes" type="stm32-v1.0"/>
@@ -86,7 +89,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -96,7 +102,7 @@
       <latency vcore-min="1000">
         <wait-state ws="0" hclk-max="8000000"/>
         <wait-state ws="1" hclk-max="16000000"/>
-        <wait-state ws="2" hclk-max="16000000"/>
+        <wait-state ws="2" hclk-max="18000000"/>
       </latency>
       <latency vcore-min="1200">
         <wait-state ws="0" hclk-max="24000000"/>
@@ -104,14 +110,18 @@
         <wait-state ws="2" hclk-max="56000000"/>
       </latency>
     </driver>
-    <driver name="i2c" type="stm32-v1.1">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
       <instance value="4"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lcd" type="stm32-v1.5"/>
     <driver name="lptim" type="stm32-v2.3">
       <instance value="1"/>
@@ -142,7 +152,6 @@
     </driver>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
-      <feature value="exti"/>
       <feature value="itline"/>
     </driver>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -162,6 +171,7 @@
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -187,7 +197,7 @@
           <signal driver="dma" name="generator3"/>
         </request>
         <request position="5">
-          <signal driver="adc"/>
+          <signal driver="adc" instance="1"/>
         </request>
         <request device-name="83" position="6">
           <signal driver="aes" name="in"/>
@@ -196,7 +206,7 @@
           <signal driver="aes" name="out"/>
         </request>
         <request position="8">
-          <signal driver="dac" name="ch1"/>
+          <signal driver="dac" instance="1" name="ch1"/>
         </request>
         <request position="9">
           <signal driver="i2c" instance="1" name="rx"/>
@@ -430,8 +440,7 @@
         <signal driver="opamp" instance="1" name="vinp"/>
         <signal driver="pwr" name="wkup1"/>
         <signal driver="tamp" name="in2"/>
-        <signal device-pin="c|h|m|r" driver="tim" instance="2" name="ch1"/>
-        <signal device-pin="k" af="1" driver="tim" instance="2" name="ch1"/>
+        <signal af="1" driver="tim" instance="2" name="ch1"/>
         <signal af="7" driver="usart" instance="2" name="cts"/>
         <signal af="8" driver="usart" instance="4" name="tx"/>
         <signal af="11" driver="lcd" name="seg42"/>
diff --git a/devices/stm32/stm32u3-35_45.xml b/devices/stm32/stm32u3-35_45.xml
index 9d7a703f..9ecac1f0 100644
--- a/devices/stm32/stm32u3-35_45.xml
+++ b/devices/stm32/stm32u3-35_45.xml
@@ -135,7 +135,9 @@
       <vector position="123" name="PWR"/>
       <vector position="124" name="PWR_S"/>
     </driver>
-    <driver name="adc" type="stm32-u0">
+    <driver name="adc" type="stm32-u3">
+      <feature value="calfact"/>
+      <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver name="adf" type="stm32-v1.0">
@@ -146,7 +148,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -176,7 +181,9 @@
       <instance value="_s"/>
     </driver>
     <driver name="hash" type="stm32-v4.0"/>
-    <driver name="i2c" type="stm32-v1.1">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="3"/>
     </driver>
@@ -185,7 +192,9 @@
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v2.2">
       <instance value="1"/>
       <instance value="2"/>
@@ -214,7 +223,7 @@
       <instance value="2"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="exti"/>
+      <feature value="cfgr2"/>
     </driver>
     <driver name="sys_s" type="stm32-v1.2"/>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -256,7 +265,7 @@
         <signal af="1" driver="tim" instance="2" name="ch1"/>
         <signal af="6" driver="spi" instance="2" name="rdy"/>
         <signal af="8" driver="uart" instance="4" name="tx"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -426,7 +435,7 @@
         <signal af="9" driver="fdcan" instance="1" name="tx"/>
         <signal af="10" driver="octospi" instance="1" name="io1"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
       </gpio>
       <gpio port="b" pin="1">
         <signal driver="adc" instance="1" name="in14"/>
@@ -527,42 +536,19 @@
       </gpio>
       <gpio port="b" pin="7">
         <signal driver="comp" instance="2" name="inm"/>
-        <signal device-pin="k" device-package="u" driver="i2c" instance="1" name="sda"/>
-        <signal device-pin="k" device-package="u" driver="i3c" instance="1" name="sda"/>
-        <signal device-pin="k" device-package="u" driver="lptim" instance="1" name="in2"/>
-        <signal device-pin="k" device-package="u" driver="octospi" instance="1" name="io6"/>
         <signal driver="pwr" name="pvd_in"/>
         <signal driver="pwr" name="wkup4"/>
-        <signal device-pin="k" device-package="u" driver="tim" instance="17" name="ch1n"/>
-        <signal device-pin="k" device-package="u" driver="tim" instance="4" name="ch2"/>
-        <signal device-pin="k" device-package="u" driver="tsc" name="g2_io4"/>
-        <signal device-pin="k" device-package="u" driver="uart" instance="4" name="cts"/>
-        <signal device-pin="k" device-package="u" driver="usart" instance="1" name="rx"/>
-        <signal device-pin="c" device-package="t|u|y" af="1" driver="lptim" instance="1" name="in2"/>
-        <signal device-pin="k" device-package="y" af="1" driver="lptim" instance="1" name="in2"/>
-        <signal device-pin="r" device-package="i|t" af="1" driver="lptim" instance="1" name="in2"/>
-        <signal device-pin="c" device-package="t|u|y" af="2" driver="tim" instance="4" name="ch2"/>
-        <signal device-pin="k" device-package="y" af="2" driver="tim" instance="4" name="ch2"/>
-        <signal device-pin="r" device-package="i|t" af="2" driver="tim" instance="4" name="ch2"/>
-        <signal device-pin="c" device-package="t|u|y" af="4" driver="i2c" instance="1" name="sda"/>
-        <signal device-pin="k" device-package="y" af="4" driver="i2c" instance="1" name="sda"/>
-        <signal device-pin="r" device-package="i|t" af="4" driver="i2c" instance="1" name="sda"/>
-        <signal device-pin="c" device-package="t|u|y" af="5" driver="i3c" instance="1" name="sda"/>
-        <signal device-pin="k" device-package="y" af="5" driver="i3c" instance="1" name="sda"/>
-        <signal device-pin="r" device-package="i|t" af="5" driver="i3c" instance="1" name="sda"/>
-        <signal device-pin="c" device-package="t|u|y" af="7" driver="usart" instance="1" name="rx"/>
-        <signal device-pin="k" device-package="y" af="7" driver="usart" instance="1" name="rx"/>
-        <signal device-pin="r" device-package="i|t" af="7" driver="usart" instance="1" name="rx"/>
-        <signal device-pin="c" device-package="t|u|y" af="8" driver="uart" instance="4" name="cts"/>
-        <signal device-pin="k" device-package="y" af="8" driver="uart" instance="4" name="cts"/>
-        <signal device-pin="r" device-package="i|t" af="8" driver="uart" instance="4" name="cts"/>
-        <signal device-pin="c|r" af="9" driver="tsc" name="g2_io4"/>
-        <signal device-pin="c" device-package="t|u|y" af="10" driver="octospi" instance="1" name="io6"/>
-        <signal device-pin="k" device-package="y" af="10" driver="octospi" instance="1" name="io6"/>
-        <signal device-pin="r" device-package="i|t" af="10" driver="octospi" instance="1" name="io6"/>
-        <signal device-pin="c" device-package="t|u|y" af="14" driver="tim" instance="17" name="ch1n"/>
-        <signal device-pin="k" device-package="y" af="14" driver="tim" instance="17" name="ch1n"/>
-        <signal device-pin="r" device-package="i|t" af="14" driver="tim" instance="17" name="ch1n"/>
+        <signal af="1" driver="lptim" instance="1" name="in2"/>
+        <signal af="2" driver="tim" instance="4" name="ch2"/>
+        <signal af="4" driver="i2c" instance="1" name="sda"/>
+        <signal af="5" driver="i3c" instance="1" name="sda"/>
+        <signal af="7" driver="usart" instance="1" name="rx"/>
+        <signal af="8" driver="uart" instance="4" name="cts"/>
+        <signal device-pin="c" device-package="t|u|y" af="9" driver="tsc" name="g2_io4"/>
+        <signal device-pin="k" device-package="u" af="9" driver="tsc" name="g2_io4"/>
+        <signal device-pin="r" device-package="i|t" af="9" driver="tsc" name="g2_io4"/>
+        <signal af="10" driver="octospi" instance="1" name="io6"/>
+        <signal af="14" driver="tim" instance="17" name="ch1n"/>
       </gpio>
       <gpio device-pin="c" device-package="t|u" port="b" pin="8">
         <signal driver="pwr" name="wkup5"/>
diff --git a/devices/stm32/stm32u3-56_66.xml b/devices/stm32/stm32u3-56_66.xml
index e6032dc6..39d507b9 100644
--- a/devices/stm32/stm32u3-56_66.xml
+++ b/devices/stm32/stm32u3-56_66.xml
@@ -150,7 +150,9 @@
       <vector position="123" name="PWR"/>
       <vector position="124" name="PWR_S"/>
     </driver>
-    <driver name="adc" type="stm32-u0">
+    <driver name="adc" type="stm32-u3">
+      <feature value="calfact"/>
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -160,7 +162,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -187,7 +192,9 @@
       <instance value="_s"/>
     </driver>
     <driver name="hash" type="stm32-v4.0"/>
-    <driver name="i2c" type="stm32-v1.1">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="3"/>
     </driver>
@@ -196,7 +203,9 @@
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lcd" type="stm32-v1.6"/>
     <driver name="lptim" type="stm32-v2.2">
       <instance value="1"/>
@@ -232,7 +241,7 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="exti"/>
+      <feature value="cfgr2"/>
     </driver>
     <driver name="sys_s" type="stm32-v1.0"/>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -276,7 +285,7 @@
         <signal af="6" driver="spi" instance="3" name="rdy"/>
         <signal af="8" driver="uart" instance="4" name="tx"/>
         <signal af="11" driver="lcd" name="vlcd"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -464,7 +473,7 @@
         <signal af="10" driver="octospi" instance="1" name="io1"/>
         <signal af="11" driver="lcd" name="seg5"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
       </gpio>
       <gpio port="b" pin="1">
         <signal driver="adc" instance="1" name="in14"/>
diff --git a/devices/stm32/stm32u3-75_85.xml b/devices/stm32/stm32u3-75_85.xml
index 3488caf0..68fac217 100644
--- a/devices/stm32/stm32u3-75_85.xml
+++ b/devices/stm32/stm32u3-75_85.xml
@@ -161,7 +161,9 @@
       <vector position="123" name="PWR"/>
       <vector position="124" name="PWR_S"/>
     </driver>
-    <driver name="adc" type="stm32-u0">
+    <driver name="adc" type="stm32-u3">
+      <feature value="calfact"/>
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -174,7 +176,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -204,7 +209,9 @@
       <instance value="_s"/>
     </driver>
     <driver name="hash" type="stm32-v4.0"/>
-    <driver name="i2c" type="stm32-v1.1">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance device-pin="c|r|v" value="2"/>
       <instance value="3"/>
@@ -215,7 +222,9 @@
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v2.2">
       <instance value="1"/>
       <instance value="2"/>
@@ -254,7 +263,7 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="exti"/>
+      <feature value="cfgr2"/>
     </driver>
     <driver name="sys_s" type="stm32-v1.0"/>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -296,7 +305,7 @@
         <signal af="1" driver="tim" instance="2" name="ch1"/>
         <signal af="6" driver="spi" instance="3" name="rdy"/>
         <signal af="8" driver="uart" instance="4" name="tx"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -484,7 +493,7 @@
         <signal af="7" driver="usart" instance="3" name="ck"/>
         <signal af="10" driver="octospi" instance="1" name="io1"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
       </gpio>
       <gpio port="b" pin="1">
         <signal driver="adc" instance="1" name="in14"/>
diff --git a/devices/stm32/stm32u3-b5_c5-.xml b/devices/stm32/stm32u3-b5_c5-.xml
index e88a3c4f..5cd18d3f 100644
--- a/devices/stm32/stm32u3-b5_c5-.xml
+++ b/devices/stm32/stm32u3-b5_c5-.xml
@@ -147,7 +147,9 @@
       <vector position="123" name="PWR"/>
       <vector position="124" name="PWR_S"/>
     </driver>
-    <driver name="adc" type="stm32-u0">
+    <driver name="adc" type="stm32-u3">
+      <feature value="calfact"/>
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -160,7 +162,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -177,9 +182,10 @@
         <wait-state ws="2" hclk-max="48000000"/>
       </latency>
       <latency vcore-min="900">
-        <wait-state ws="0" hclk-max="32000000"/>
-        <wait-state ws="1" hclk-max="64000000"/>
-        <wait-state ws="2" hclk-max="96000000"/>
+        <wait-state ws="0" hclk-max="25000000"/>
+        <wait-state ws="1" hclk-max="50000000"/>
+        <wait-state ws="2" hclk-max="75000000"/>
+        <wait-state ws="3" hclk-max="96000000"/>
       </latency>
     </driver>
     <driver name="gpdma" type="stm32-stm32u3_dma3_cube">
@@ -192,8 +198,9 @@
     </driver>
     <driver name="hash" type="stm32-v4.0"/>
     <driver name="hsp1" type="stm32-v1.0"/>
-    <driver name="hsp_engine" type="stm32-v1.0"/>
-    <driver name="i2c" type="stm32-v1.1">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -205,7 +212,9 @@
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v2.2">
       <instance value="1"/>
       <instance value="2"/>
@@ -245,7 +254,7 @@
       <instance value="4"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="exti"/>
+      <feature value="cfgr2"/>
     </driver>
     <driver name="sys_s" type="stm32-v1.1"/>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -295,7 +304,7 @@
         <signal af="7" driver="usart" instance="2" name="nss"/>
         <signal af="8" driver="uart" instance="4" name="tx"/>
         <signal af="11" driver="hsp1" name="snp0"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -504,7 +513,7 @@
         <signal af="7" driver="usart" instance="3" name="ck"/>
         <signal af="10" driver="octospi" instance="1" name="io1"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
       </gpio>
       <gpio port="b" pin="1">
         <signal driver="adc" instance="1" name="in14"/>
diff --git a/devices/stm32/stm32u3-b5_c5-q.xml b/devices/stm32/stm32u3-b5_c5-q.xml
index 6a947570..fec6411b 100644
--- a/devices/stm32/stm32u3-b5_c5-q.xml
+++ b/devices/stm32/stm32u3-b5_c5-q.xml
@@ -156,7 +156,9 @@
       <vector position="123" name="PWR"/>
       <vector position="124" name="PWR_S"/>
     </driver>
-    <driver name="adc" type="stm32-u0">
+    <driver name="adc" type="stm32-u3">
+      <feature value="calfact"/>
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -169,7 +171,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
@@ -186,9 +191,10 @@
         <wait-state ws="2" hclk-max="48000000"/>
       </latency>
       <latency vcore-min="900">
-        <wait-state ws="0" hclk-max="32000000"/>
-        <wait-state ws="1" hclk-max="64000000"/>
-        <wait-state ws="2" hclk-max="96000000"/>
+        <wait-state ws="0" hclk-max="25000000"/>
+        <wait-state ws="1" hclk-max="50000000"/>
+        <wait-state ws="2" hclk-max="75000000"/>
+        <wait-state ws="3" hclk-max="96000000"/>
       </latency>
     </driver>
     <driver name="gpdma" type="stm32-stm32u3_dma3_cube">
@@ -201,8 +207,9 @@
     </driver>
     <driver name="hash" type="stm32-v4.0"/>
     <driver name="hsp1" type="stm32-v1.0"/>
-    <driver name="hsp_engine" type="stm32-v1.0"/>
-    <driver name="i2c" type="stm32-v1.1">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -214,7 +221,9 @@
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v2.2">
       <instance value="1"/>
       <instance value="2"/>
@@ -254,7 +263,7 @@
       <instance value="4"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="exti"/>
+      <feature value="cfgr2"/>
     </driver>
     <driver name="sys_s" type="stm32-v1.1"/>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -304,7 +313,7 @@
         <signal af="7" driver="usart" instance="2" name="nss"/>
         <signal af="8" driver="uart" instance="4" name="tx"/>
         <signal af="11" driver="hsp1" name="snp0"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -513,7 +522,7 @@
         <signal af="7" driver="usart" instance="3" name="ck"/>
         <signal af="10" driver="octospi" instance="1" name="io1"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
       </gpio>
       <gpio port="b" pin="1">
         <signal driver="adc" instance="1" name="in14"/>
diff --git a/devices/stm32/stm32u5-35_45.xml b/devices/stm32/stm32u5-35_45.xml
index aedea294..649f8a4e 100644
--- a/devices/stm32/stm32u5-35_45.xml
+++ b/devices/stm32/stm32u5-35_45.xml
@@ -185,7 +185,8 @@
       <vector position="124" name="FMAC"/>
       <vector position="125" name="LSECSSD"/>
     </driver>
-    <driver name="adc" type="stm32-h5">
+    <driver name="adc" type="stm32-u5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="4"/>
     </driver>
@@ -260,40 +261,6 @@
     <driver name="iwdg" type="stm32">
       <feature value="window"/>
     </driver>
-    <driver name="lpbam" type="stm32-stm32u5xx"/>
-    <driver name="lpbamadc" type="stm32-stm32u5xx">
-      <instance value="4"/>
-    </driver>
-    <driver name="lpbamcomp" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamdac" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbami2c" type="stm32-stm32u5xx">
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamlpdma" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamlpgpio" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamlptim" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamlpuart" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamopamp" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamqueue" type="stm32-stm32u5xx"/>
-    <driver name="lpbamspi" type="stm32-stm32u5xx">
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamvrefbuf" type="stm32-stm32u5xx"/>
     <driver name="lpdma" type="stm32-stm32u5_dma3_cube">
       <instance value="1"/>
     </driver>
@@ -341,7 +308,7 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="exti"/>
+      <feature value="cfgr2"/>
     </driver>
     <driver name="sys_s" type="stm32-v1.0"/>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -389,7 +356,7 @@
         <signal af="6" driver="spi" instance="3" name="rdy"/>
         <signal af="8" driver="uart" instance="4" name="tx"/>
         <signal af="10" driver="octospi" instance="1" name="ncs"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -575,7 +542,7 @@
         <signal af="7" driver="usart" instance="3" name="ck"/>
         <signal af="10" driver="octospi" instance="1" name="io1"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
       </gpio>
       <gpio port="b" pin="1">
         <signal driver="adc" instance="1" name="in16"/>
diff --git a/devices/stm32/stm32u5-75_85.xml b/devices/stm32/stm32u5-75_85.xml
index 063a718f..3db03648 100644
--- a/devices/stm32/stm32u5-75_85.xml
+++ b/devices/stm32/stm32u5-75_85.xml
@@ -209,7 +209,8 @@
       <vector position="124" name="FMAC"/>
       <vector position="125" name="LSECSSD"/>
     </driver>
-    <driver name="adc" type="stm32-h5">
+    <driver name="adc" type="stm32-u5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="4"/>
     </driver>
@@ -289,42 +290,6 @@
     <driver name="iwdg" type="stm32">
       <feature value="window"/>
     </driver>
-    <driver name="lpbam" type="stm32-stm32u5xx"/>
-    <driver name="lpbamadc" type="stm32-stm32u5xx">
-      <instance value="4"/>
-    </driver>
-    <driver name="lpbamcomp" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="2"/>
-    </driver>
-    <driver name="lpbamdac" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbami2c" type="stm32-stm32u5xx">
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamlpdma" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamlpgpio" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamlptim" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamlpuart" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamopamp" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="2"/>
-    </driver>
-    <driver name="lpbamqueue" type="stm32-stm32u5xx"/>
-    <driver name="lpbamspi" type="stm32-stm32u5xx">
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamvrefbuf" type="stm32-stm32u5xx"/>
     <driver name="lpdma" type="stm32-stm32u5_dma3_cube">
       <instance value="1"/>
     </driver>
@@ -380,7 +345,7 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="exti"/>
+      <feature value="cfgr2"/>
     </driver>
     <driver name="sys_s" type="stm32-v1.0"/>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -417,7 +382,6 @@
       <instance value="3"/>
     </driver>
     <driver name="usb_otg_fs" type="stm32-v3.0"/>
-    <driver name="usbpd" type="stm32-v1.0"/>
     <driver device-pin="a|o|q|v|z" name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="gpio" type="stm32">
@@ -435,7 +399,7 @@
         <signal af="8" driver="uart" instance="4" name="tx"/>
         <signal af="10" driver="octospim" name="p2_ncs"/>
         <signal device-pin="a|o|q|r|v|z" af="12" driver="sdmmc" instance="2" name="cmd"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -653,7 +617,7 @@
         <signal af="7" driver="usart" instance="3" name="ck"/>
         <signal af="10" driver="octospim" name="p1_io1"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
       </gpio>
       <gpio port="b" pin="1">
         <signal driver="adc" instance="1" name="in16"/>
diff --git a/devices/stm32/stm32u5-95_99_a5-.xml b/devices/stm32/stm32u5-95_99_a5-.xml
index 1758b98a..cd23fa72 100644
--- a/devices/stm32/stm32u5-95_99_a5-.xml
+++ b/devices/stm32/stm32u5-95_99_a5-.xml
@@ -180,7 +180,8 @@
       <vector device-name="99" position="137" name="DSI"/>
       <vector device-name="99" position="138" name="DCACHE2"/>
     </driver>
-    <driver name="adc" type="stm32-h5">
+    <driver name="adc" type="stm32-u5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="4"/>
@@ -256,52 +257,14 @@
       <instance value="2"/>
       <instance value="3"/>
       <instance value="4"/>
-    </driver>
-    <driver device-pin="a|q|v|z" name="i2c" type="stm32-v1.1">
-      <instance value="5"/>
-      <instance value="6"/>
+      <instance device-pin="a|q|v|z" value="5"/>
+      <instance device-pin="a|q|v|z" value="6"/>
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
     <driver name="irtim" type="stm32-v1.0"/>
     <driver name="iwdg" type="stm32">
       <feature value="window"/>
     </driver>
-    <driver name="lpbam" type="stm32-stm32u5xx"/>
-    <driver name="lpbamadc" type="stm32-stm32u5xx">
-      <instance value="4"/>
-    </driver>
-    <driver name="lpbamcomp" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="2"/>
-    </driver>
-    <driver name="lpbamdac" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbami2c" type="stm32-stm32u5xx">
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamlpdma" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamlpgpio" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamlptim" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamlpuart" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamopamp" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="2"/>
-    </driver>
-    <driver name="lpbamqueue" type="stm32-stm32u5xx"/>
-    <driver name="lpbamspi" type="stm32-stm32u5xx">
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamvrefbuf" type="stm32-stm32u5xx"/>
     <driver name="lpdma" type="stm32-stm32u5_dma3_cube">
       <instance value="1"/>
     </driver>
@@ -356,7 +319,7 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="exti"/>
+      <feature value="cfgr2"/>
     </driver>
     <driver name="sys_s" type="stm32-v1.0"/>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -394,7 +357,6 @@
       <instance value="6"/>
     </driver>
     <driver name="usb_otg_hs" type="stm32-v2.0"/>
-    <driver name="usbpd" type="stm32-v1.0"/>
     <driver device-pin="a|q|v|z" name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="gpio" type="stm32">
@@ -413,7 +375,7 @@
         <signal af="8" driver="uart" instance="4" name="tx"/>
         <signal af="10" driver="octospim" name="p2_ncs"/>
         <signal af="12" driver="sdmmc" instance="2" name="cmd"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -620,7 +582,7 @@
         <signal af="7" driver="usart" instance="3" name="ck"/>
         <signal af="10" driver="octospim" name="p1_io1"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
       </gpio>
       <gpio port="b" pin="1">
         <signal driver="adc" instance="1" name="in16"/>
diff --git a/devices/stm32/stm32u5-95_99_a5_a9-q.xml b/devices/stm32/stm32u5-95_99_a5_a9-q.xml
index 03c64c3f..fd2304b3 100644
--- a/devices/stm32/stm32u5-95_99_a5_a9-q.xml
+++ b/devices/stm32/stm32u5-95_99_a5_a9-q.xml
@@ -197,7 +197,8 @@
       <vector device-name="99|a9" position="137" name="DSI"/>
       <vector device-name="99|a9" position="138" name="DCACHE2"/>
     </driver>
-    <driver name="adc" type="stm32-h5">
+    <driver name="adc" type="stm32-u5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="4"/>
@@ -277,52 +278,14 @@
       <instance value="2"/>
       <instance value="3"/>
       <instance value="4"/>
-    </driver>
-    <driver device-pin="a|b|n|q|v|z" name="i2c" type="stm32-v1.1">
-      <instance value="5"/>
-      <instance value="6"/>
+      <instance device-pin="a|b|n|q|v|z" value="5"/>
+      <instance device-pin="a|b|n|q|v|z" value="6"/>
     </driver>
     <driver name="icache" type="stm32-v1.0"/>
     <driver name="irtim" type="stm32-v1.0"/>
     <driver name="iwdg" type="stm32">
       <feature value="window"/>
     </driver>
-    <driver name="lpbam" type="stm32-stm32u5xx"/>
-    <driver name="lpbamadc" type="stm32-stm32u5xx">
-      <instance value="4"/>
-    </driver>
-    <driver name="lpbamcomp" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="2"/>
-    </driver>
-    <driver name="lpbamdac" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbami2c" type="stm32-stm32u5xx">
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamlpdma" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamlpgpio" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamlptim" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamlpuart" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamopamp" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="2"/>
-    </driver>
-    <driver name="lpbamqueue" type="stm32-stm32u5xx"/>
-    <driver name="lpbamspi" type="stm32-stm32u5xx">
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamvrefbuf" type="stm32-stm32u5xx"/>
     <driver name="lpdma" type="stm32-stm32u5_dma3_cube">
       <instance value="1"/>
     </driver>
@@ -377,7 +340,7 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="exti"/>
+      <feature value="cfgr2"/>
     </driver>
     <driver name="sys_s" type="stm32-v1.0"/>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -415,7 +378,6 @@
       <instance value="6"/>
     </driver>
     <driver name="usb_otg_hs" type="stm32-v2.0"/>
-    <driver name="usbpd" type="stm32-v1.0"/>
     <driver device-pin="a|b|n|q|v|z" name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="gpio" type="stm32">
@@ -434,7 +396,7 @@
         <signal af="8" driver="uart" instance="4" name="tx"/>
         <signal af="10" driver="octospim" name="p2_ncs"/>
         <signal af="12" driver="sdmmc" instance="2" name="cmd"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -641,7 +603,7 @@
         <signal af="7" driver="usart" instance="3" name="ck"/>
         <signal af="10" driver="octospim" name="p1_io1"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
       </gpio>
       <gpio port="b" pin="1">
         <signal driver="adc" instance="1" name="in16"/>
diff --git a/devices/stm32/stm32u5-f7_f9_g7_g9-q.xml b/devices/stm32/stm32u5-f7_f9_g7_g9-q.xml
index 380f27ef..f9d56ec9 100644
--- a/devices/stm32/stm32u5-f7_f9_g7_g9-q.xml
+++ b/devices/stm32/stm32u5-f7_f9_g7_g9-q.xml
@@ -185,7 +185,8 @@
       <vector position="139" name="GFXTIM"/>
       <vector position="140" name="JPEG"/>
     </driver>
-    <driver name="adc" type="stm32-h5">
+    <driver name="adc" type="stm32-u5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="4"/>
@@ -202,8 +203,6 @@
     <driver name="crc" type="stm32">
       <feature value="polynomial"/>
       <feature value="reverse"/>
-      <instance value=""/>
-      <instance value=""/>
     </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
@@ -271,8 +270,6 @@
       <instance value="2"/>
       <instance value="3"/>
       <instance value="4"/>
-    </driver>
-    <driver name="i2c" type="stm32-v1.1">
       <instance value="5"/>
       <instance value="6"/>
     </driver>
@@ -282,42 +279,6 @@
       <feature value="window"/>
     </driver>
     <driver name="jpeg" type="stm32-v1.0"/>
-    <driver name="lpbam" type="stm32-stm32u5xx"/>
-    <driver name="lpbamadc" type="stm32-stm32u5xx">
-      <instance value="4"/>
-    </driver>
-    <driver name="lpbamcomp" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="2"/>
-    </driver>
-    <driver name="lpbamdac" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbami2c" type="stm32-stm32u5xx">
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamlpdma" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamlpgpio" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamlptim" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamlpuart" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamopamp" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="2"/>
-    </driver>
-    <driver name="lpbamqueue" type="stm32-stm32u5xx"/>
-    <driver name="lpbamspi" type="stm32-stm32u5xx">
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamvrefbuf" type="stm32-stm32u5xx"/>
     <driver name="lpdma" type="stm32-stm32u5_dma3_cube">
       <instance value="1"/>
     </driver>
@@ -376,7 +337,7 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="exti"/>
+      <feature value="cfgr2"/>
     </driver>
     <driver name="sys_s" type="stm32-v1.0"/>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -414,7 +375,6 @@
       <instance value="6"/>
     </driver>
     <driver name="usb_otg_hs" type="stm32-v2.0"/>
-    <driver name="usbpd" type="stm32-v1.0"/>
     <driver device-name="f7|g7" device-pin="v" name="vrefbuf" type="stm32-v1.0"/>
     <driver device-name="f9|g9" device-pin="b|n|z" name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
@@ -434,7 +394,7 @@
         <signal af="8" driver="uart" instance="4" name="tx"/>
         <signal af="10" driver="octospim" name="p2_ncs"/>
         <signal af="12" driver="sdmmc" instance="2" name="cmd"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -646,7 +606,7 @@
         <signal af="7" driver="usart" instance="3" name="ck"/>
         <signal af="10" driver="octospim" name="p1_io1"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
       </gpio>
       <gpio port="b" pin="1">
         <signal driver="adc" instance="1" name="in16"/>
diff --git a/devices/stm32/stm32u5-f7_g7-.xml b/devices/stm32/stm32u5-f7_g7-.xml
index 7457d99d..2b44b040 100644
--- a/devices/stm32/stm32u5-f7_g7-.xml
+++ b/devices/stm32/stm32u5-f7_g7-.xml
@@ -167,7 +167,8 @@
       <vector position="139" name="GFXTIM"/>
       <vector position="140" name="JPEG"/>
     </driver>
-    <driver name="adc" type="stm32-h5">
+    <driver name="adc" type="stm32-u5">
+      <feature value="prescaler"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="4"/>
@@ -184,8 +185,6 @@
     <driver name="crc" type="stm32">
       <feature value="polynomial"/>
       <feature value="reverse"/>
-      <instance value=""/>
-      <instance value=""/>
     </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
@@ -246,8 +245,6 @@
       <instance value="2"/>
       <instance value="3"/>
       <instance value="4"/>
-    </driver>
-    <driver name="i2c" type="stm32-v1.1">
       <instance value="5"/>
       <instance value="6"/>
     </driver>
@@ -257,42 +254,6 @@
       <feature value="window"/>
     </driver>
     <driver name="jpeg" type="stm32-v1.0"/>
-    <driver name="lpbam" type="stm32-stm32u5xx"/>
-    <driver name="lpbamadc" type="stm32-stm32u5xx">
-      <instance value="4"/>
-    </driver>
-    <driver name="lpbamcomp" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="2"/>
-    </driver>
-    <driver name="lpbamdac" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbami2c" type="stm32-stm32u5xx">
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamlpdma" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamlpgpio" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamlptim" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamlpuart" type="stm32-stm32u5xx">
-      <instance value="1"/>
-    </driver>
-    <driver name="lpbamopamp" type="stm32-stm32u5xx">
-      <instance value="1"/>
-      <instance value="2"/>
-    </driver>
-    <driver name="lpbamqueue" type="stm32-stm32u5xx"/>
-    <driver name="lpbamspi" type="stm32-stm32u5xx">
-      <instance value="3"/>
-    </driver>
-    <driver name="lpbamvrefbuf" type="stm32-stm32u5xx"/>
     <driver name="lpdma" type="stm32-stm32u5_dma3_cube">
       <instance value="1"/>
     </driver>
@@ -349,7 +310,7 @@
       <instance value="3"/>
     </driver>
     <driver name="sys" type="stm32">
-      <feature value="exti"/>
+      <feature value="cfgr2"/>
     </driver>
     <driver name="sys_s" type="stm32-v1.0"/>
     <driver name="tamp" type="stm32-v2.8"/>
@@ -387,7 +348,6 @@
       <instance value="6"/>
     </driver>
     <driver name="usb_otg_hs" type="stm32-v2.0"/>
-    <driver name="usbpd" type="stm32-v1.0"/>
     <driver name="vrefbuf" type="stm32-v1.0"/>
     <driver name="wwdg" type="stm32-v2.0"/>
     <driver name="gpio" type="stm32">
@@ -406,7 +366,7 @@
         <signal af="8" driver="uart" instance="4" name="tx"/>
         <signal af="10" driver="octospim" name="p2_ncs"/>
         <signal af="12" driver="sdmmc" instance="2" name="cmd"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -616,7 +576,7 @@
         <signal af="7" driver="usart" instance="3" name="ck"/>
         <signal af="10" driver="octospim" name="p1_io1"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" name="audioclk"/>
+        <signal af="13" driver="rcc" name="audioclk"/>
       </gpio>
       <gpio port="b" pin="1">
         <signal driver="adc" instance="1" name="in16"/>
diff --git a/devices/stm32/stm32wb-05.xml b/devices/stm32/stm32wb-05.xml
index 785f64a3..1bdfde5e 100644
--- a/devices/stm32/stm32wb-05.xml
+++ b/devices/stm32/stm32wb-05.xml
@@ -36,24 +36,18 @@
       <vector position="26" name="TIM16"/>
       <vector position="27" name="TIM17"/>
     </driver>
-    <driver name="adc" type="stm32-f3">
+    <driver name="adc" type="stm32-wb0">
       <instance value="1"/>
     </driver>
-    <driver name="adv_trace" type="stm32-v1.0"/>
-    <driver name="common_ble" type="stm32-v1.0"/>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="debug" type="stm32-v1.0"/>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="6000000"/>
-        <wait-state ws="1" hclk-max="12000000"/>
-        <wait-state ws="2" hclk-max="16000000"/>
-      </latency>
       <latency vcore-min="1200">
-        <wait-state ws="0" hclk-max="18000000"/>
-        <wait-state ws="1" hclk-max="36000000"/>
-        <wait-state ws="2" hclk-max="54000000"/>
-        <wait-state ws="3" hclk-max="64000000"/>
+        <wait-state ws="0" hclk-max="32000000"/>
+        <wait-state ws="1" hclk-max="64000000"/>
       </latency>
     </driver>
     <driver name="i2c" type="stm32-extended">
@@ -71,7 +65,6 @@
     <driver name="lpuart" type="stm32-v1.4">
       <instance value="1"/>
     </driver>
-    <driver name="misc" type="stm32-v1.0"/>
     <driver name="pka" type="stm32-v1.0"/>
     <driver name="pwr" type="stm32-v1.0"/>
     <driver name="radio" type="stm32-v1.0"/>
@@ -81,28 +74,21 @@
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v4.1"/>
-    <driver name="sequencer" type="stm32-v1.0"/>
     <driver name="spi" type="stm32">
       <feature value="data-size"/>
       <feature value="fifo"/>
       <feature value="nss-pulse"/>
       <instance value="3"/>
     </driver>
-    <driver name="stm32_ble" type="stm32-v1.0"/>
-    <driver name="sys" type="stm32">
-      <feature value="cfgr2"/>
-      <feature value="exti"/>
-      <feature value="imr"/>
-      <feature value="sram2-wp"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="tim" type="stm32-general-purpose">
       <instance value="2"/>
       <instance value="16"/>
       <instance value="17"/>
     </driver>
-    <driver name="tiny_lpm" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
     </driver>
     <driver name="dma" type="stm32-mux">
diff --git a/devices/stm32/stm32wb-06_07.xml b/devices/stm32/stm32wb-06_07.xml
index cf413ef1..9b345151 100644
--- a/devices/stm32/stm32wb-06_07.xml
+++ b/devices/stm32/stm32wb-06_07.xml
@@ -40,24 +40,18 @@
       <vector position="24" name="RADIO_TIMER_TXRX_WKUP"/>
       <vector position="25" name="RADIO_TXRX_SEQ"/>
     </driver>
-    <driver name="adc" type="stm32-f3">
+    <driver name="adc" type="stm32-wb0">
       <instance value="1"/>
     </driver>
-    <driver name="adv_trace" type="stm32-v1.0"/>
-    <driver name="common_ble" type="stm32-v1.0"/>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="debug" type="stm32-v1.0"/>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="6000000"/>
-        <wait-state ws="1" hclk-max="12000000"/>
-        <wait-state ws="2" hclk-max="16000000"/>
-      </latency>
       <latency vcore-min="1200">
-        <wait-state ws="0" hclk-max="18000000"/>
-        <wait-state ws="1" hclk-max="36000000"/>
-        <wait-state ws="2" hclk-max="54000000"/>
-        <wait-state ws="3" hclk-max="64000000"/>
+        <wait-state ws="0" hclk-max="32000000"/>
+        <wait-state ws="1" hclk-max="64000000"/>
       </latency>
     </driver>
     <driver name="i2c" type="stm32-extended">
@@ -76,7 +70,6 @@
     <driver name="lpuart" type="stm32-v1.4">
       <instance value="1"/>
     </driver>
-    <driver name="misc" type="stm32-v1.0"/>
     <driver name="pka" type="stm32-v1.0"/>
     <driver name="pwr" type="stm32-v1.0"/>
     <driver name="radio" type="stm32-v1.0"/>
@@ -86,7 +79,6 @@
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v4.1"/>
-    <driver name="sequencer" type="stm32-v1.0"/>
     <driver name="spi" type="stm32">
       <feature value="data-size"/>
       <feature value="fifo"/>
@@ -95,17 +87,10 @@
       <instance value="2"/>
       <instance value="3"/>
     </driver>
-    <driver name="stm32_ble" type="stm32-v1.0"/>
-    <driver name="sys" type="stm32">
-      <feature value="cfgr2"/>
-      <feature value="exti"/>
-      <feature value="imr"/>
-      <feature value="sram2-wp"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
     </driver>
-    <driver name="tiny_lpm" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
       <instance value="1"/>
diff --git a/devices/stm32/stm32wb-09.xml b/devices/stm32/stm32wb-09.xml
index 08e46005..7e0b0a39 100644
--- a/devices/stm32/stm32wb-09.xml
+++ b/devices/stm32/stm32wb-09.xml
@@ -39,24 +39,18 @@
       <vector position="27" name="TIM17"/>
       <vector position="28" name="RNG"/>
     </driver>
-    <driver name="adc" type="stm32-f3">
+    <driver name="adc" type="stm32-wb0">
       <instance value="1"/>
     </driver>
-    <driver name="adv_trace" type="stm32-v1.0"/>
-    <driver name="common_ble" type="stm32-v1.0"/>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="debug" type="stm32-v1.0"/>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="6000000"/>
-        <wait-state ws="1" hclk-max="12000000"/>
-        <wait-state ws="2" hclk-max="16000000"/>
-      </latency>
       <latency vcore-min="1200">
-        <wait-state ws="0" hclk-max="18000000"/>
-        <wait-state ws="1" hclk-max="36000000"/>
-        <wait-state ws="2" hclk-max="54000000"/>
-        <wait-state ws="3" hclk-max="64000000"/>
+        <wait-state ws="0" hclk-max="32000000"/>
+        <wait-state ws="1" hclk-max="64000000"/>
       </latency>
     </driver>
     <driver name="i2c" type="stm32-extended">
@@ -74,7 +68,6 @@
     <driver name="lpuart" type="stm32-v1.4">
       <instance value="1"/>
     </driver>
-    <driver name="misc" type="stm32-v1.0"/>
     <driver name="pka" type="stm32-v1.0"/>
     <driver name="pwr" type="stm32-v1.0"/>
     <driver name="radio" type="stm32-v1.0"/>
@@ -84,28 +77,21 @@
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v4.1"/>
-    <driver name="sequencer" type="stm32-v1.0"/>
     <driver name="spi" type="stm32">
       <feature value="data-size"/>
       <feature value="fifo"/>
       <feature value="nss-pulse"/>
       <instance value="3"/>
     </driver>
-    <driver name="stm32_ble" type="stm32-v1.0"/>
-    <driver name="sys" type="stm32">
-      <feature value="cfgr2"/>
-      <feature value="exti"/>
-      <feature value="imr"/>
-      <feature value="sram2-wp"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="tim" type="stm32-general-purpose">
       <instance value="2"/>
       <instance value="16"/>
       <instance value="17"/>
     </driver>
-    <driver name="tiny_lpm" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
     </driver>
     <driver name="dma" type="stm32-mux">
diff --git a/devices/stm32/stm32wb-10_15.xml b/devices/stm32/stm32wb-10_15.xml
index bb61d68e..0e8d485a 100644
--- a/devices/stm32/stm32wb-10_15.xml
+++ b/devices/stm32/stm32wb-10_15.xml
@@ -65,7 +65,9 @@
       <vector position="54" name="FPU"/>
       <vector position="62" name="DMAMUX1_OVR"/>
     </driver>
-    <driver name="adc" type="stm32-f3">
+    <driver name="adc" type="stm32-l0">
+      <feature value="calfact"/>
+      <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver name="aes" type="stm32-v1.0">
@@ -74,13 +76,11 @@
     <driver device-name="15" name="comp" type="stm32-tsmc90_dory_cube">
       <instance value="1"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="6000000"/>
-        <wait-state ws="1" hclk-max="12000000"/>
-        <wait-state ws="2" hclk-max="16000000"/>
-      </latency>
       <latency vcore-min="1200">
         <wait-state ws="0" hclk-max="18000000"/>
         <wait-state ws="1" hclk-max="36000000"/>
@@ -112,17 +112,16 @@
     <driver name="rf" type="stm32-v1.0"/>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v2.6"/>
-    <driver name="sequencer" type="stm32-v1.0"/>
     <driver name="spi" type="stm32">
       <feature value="data-size"/>
       <feature value="fifo"/>
       <feature value="nss-pulse"/>
       <instance value="1"/>
     </driver>
-    <driver name="stm32_wpan" type="stm32-v1.2"/>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
       <feature value="imr"/>
       <feature value="sram2-wp"/>
     </driver>
@@ -132,10 +131,10 @@
     <driver name="tim" type="stm32-general-purpose">
       <instance value="2"/>
     </driver>
-    <driver name="tiny_lpm" type="stm32-v1.0"/>
     <driver name="tsc" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
     </driver>
     <driver name="wwdg" type="stm32-v2.0"/>
diff --git a/devices/stm32/stm32wb-30_50.xml b/devices/stm32/stm32wb-30_50.xml
index 85b4479f..b50d2efc 100644
--- a/devices/stm32/stm32wb-30_50.xml
+++ b/devices/stm32/stm32wb-30_50.xml
@@ -60,12 +60,16 @@
       <vector position="62" name="DMAMUX1_OVR"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver name="aes" type="stm32-v1.0">
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1000">
         <wait-state ws="0" hclk-max="6000000"/>
@@ -101,17 +105,16 @@
     <driver name="rf" type="stm32-v1.0"/>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-rtc2_v2_wb_cube"/>
-    <driver name="sequencer" type="stm32-v1.0"/>
     <driver name="spi" type="stm32">
       <feature value="data-size"/>
       <feature value="fifo"/>
       <feature value="nss-pulse"/>
       <instance value="1"/>
     </driver>
-    <driver name="stm32_wpan" type="stm32-v1.2"/>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
       <feature value="imr"/>
       <feature value="sram2-wp"/>
     </driver>
@@ -123,9 +126,9 @@
       <instance value="16"/>
       <instance value="17"/>
     </driver>
-    <driver name="tiny_lpm" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
     </driver>
     <driver name="wwdg" type="stm32-v2.0"/>
diff --git a/devices/stm32/stm32wb-35_55.xml b/devices/stm32/stm32wb-35_55.xml
index 272f82ea..6fcb66df 100644
--- a/devices/stm32/stm32wb-35_55.xml
+++ b/devices/stm32/stm32wb-35_55.xml
@@ -107,6 +107,7 @@
       <vector position="62" name="DMAMUX1_OVR"/>
     </driver>
     <driver name="adc" type="stm32-f3">
+      <feature value="prescaler"/>
       <instance value="1"/>
     </driver>
     <driver name="aes" type="stm32-v1.0">
@@ -117,7 +118,10 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="flash" type="stm32-v1.0">
       <latency vcore-min="1000">
         <wait-state ws="0" hclk-max="6000000"/>
@@ -162,7 +166,6 @@
     <driver name="sai" type="stm32-v2.0">
       <instance value="1"/>
     </driver>
-    <driver name="sequencer" type="stm32-v1.0"/>
     <driver name="spi" type="stm32">
       <feature value="data-size"/>
       <feature value="fifo"/>
@@ -170,10 +173,10 @@
       <instance value="1"/>
       <instance device-pin="r|v" value="2"/>
     </driver>
-    <driver name="stm32_wpan" type="stm32-v1.2"/>
     <driver name="sys" type="stm32">
       <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="fpu"/>
       <feature value="imr"/>
       <feature value="sram2-wp"/>
     </driver>
@@ -185,10 +188,10 @@
       <instance value="16"/>
       <instance value="17"/>
     </driver>
-    <driver name="tiny_lpm" type="stm32-v1.0"/>
     <driver device-pin="r|v" name="tsc" type="stm32-v1.0"/>
     <driver name="usart" type="stm32-extended">
       <feature value="tcbgt"/>
+      <feature value="wakeup"/>
       <instance value="1"/>
     </driver>
     <driver name="usb" type="stm32-v2.1"/>
@@ -780,7 +783,7 @@
         <signal af="11" driver="lcd" name="seg29"/>
       </gpio>
       <gpio device-pin="v" port="d" pin="10">
-        <signal driver="sys" name="trig_inout"/>
+        <signal af="0" driver="sys" name="trig_inout"/>
         <signal af="9" driver="tsc" name="g6_io1"/>
         <signal af="11" driver="lcd" name="seg30"/>
       </gpio>
diff --git a/devices/stm32/stm32wl-30_31.xml b/devices/stm32/stm32wl-30_31.xml
index 581a8c0a..ba9e3026 100644
--- a/devices/stm32/stm32wl-30_31.xml
+++ b/devices/stm32/stm32wl-30_31.xml
@@ -42,28 +42,29 @@
       <vector position="28" name="LCSC"/>
       <vector position="29" name="LCSC_LC_ACTIVITY"/>
     </driver>
-    <driver name="adc" type="stm32">
+    <driver name="adc" type="stm32-wb0">
       <instance value="1"/>
     </driver>
     <driver name="aes" type="stm32-v1.0"/>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="debug" type="stm32-v1.0"/>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="6000000"/>
-        <wait-state ws="1" hclk-max="12000000"/>
-        <wait-state ws="2" hclk-max="16000000"/>
-      </latency>
       <latency vcore-min="1200">
-        <wait-state ws="0" hclk-max="18000000"/>
-        <wait-state ws="1" hclk-max="36000000"/>
-        <wait-state ws="2" hclk-max="48000000"/>
+        <wait-state ws="0" hclk-max="32000000"/>
+        <wait-state ws="1" hclk-max="64000000"/>
       </latency>
     </driver>
-    <driver device-name="31" name="i2c" type="stm32-v1.1">
+    <driver device-name="31" name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
     </driver>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lpuart" type="stm32-v1.3">
       <instance value="1"/>
     </driver>
@@ -76,23 +77,22 @@
     <driver name="rf" type="stm32-v1.1"/>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v3.0"/>
-    <driver name="sigfox" type="stm32-v1.0"/>
     <driver name="spi" type="stm32">
+      <feature value="data-size"/>
+      <feature value="fifo"/>
+      <feature value="nss-pulse"/>
       <instance device-pin="c" value="1"/>
       <instance value="3"/>
     </driver>
-    <driver name="sys" type="stm32">
-      <feature value="exti"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="tim" type="stm32-general-purpose">
       <instance value="2"/>
       <instance value="16"/>
     </driver>
-    <driver name="tiny_lpm" type="stm32-v1.0"/>
-    <driver name="usart" type="stm32">
+    <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
     </driver>
-    <driver name="wmbus" type="stm32-v1.0"/>
     <driver name="dma" type="stm32-mux">
       <instance value="1"/>
       <requests>
@@ -268,7 +268,6 @@
         <signal af="4" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio device-pin="c" port="a" pin="14">
-        <signal name="lcsc_lcb"/>
         <signal af="3" driver="spi" instance="1" name="miso"/>
       </gpio>
       <gpio device-pin="c" port="a" pin="15">
@@ -313,7 +312,6 @@
         <signal af="4" driver="tim" instance="2" name="ch4"/>
       </gpio>
       <gpio device-pin="c" port="b" pin="4">
-        <signal name="dac1_vcmbuff"/>
         <signal driver="adc" instance="1" name="vinm3"/>
         <signal driver="pwr" name="wkup4"/>
         <signal af="1" driver="lpuart" instance="1" name="tx"/>
diff --git a/devices/stm32/stm32wl-33.xml b/devices/stm32/stm32wl-33.xml
index eddf80d0..0d52eafa 100644
--- a/devices/stm32/stm32wl-33.xml
+++ b/devices/stm32/stm32wl-33.xml
@@ -41,39 +41,40 @@
       <vector position="28" name="LCSC"/>
       <vector position="29" name="LCSC_LC_ACTIVITY"/>
     </driver>
-    <driver name="adc" type="stm32">
+    <driver name="adc" type="stm32-wb0">
       <instance value="1"/>
     </driver>
     <driver name="aes" type="stm32-v1.0"/>
     <driver name="comp" type="stm32-tsmc90_wl3_cube">
       <instance value="1"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
       <instance value="1"/>
     </driver>
     <driver name="debug" type="stm32-v1.0"/>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="6000000"/>
-        <wait-state ws="1" hclk-max="12000000"/>
-        <wait-state ws="2" hclk-max="16000000"/>
-      </latency>
       <latency vcore-min="1200">
-        <wait-state ws="0" hclk-max="18000000"/>
-        <wait-state ws="1" hclk-max="36000000"/>
-        <wait-state ws="2" hclk-max="48000000"/>
+        <wait-state ws="0" hclk-max="32000000"/>
+        <wait-state ws="1" hclk-max="64000000"/>
       </latency>
     </driver>
-    <driver name="i2c" type="stm32-v1.1">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance device-pin="c" value="2"/>
     </driver>
     <driver name="i2s" type="stm32-v3.3">
       <instance value="3"/>
     </driver>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lcd" type="stm32-v1.3"/>
     <driver name="lcsc" type="stm32-v1.0"/>
     <driver name="lpawur" type="stm32-v1.0"/>
@@ -89,23 +90,22 @@
     <driver name="rf" type="stm32-v1.1"/>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v3.0"/>
-    <driver name="sigfox" type="stm32-v1.0"/>
     <driver name="spi" type="stm32">
+      <feature value="data-size"/>
+      <feature value="fifo"/>
+      <feature value="nss-pulse"/>
       <instance device-pin="c" value="1"/>
       <instance value="3"/>
     </driver>
-    <driver name="sys" type="stm32">
-      <feature value="exti"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="tim" type="stm32-general-purpose">
       <instance value="2"/>
       <instance value="16"/>
     </driver>
-    <driver name="tiny_lpm" type="stm32-v1.0"/>
-    <driver name="usart" type="stm32">
+    <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
     </driver>
-    <driver name="wmbus" type="stm32-v1.0"/>
     <driver name="dma" type="stm32-mux">
       <instance value="1"/>
       <requests>
@@ -182,7 +182,7 @@
           <signal driver="tim" instance="16" name="trg"/>
         </request>
         <request position="26">
-          <signal driver="dac" name="out1"/>
+          <signal driver="dac" instance="1" name="out1"/>
         </request>
       </requests>
       <mux-channels>
diff --git a/devices/stm32/stm32wl-3r.xml b/devices/stm32/stm32wl-3r.xml
index 10c50de4..218a0893 100644
--- a/devices/stm32/stm32wl-3r.xml
+++ b/devices/stm32/stm32wl-3r.xml
@@ -32,31 +32,32 @@
       <vector position="24" name="MRSUBG_WKUP"/>
       <vector position="26" name="TIM16"/>
     </driver>
-    <driver name="adc" type="stm32">
+    <driver name="adc" type="stm32-wb0">
       <instance value="1"/>
     </driver>
     <driver name="aes" type="stm32-v1.0"/>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="debug" type="stm32-v1.1"/>
     <driver name="flash" type="stm32-v1.0">
-      <latency vcore-min="1000">
-        <wait-state ws="0" hclk-max="6000000"/>
-        <wait-state ws="1" hclk-max="12000000"/>
-        <wait-state ws="2" hclk-max="16000000"/>
-      </latency>
       <latency vcore-min="1200">
-        <wait-state ws="0" hclk-max="18000000"/>
-        <wait-state ws="1" hclk-max="36000000"/>
-        <wait-state ws="2" hclk-max="48000000"/>
+        <wait-state ws="0" hclk-max="32000000"/>
+        <wait-state ws="1" hclk-max="64000000"/>
       </latency>
     </driver>
-    <driver name="i2c" type="stm32-v1.1">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
     </driver>
     <driver name="i2s" type="stm32-v3.3">
       <instance value="3"/>
     </driver>
-    <driver name="iwdg" type="stm32"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lpuart" type="stm32-v1.3">
       <instance value="1"/>
     </driver>
@@ -69,22 +70,21 @@
     <driver name="rf" type="stm32-v1.1"/>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v3.0"/>
-    <driver name="sigfox" type="stm32-v1.0"/>
     <driver name="spi" type="stm32">
+      <feature value="data-size"/>
+      <feature value="fifo"/>
+      <feature value="nss-pulse"/>
       <instance value="3"/>
     </driver>
-    <driver name="sys" type="stm32">
-      <feature value="exti"/>
-    </driver>
+    <driver name="sys" type="stm32"/>
     <driver name="tim" type="stm32-general-purpose">
       <instance value="2"/>
       <instance value="16"/>
     </driver>
-    <driver name="tiny_lpm" type="stm32-v1.0"/>
-    <driver name="usart" type="stm32">
+    <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
     </driver>
-    <driver name="wmbus" type="stm32-v1.0"/>
     <driver name="dma" type="stm32-mux">
       <instance value="1"/>
       <requests>
diff --git a/devices/stm32/stm32wl-54_55.xml b/devices/stm32/stm32wl-54_55.xml
index 7e488588..a6ff77f2 100644
--- a/devices/stm32/stm32wl-54_55.xml
+++ b/devices/stm32/stm32wl-54_55.xml
@@ -63,14 +63,20 @@
       <vector position="30" name="SUBGHZSPI"/>
       <vector position="31" name="SUBGHZ_Radio"/>
     </driver>
-    <driver name="adc" type="stm32"/>
-    <driver name="adv_trace" type="stm32-v1.1"/>
+    <driver name="adc" type="stm32-g0">
+      <feature value="calfact"/>
+      <feature value="oversampler"/>
+      <feature value="prescaler"/>
+    </driver>
     <driver name="aes" type="stm32-v1.0"/>
     <driver name="comp" type="stm32-tsmc90_wlxx_cube">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
     </driver>
@@ -92,7 +98,9 @@
       <instance value="_s"/>
     </driver>
     <driver name="hsem" type="stm32-v1.0"/>
-    <driver name="i2c" type="stm32-v1.1">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -102,9 +110,9 @@
     </driver>
     <driver name="ipcc" type="stm32-v1.0"/>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
-    <driver name="kms" type="stm32-v1.1"/>
-    <driver device-name="55" name="lorawan" type="stm32-v2.5"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v2.1">
       <instance value="1"/>
       <instance value="2"/>
@@ -113,7 +121,6 @@
     <driver name="lpuart" type="stm32-v1.3">
       <instance value="1"/>
     </driver>
-    <driver name="misc" type="stm32-v1.0"/>
     <driver name="pka" type="stm32-v1.0"/>
     <driver name="pwr" type="stm32-v1.0"/>
     <driver name="rcc" type="stm32-v1.0">
@@ -121,19 +128,19 @@
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v3.0"/>
-    <driver name="sequencer" type="stm32-v1.1">
-      <instance value="cortex-m0plus"/>
-      <instance value="cortex-m4"/>
-    </driver>
-    <driver name="sigfox" type="stm32-v1.8"/>
     <driver name="spi" type="stm32">
+      <feature value="data-size"/>
+      <feature value="fifo"/>
+      <feature value="nss-pulse"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
     <driver name="subghz" type="stm32-v1.0"/>
-    <driver name="subghz_phy" type="stm32-v1.3"/>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="imr"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="sysm0p" type="stm32-v1.0">
       <instance value="plus"/>
@@ -146,11 +153,8 @@
       <instance value="16"/>
       <instance value="17"/>
     </driver>
-    <driver name="tim" type="stm32-v1.1">
-      <instance value="er"/>
-    </driver>
-    <driver name="tiny_lpm" type="stm32-v1.1"/>
-    <driver name="usart" type="stm32">
+    <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -310,12 +314,11 @@
         <signal driver="rtc" name="tamp_in2"/>
         <signal af="1" driver="tim" instance="2" name="ch1"/>
         <signal af="4" driver="i2c" instance="3" name="smba"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="usart" instance="2" name="cts"/>
         <signal af="7" driver="usart" instance="2" name="nss"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" driver="debug" name="pwr"/>
-        <signal af="13" driver="debug" name="reglp1s"/>
+        <signal af="13" driver="debug" name="pwr_reglp1s"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -326,8 +329,7 @@
         <signal af="7" driver="usart" instance="2" name="de"/>
         <signal af="7" driver="usart" instance="2" name="rts"/>
         <signal af="8" driver="lpuart" instance="1" name="rts"/>
-        <signal af="13" driver="debug" name="pwr"/>
-        <signal af="13" driver="debug" name="reglp2s"/>
+        <signal af="13" driver="debug" name="pwr_reglp2s"/>
       </gpio>
       <gpio port="a" pin="2">
         <signal af="0" driver="rcc" name="lsco"/>
@@ -335,8 +337,7 @@
         <signal af="7" driver="usart" instance="2" name="tx"/>
         <signal af="8" driver="lpuart" instance="1" name="tx"/>
         <signal af="12" driver="comp" instance="2" name="out"/>
-        <signal af="13" driver="debug" name="ldordy"/>
-        <signal af="13" driver="debug" name="pwr"/>
+        <signal af="13" driver="debug" name="pwr_ldordy"/>
       </gpio>
       <gpio port="a" pin="3">
         <signal af="1" driver="tim" instance="2" name="ch4"/>
@@ -349,8 +350,7 @@
         <signal af="1" driver="lptim" instance="1" name="out"/>
         <signal af="5" driver="spi" instance="1" name="nss"/>
         <signal af="7" driver="usart" instance="2" name="ck"/>
-        <signal af="13" driver="debug" name="nssout"/>
-        <signal af="13" driver="debug" name="subghzspi"/>
+        <signal af="13" driver="debug" name="subghzspi_nssout"/>
         <signal af="14" driver="lptim" instance="2" name="out"/>
       </gpio>
       <gpio port="a" pin="5">
@@ -358,8 +358,7 @@
         <signal af="2" driver="tim" instance="2" name="etr"/>
         <signal af="3" driver="spi" instance="2" name="miso"/>
         <signal af="5" driver="spi" instance="1" name="sck"/>
-        <signal af="13" driver="debug" name="sckout"/>
-        <signal af="13" driver="debug" name="subghzspi"/>
+        <signal af="13" driver="debug" name="subghzspi_sckout"/>
         <signal af="14" driver="lptim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="6">
@@ -367,8 +366,7 @@
         <signal af="5" driver="spi" instance="1" name="miso"/>
         <signal af="8" driver="lpuart" instance="1" name="cts"/>
         <signal af="12" driver="tim" instance="1" name="bkin"/>
-        <signal af="13" driver="debug" name="misoout"/>
-        <signal af="13" driver="debug" name="subghzspi"/>
+        <signal af="13" driver="debug" name="subghzspi_misoout"/>
         <signal af="14" driver="tim" instance="16" name="ch1"/>
       </gpio>
       <gpio port="a" pin="7">
@@ -376,8 +374,7 @@
         <signal af="4" driver="i2c" instance="3" name="scl"/>
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="12" driver="comp" instance="2" name="out"/>
-        <signal af="13" driver="debug" name="mosiout"/>
-        <signal af="13" driver="debug" name="subghzspi"/>
+        <signal af="13" driver="debug" name="subghzspi_mosiout"/>
         <signal af="14" driver="tim" instance="17" name="ch1"/>
       </gpio>
       <gpio port="a" pin="8">
@@ -408,8 +405,7 @@
         <signal af="5" driver="i2s" instance="2" name="sd"/>
         <signal af="5" driver="spi" instance="2" name="mosi"/>
         <signal af="7" driver="usart" instance="1" name="rx"/>
-        <signal af="13" driver="debug" name="hse32rdy"/>
-        <signal af="13" driver="debug" name="rf"/>
+        <signal af="13" driver="debug" name="rf_hse32rdy"/>
         <signal af="14" driver="tim" instance="17" name="bkin"/>
       </gpio>
       <gpio port="a" pin="11">
@@ -423,8 +419,7 @@
         <signal af="7" driver="usart" instance="1" name="cts"/>
         <signal af="7" driver="usart" instance="1" name="nss"/>
         <signal af="12" driver="tim" instance="1" name="bkin2"/>
-        <signal af="13" driver="debug" name="nreset"/>
-        <signal af="13" driver="debug" name="rf"/>
+        <signal af="13" driver="debug" name="rf_nreset"/>
       </gpio>
       <gpio port="a" pin="12">
         <signal driver="adc" name="in8"/>
@@ -432,8 +427,7 @@
         <signal af="3" driver="lptim" instance="3" name="in1"/>
         <signal af="4" driver="i2c" instance="2" name="scl"/>
         <signal af="5" driver="spi" instance="1" name="mosi"/>
-        <signal af="6" driver="debug" name="busy"/>
-        <signal af="6" driver="debug" name="rf"/>
+        <signal af="6" driver="debug" name="rf_busy"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
       </gpio>
@@ -462,7 +456,7 @@
         <signal af="5" driver="spi" instance="1" name="nss"/>
       </gpio>
       <gpio port="b" pin="0">
-        <signal name="vddtcxo"/>
+        <signal driver="subghz" name="vddtcxo"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
       </gpio>
       <gpio device-pin="j" port="b" pin="1">
@@ -479,8 +473,7 @@
         <signal af="1" driver="lptim" instance="1" name="out"/>
         <signal af="4" driver="i2c" instance="3" name="smba"/>
         <signal af="5" driver="spi" instance="1" name="nss"/>
-        <signal af="13" driver="debug" name="rf"/>
-        <signal af="13" driver="debug" name="smpsrdy"/>
+        <signal af="13" driver="debug" name="rf_smpsrdy"/>
       </gpio>
       <gpio port="b" pin="3">
         <signal driver="adc" name="in2"/>
@@ -494,8 +487,7 @@
         <signal af="5" driver="spi" instance="1" name="sck"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
-        <signal af="13" driver="debug" name="dtb1"/>
-        <signal af="13" driver="debug" name="rf"/>
+        <signal af="13" driver="debug" name="rf_dtb1"/>
       </gpio>
       <gpio port="b" pin="4">
         <signal driver="adc" name="in3"/>
@@ -506,8 +498,7 @@
         <signal af="5" driver="spi" instance="1" name="miso"/>
         <signal af="7" driver="usart" instance="1" name="cts"/>
         <signal af="7" driver="usart" instance="1" name="nss"/>
-        <signal af="13" driver="debug" name="ldordy"/>
-        <signal af="13" driver="debug" name="rf"/>
+        <signal af="13" driver="debug" name="rf_ldordy"/>
         <signal af="14" driver="tim" instance="17" name="bkin"/>
       </gpio>
       <gpio port="b" pin="5">
diff --git a/devices/stm32/stm32wl-e4_e5.xml b/devices/stm32/stm32wl-e4_e5.xml
index 3b65835a..46eac0de 100644
--- a/devices/stm32/stm32wl-e4_e5.xml
+++ b/devices/stm32/stm32wl-e4_e5.xml
@@ -91,14 +91,20 @@
       <vector position="60" name="DMA2_Channel7"/>
       <vector position="61" name="DMAMUX1_OVR"/>
     </driver>
-    <driver name="adc" type="stm32"/>
-    <driver name="adv_trace" type="stm32-v1.1"/>
+    <driver name="adc" type="stm32-g0">
+      <feature value="calfact"/>
+      <feature value="oversampler"/>
+      <feature value="prescaler"/>
+    </driver>
     <driver name="aes" type="stm32-v1.0"/>
     <driver name="comp" type="stm32-tsmc90_wlxx_cube">
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="crc" type="stm32"/>
+    <driver name="crc" type="stm32">
+      <feature value="polynomial"/>
+      <feature value="reverse"/>
+    </driver>
     <driver name="dac" type="stm32">
       <feature value="status"/>
     </driver>
@@ -116,7 +122,9 @@
       </latency>
     </driver>
     <driver name="hsem" type="stm32-v1.0"/>
-    <driver name="i2c" type="stm32-v1.1">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
@@ -125,9 +133,9 @@
       <instance value="2"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
-    <driver name="iwdg" type="stm32"/>
-    <driver name="kms" type="stm32-v1.1"/>
-    <driver device-name="e5" name="lorawan" type="stm32-v2.5"/>
+    <driver name="iwdg" type="stm32">
+      <feature value="window"/>
+    </driver>
     <driver name="lptim" type="stm32-v2.1">
       <instance value="1"/>
       <instance value="2"/>
@@ -136,7 +144,6 @@
     <driver name="lpuart" type="stm32-v1.3">
       <instance value="1"/>
     </driver>
-    <driver name="misc" type="stm32-v1.0"/>
     <driver name="pka" type="stm32-v1.0"/>
     <driver name="pwr" type="stm32-v1.0"/>
     <driver name="rcc" type="stm32-v1.0">
@@ -144,16 +151,18 @@
     </driver>
     <driver name="rng" type="stm32"/>
     <driver name="rtc" type="stm32-v3.0"/>
-    <driver name="sequencer" type="stm32-v1.1"/>
-    <driver name="sigfox" type="stm32-v1.8"/>
     <driver name="spi" type="stm32">
+      <feature value="data-size"/>
+      <feature value="fifo"/>
+      <feature value="nss-pulse"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
     <driver name="subghz" type="stm32-v1.0"/>
-    <driver name="subghz_phy" type="stm32-v1.3"/>
     <driver name="sys" type="stm32">
+      <feature value="cfgr2"/>
       <feature value="exti"/>
+      <feature value="sram2-wp"/>
     </driver>
     <driver name="tim" type="stm32-advanced">
       <instance value="1"/>
@@ -163,11 +172,8 @@
       <instance value="16"/>
       <instance value="17"/>
     </driver>
-    <driver name="tim" type="stm32-v1.1">
-      <instance value="er"/>
-    </driver>
-    <driver name="tiny_lpm" type="stm32-v1.1"/>
-    <driver name="usart" type="stm32">
+    <driver name="usart" type="stm32-extended">
+      <feature value="wakeup"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
@@ -327,12 +333,11 @@
         <signal driver="rtc" name="tamp_in2"/>
         <signal af="1" driver="tim" instance="2" name="ch1"/>
         <signal af="4" driver="i2c" instance="3" name="smba"/>
-        <signal af="5" driver="i2s" name="ckin"/>
+        <signal af="5" driver="rcc" name="i2s_ckin"/>
         <signal af="7" driver="usart" instance="2" name="cts"/>
         <signal af="7" driver="usart" instance="2" name="nss"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
-        <signal af="13" driver="debug" name="pwr"/>
-        <signal af="13" driver="debug" name="reglp1s"/>
+        <signal af="13" driver="debug" name="pwr_reglp1s"/>
         <signal af="14" driver="tim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="1">
@@ -343,8 +348,7 @@
         <signal af="7" driver="usart" instance="2" name="de"/>
         <signal af="7" driver="usart" instance="2" name="rts"/>
         <signal af="8" driver="lpuart" instance="1" name="rts"/>
-        <signal af="13" driver="debug" name="pwr"/>
-        <signal af="13" driver="debug" name="reglp2s"/>
+        <signal af="13" driver="debug" name="pwr_reglp2s"/>
       </gpio>
       <gpio port="a" pin="2">
         <signal af="0" driver="rcc" name="lsco"/>
@@ -352,8 +356,7 @@
         <signal af="7" driver="usart" instance="2" name="tx"/>
         <signal af="8" driver="lpuart" instance="1" name="tx"/>
         <signal af="12" driver="comp" instance="2" name="out"/>
-        <signal af="13" driver="debug" name="ldordy"/>
-        <signal af="13" driver="debug" name="pwr"/>
+        <signal af="13" driver="debug" name="pwr_ldordy"/>
       </gpio>
       <gpio port="a" pin="3">
         <signal af="1" driver="tim" instance="2" name="ch4"/>
@@ -366,8 +369,7 @@
         <signal af="1" driver="lptim" instance="1" name="out"/>
         <signal af="5" driver="spi" instance="1" name="nss"/>
         <signal af="7" driver="usart" instance="2" name="ck"/>
-        <signal af="13" driver="debug" name="nssout"/>
-        <signal af="13" driver="debug" name="subghzspi"/>
+        <signal af="13" driver="debug" name="subghzspi_nssout"/>
         <signal af="14" driver="lptim" instance="2" name="out"/>
       </gpio>
       <gpio port="a" pin="5">
@@ -375,8 +377,7 @@
         <signal af="2" driver="tim" instance="2" name="etr"/>
         <signal af="3" driver="spi" instance="2" name="miso"/>
         <signal af="5" driver="spi" instance="1" name="sck"/>
-        <signal af="13" driver="debug" name="sckout"/>
-        <signal af="13" driver="debug" name="subghzspi"/>
+        <signal af="13" driver="debug" name="subghzspi_sckout"/>
         <signal af="14" driver="lptim" instance="2" name="etr"/>
       </gpio>
       <gpio port="a" pin="6">
@@ -384,8 +385,7 @@
         <signal af="5" driver="spi" instance="1" name="miso"/>
         <signal af="8" driver="lpuart" instance="1" name="cts"/>
         <signal af="12" driver="tim" instance="1" name="bkin"/>
-        <signal af="13" driver="debug" name="misoout"/>
-        <signal af="13" driver="debug" name="subghzspi"/>
+        <signal af="13" driver="debug" name="subghzspi_misoout"/>
         <signal af="14" driver="tim" instance="16" name="ch1"/>
       </gpio>
       <gpio port="a" pin="7">
@@ -393,8 +393,7 @@
         <signal af="4" driver="i2c" instance="3" name="scl"/>
         <signal af="5" driver="spi" instance="1" name="mosi"/>
         <signal af="12" driver="comp" instance="2" name="out"/>
-        <signal af="13" driver="debug" name="mosiout"/>
-        <signal af="13" driver="debug" name="subghzspi"/>
+        <signal af="13" driver="debug" name="subghzspi_mosiout"/>
         <signal af="14" driver="tim" instance="17" name="ch1"/>
       </gpio>
       <gpio port="a" pin="8">
@@ -425,8 +424,7 @@
         <signal af="5" driver="i2s" instance="2" name="sd"/>
         <signal af="5" driver="spi" instance="2" name="mosi"/>
         <signal af="7" driver="usart" instance="1" name="rx"/>
-        <signal af="13" driver="debug" name="hse32rdy"/>
-        <signal af="13" driver="debug" name="rf"/>
+        <signal af="13" driver="debug" name="rf_hse32rdy"/>
         <signal af="14" driver="tim" instance="17" name="bkin"/>
       </gpio>
       <gpio port="a" pin="11">
@@ -440,8 +438,7 @@
         <signal af="7" driver="usart" instance="1" name="cts"/>
         <signal af="7" driver="usart" instance="1" name="nss"/>
         <signal af="12" driver="tim" instance="1" name="bkin2"/>
-        <signal af="13" driver="debug" name="nreset"/>
-        <signal af="13" driver="debug" name="rf"/>
+        <signal af="13" driver="debug" name="rf_nreset"/>
       </gpio>
       <gpio port="a" pin="12">
         <signal driver="adc" name="in8"/>
@@ -449,8 +446,7 @@
         <signal af="3" driver="lptim" instance="3" name="in1"/>
         <signal af="4" driver="i2c" instance="2" name="scl"/>
         <signal af="5" driver="spi" instance="1" name="mosi"/>
-        <signal af="6" driver="debug" name="busy"/>
-        <signal af="6" driver="debug" name="rf"/>
+        <signal af="6" driver="debug" name="rf_busy"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
       </gpio>
@@ -479,7 +475,7 @@
         <signal af="5" driver="spi" instance="1" name="nss"/>
       </gpio>
       <gpio port="b" pin="0">
-        <signal name="vddtcxo"/>
+        <signal driver="subghz" name="vddtcxo"/>
         <signal af="12" driver="comp" instance="1" name="out"/>
       </gpio>
       <gpio device-pin="j" port="b" pin="1">
@@ -496,8 +492,7 @@
         <signal af="1" driver="lptim" instance="1" name="out"/>
         <signal af="4" driver="i2c" instance="3" name="smba"/>
         <signal af="5" driver="spi" instance="1" name="nss"/>
-        <signal af="13" driver="debug" name="rf"/>
-        <signal af="13" driver="debug" name="smpsrdy"/>
+        <signal af="13" driver="debug" name="rf_smpsrdy"/>
       </gpio>
       <gpio port="b" pin="3">
         <signal driver="adc" name="in2"/>
@@ -511,8 +506,7 @@
         <signal af="5" driver="spi" instance="1" name="sck"/>
         <signal af="7" driver="usart" instance="1" name="de"/>
         <signal af="7" driver="usart" instance="1" name="rts"/>
-        <signal af="13" driver="debug" name="dtb1"/>
-        <signal af="13" driver="debug" name="rf"/>
+        <signal af="13" driver="debug" name="rf_dtb1"/>
       </gpio>
       <gpio port="b" pin="4">
         <signal driver="adc" name="in3"/>
@@ -523,8 +517,7 @@
         <signal af="5" driver="spi" instance="1" name="miso"/>
         <signal af="7" driver="usart" instance="1" name="cts"/>
         <signal af="7" driver="usart" instance="1" name="nss"/>
-        <signal af="13" driver="debug" name="ldordy"/>
-        <signal af="13" driver="debug" name="rf"/>
+        <signal af="13" driver="debug" name="rf_ldordy"/>
         <signal af="14" driver="tim" instance="17" name="bkin"/>
       </gpio>
       <gpio port="b" pin="5">