diff --git a/devices/stm32/stm32f0-30-8.xml b/devices/stm32/stm32f0-30-8.xml
index 35688b1e..62beb598 100644
--- a/devices/stm32/stm32f0-30-8.xml
+++ b/devices/stm32/stm32f0-30-8.xml
@@ -41,6 +41,8 @@
       <instance value="1"/>
     </driver>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
diff --git a/devices/stm32/stm32f0-30_70-4_6.xml b/devices/stm32/stm32f0-30_70-4_6.xml
index 05e7cb85..840b4ab8 100644
--- a/devices/stm32/stm32f0-30_70-4_6.xml
+++ b/devices/stm32/stm32f0-30_70-4_6.xml
@@ -45,6 +45,8 @@
       <instance value="1"/>
     </driver>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
diff --git a/devices/stm32/stm32f0-30_70-b_c.xml b/devices/stm32/stm32f0-30_70-b_c.xml
index 468b05f1..d0a314f6 100644
--- a/devices/stm32/stm32f0-30_70-b_c.xml
+++ b/devices/stm32/stm32f0-30_70-b_c.xml
@@ -52,6 +52,9 @@
       <instance device-name="30" value="2"/>
     </driver>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature device-name="30|70" device-pin="c" value="fmp"/>
+      <feature device-name="70" device-pin="r" value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
diff --git a/devices/stm32/stm32f0-31_51-4_6.xml b/devices/stm32/stm32f0-31_51-4_6.xml
index 25fe4c7e..54c31e3d 100644
--- a/devices/stm32/stm32f0-31_51-4_6.xml
+++ b/devices/stm32/stm32f0-31_51-4_6.xml
@@ -77,6 +77,8 @@
     </driver>
     <driver device-name="51" name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
     </driver>
     <driver name="i2s" type="stm32-v3.0">
diff --git a/devices/stm32/stm32f0-38_48-6.xml b/devices/stm32/stm32f0-38_48-6.xml
index f6794162..c8d96c14 100644
--- a/devices/stm32/stm32f0-38_48-6.xml
+++ b/devices/stm32/stm32f0-38_48-6.xml
@@ -54,6 +54,8 @@
     </driver>
     <driver device-name="48" name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
     </driver>
     <driver name="i2s" type="stm32-v3.0">
diff --git a/devices/stm32/stm32f0-42-4_6.xml b/devices/stm32/stm32f0-42-4_6.xml
index 6472e35f..e1879f0f 100644
--- a/devices/stm32/stm32f0-42-4_6.xml
+++ b/devices/stm32/stm32f0-42-4_6.xml
@@ -61,6 +61,8 @@
     </driver>
     <driver name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
     </driver>
     <driver name="i2s" type="stm32-v3.0">
diff --git a/devices/stm32/stm32f0-51_71-8.xml b/devices/stm32/stm32f0-51_71-8.xml
index 794aeae0..05d2f8d3 100644
--- a/devices/stm32/stm32f0-51_71-8.xml
+++ b/devices/stm32/stm32f0-51_71-8.xml
@@ -71,6 +71,8 @@
     </driver>
     <driver name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance device-pin="c|r|v" value="2"/>
     </driver>
diff --git a/devices/stm32/stm32f0-58-8.xml b/devices/stm32/stm32f0-58-8.xml
index f46ea3ae..b92730ce 100644
--- a/devices/stm32/stm32f0-58-8.xml
+++ b/devices/stm32/stm32f0-58-8.xml
@@ -57,6 +57,8 @@
     </driver>
     <driver name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature device-package="t|y" value="fmp"/>
       <instance value="1"/>
       <instance device-pin="c|r" value="2"/>
     </driver>
diff --git a/devices/stm32/stm32f0-71_91-b_c.xml b/devices/stm32/stm32f0-71_91-b_c.xml
index 2b114704..40ed3451 100644
--- a/devices/stm32/stm32f0-71_91-b_c.xml
+++ b/devices/stm32/stm32f0-71_91-b_c.xml
@@ -86,6 +86,8 @@
     </driver>
     <driver name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
diff --git a/devices/stm32/stm32f0-72-8_b.xml b/devices/stm32/stm32f0-72-8_b.xml
index 0354b50a..69dffe43 100644
--- a/devices/stm32/stm32f0-72-8_b.xml
+++ b/devices/stm32/stm32f0-72-8_b.xml
@@ -73,6 +73,8 @@
     </driver>
     <driver name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
diff --git a/devices/stm32/stm32f0-78_98-b_c.xml b/devices/stm32/stm32f0-78_98-b_c.xml
index 593d4e16..81f66fd4 100644
--- a/devices/stm32/stm32f0-78_98-b_c.xml
+++ b/devices/stm32/stm32f0-78_98-b_c.xml
@@ -84,6 +84,8 @@
     </driver>
     <driver name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
diff --git a/devices/stm32/stm32f3-01.xml b/devices/stm32/stm32f3-01.xml
index c609192a..cc45fe80 100644
--- a/devices/stm32/stm32f3-01.xml
+++ b/devices/stm32/stm32f3-01.xml
@@ -78,6 +78,8 @@
       <instance value="1"/>
     </driver>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32f3-02-6_8.xml b/devices/stm32/stm32f3-02-6_8.xml
index beb3f475..b45e8ca9 100644
--- a/devices/stm32/stm32f3-02-6_8.xml
+++ b/devices/stm32/stm32f3-02-6_8.xml
@@ -87,6 +87,8 @@
       <instance value="1"/>
     </driver>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32f3-02-b_c_d_e.xml b/devices/stm32/stm32f3-02-b_c_d_e.xml
index 01ccbbdc..638a0649 100644
--- a/devices/stm32/stm32f3-02-b_c_d_e.xml
+++ b/devices/stm32/stm32f3-02-b_c_d_e.xml
@@ -122,6 +122,8 @@
     </driver>
     <driver device-pin="v|z" device-size="d|e" name="fmc" type="stm32-v1.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance device-size="d|e" value="3"/>
diff --git a/devices/stm32/stm32f3-03-6_8.xml b/devices/stm32/stm32f3-03-6_8.xml
index dc0d4425..b3c1eb24 100644
--- a/devices/stm32/stm32f3-03-6_8.xml
+++ b/devices/stm32/stm32f3-03-6_8.xml
@@ -86,6 +86,8 @@
       <instance value="1"/>
     </driver>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
diff --git a/devices/stm32/stm32f3-03-b_c_d_e.xml b/devices/stm32/stm32f3-03-b_c_d_e.xml
index d95a3cfe..8eac1cad 100644
--- a/devices/stm32/stm32f3-03-b_c_d_e.xml
+++ b/devices/stm32/stm32f3-03-b_c_d_e.xml
@@ -146,6 +146,8 @@
     <driver device-pin="v" device-size="d|e" device-package="h|t" name="fmc" type="stm32-v1.0"/>
     <driver device-pin="z" device-size="d|e" device-package="t" name="fmc" type="stm32-v1.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance device-size="d|e" value="3"/>
diff --git a/devices/stm32/stm32f3-18_28.xml b/devices/stm32/stm32f3-18_28.xml
index 60328de2..4e6fd598 100644
--- a/devices/stm32/stm32f3-18_28.xml
+++ b/devices/stm32/stm32f3-18_28.xml
@@ -93,6 +93,8 @@
       <instance value="1"/>
     </driver>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance device-name="18" value="2"/>
       <instance device-name="18" value="3"/>
diff --git a/devices/stm32/stm32f3-34.xml b/devices/stm32/stm32f3-34.xml
index a9930248..1a9397d2 100644
--- a/devices/stm32/stm32f3-34.xml
+++ b/devices/stm32/stm32f3-34.xml
@@ -100,6 +100,8 @@
       <instance value="1"/>
     </driver>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
     </driver>
     <driver name="irtim" type="stm32-v1.0"/>
diff --git a/devices/stm32/stm32f3-58_98.xml b/devices/stm32/stm32f3-58_98.xml
index 7ee6f8ad..15119aae 100644
--- a/devices/stm32/stm32f3-58_98.xml
+++ b/devices/stm32/stm32f3-58_98.xml
@@ -125,6 +125,8 @@
     </driver>
     <driver device-name="98" name="fmc" type="stm32-v1.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance device-name="98" value="3"/>
diff --git a/devices/stm32/stm32f3-73_78.xml b/devices/stm32/stm32f3-73_78.xml
index fbfad640..6806c123 100644
--- a/devices/stm32/stm32f3-73_78.xml
+++ b/devices/stm32/stm32f3-73_78.xml
@@ -117,6 +117,8 @@
     </driver>
     <driver name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
     </driver>
diff --git a/devices/stm32/stm32f7-22_23_32_33.xml b/devices/stm32/stm32f7-22_23_32_33.xml
index 4f531f29..9b4258e8 100644
--- a/devices/stm32/stm32f7-22_23_32_33.xml
+++ b/devices/stm32/stm32f7-22_23_32_33.xml
@@ -151,6 +151,8 @@
     </driver>
     <driver device-pin="i|v|z" name="fmc" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32f7-30_50.xml b/devices/stm32/stm32f7-30_50.xml
index 14bebc6b..d84823b6 100644
--- a/devices/stm32/stm32f7-30_50.xml
+++ b/devices/stm32/stm32f7-30_50.xml
@@ -151,6 +151,8 @@
     <driver device-name="50" name="hash" type="stm32-v2.0"/>
     <driver device-name="50" name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32f7-45_46_56.xml b/devices/stm32/stm32f7-45_46_56.xml
index d6a14356..b44ec7a2 100644
--- a/devices/stm32/stm32f7-45_46_56.xml
+++ b/devices/stm32/stm32f7-45_46_56.xml
@@ -174,6 +174,8 @@
     <driver device-name="56" name="hash" type="stm32-v2.0"/>
     <driver name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32f7-65_67_68_69_77_78_79.xml b/devices/stm32/stm32f7-65_67_68_69_77_78_79.xml
index a08208bf..6672a170 100644
--- a/devices/stm32/stm32f7-65_67_68_69_77_78_79.xml
+++ b/devices/stm32/stm32f7-65_67_68_69_77_78_79.xml
@@ -206,6 +206,8 @@
     <driver device-name="77|78|79" name="hash" type="stm32-v2.0"/>
     <driver name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32h7-43_53.xml b/devices/stm32/stm32h7-43_53.xml
index c8e45834..69bbb253 100644
--- a/devices/stm32/stm32h7-43_53.xml
+++ b/devices/stm32/stm32h7-43_53.xml
@@ -212,7 +212,9 @@
     <driver device-name="53" name="hash" type="stm32-v2.0"/>
     <driver name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="hrtim" type="stm32-hrtim_h7"/>
-    <driver name="i2c" type="stm32">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32h7-50.xml b/devices/stm32/stm32h7-50.xml
index b2211096..23a0ea56 100644
--- a/devices/stm32/stm32h7-50.xml
+++ b/devices/stm32/stm32h7-50.xml
@@ -193,7 +193,9 @@
     <driver name="hash" type="stm32-v2.0"/>
     <driver name="hdmi_cec" type="stm32-v2.0"/>
     <driver name="hrtim" type="stm32-hrtim_h7"/>
-    <driver name="i2c" type="stm32">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32l0-11_21.xml b/devices/stm32/stm32l0-11_21.xml
index 515648bb..36dc8c48 100644
--- a/devices/stm32/stm32l0-11_21.xml
+++ b/devices/stm32/stm32l0-11_21.xml
@@ -63,7 +63,9 @@
     <driver name="dma" type="stm32-extended">
       <instance value="1"/>
     </driver>
-    <driver name="i2c" type="stm32">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
     </driver>
     <driver name="iwdg" type="stm32"/>
diff --git a/devices/stm32/stm32l0-31_41.xml b/devices/stm32/stm32l0-31_41.xml
index 6ff48bad..53c8b156 100644
--- a/devices/stm32/stm32l0-31_41.xml
+++ b/devices/stm32/stm32l0-31_41.xml
@@ -64,7 +64,9 @@
     <driver name="dma" type="stm32-extended">
       <instance value="1"/>
     </driver>
-    <driver name="i2c" type="stm32">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
     </driver>
     <driver name="iwdg" type="stm32"/>
diff --git a/devices/stm32/stm32l0-51_52_53_62_63.xml b/devices/stm32/stm32l0-51_52_53_62_63.xml
index b224c7bb..9690da45 100644
--- a/devices/stm32/stm32l0-51_52_53_62_63.xml
+++ b/devices/stm32/stm32l0-51_52_53_62_63.xml
@@ -92,7 +92,9 @@
     <driver name="dma" type="stm32-extended">
       <instance value="1"/>
     </driver>
-    <driver name="i2c" type="stm32">
+    <driver name="i2c" type="stm32-extended">
+      <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance device-pin="c|r|t" 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 a7c58603..58454421 100644
--- a/devices/stm32/stm32l0-71_72_73_81_82_83.xml
+++ b/devices/stm32/stm32l0-71_72_73_81_82_83.xml
@@ -138,7 +138,9 @@
     <driver name="dma" type="stm32-extended">
       <instance value="1"/>
     </driver>
-    <driver name="i2c" type="stm32">
+    <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"/>
diff --git a/devices/stm32/stm32l4-12_22.xml b/devices/stm32/stm32l4-12_22.xml
index f377e937..1e5e925a 100644
--- a/devices/stm32/stm32l4-12_22.xml
+++ b/devices/stm32/stm32l4-12_22.xml
@@ -100,8 +100,9 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="i2c" type="stm32l4">
+    <driver name="i2c" type="stm32-extended">
       <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance device-pin="c|r" value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32l4-31_33_43.xml b/devices/stm32/stm32l4-31_33_43.xml
index ccf19c47..299fe627 100644
--- a/devices/stm32/stm32l4-31_33_43.xml
+++ b/devices/stm32/stm32l4-31_33_43.xml
@@ -135,8 +135,9 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="i2c" type="stm32l4">
+    <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"/>
diff --git a/devices/stm32/stm32l4-32_42.xml b/devices/stm32/stm32l4-32_42.xml
index 428a00c7..ae703f1c 100644
--- a/devices/stm32/stm32l4-32_42.xml
+++ b/devices/stm32/stm32l4-32_42.xml
@@ -92,8 +92,9 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="i2c" type="stm32l4">
+    <driver name="i2c" type="stm32-extended">
       <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="3"/>
     </driver>
diff --git a/devices/stm32/stm32l4-51_71.xml b/devices/stm32/stm32l4-51_71.xml
index 865e8b59..c5186f09 100644
--- a/devices/stm32/stm32l4-51_71.xml
+++ b/devices/stm32/stm32l4-51_71.xml
@@ -146,8 +146,9 @@
       <instance value="2"/>
     </driver>
     <driver device-name="71" device-pin="q|v|z" name="fmc" type="stm32-v1.1"/>
-    <driver name="i2c" type="stm32l4">
+    <driver name="i2c" type="stm32-extended">
       <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32l4-52_62.xml b/devices/stm32/stm32l4-52_62.xml
index afc8da51..5ec12011 100644
--- a/devices/stm32/stm32l4-52_62.xml
+++ b/devices/stm32/stm32l4-52_62.xml
@@ -121,8 +121,9 @@
       <instance value="1"/>
       <instance value="2"/>
     </driver>
-    <driver name="i2c" type="stm32l4">
+    <driver name="i2c" type="stm32-extended">
       <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32l4-75_85.xml b/devices/stm32/stm32l4-75_85.xml
index 33616a99..ae88af56 100644
--- a/devices/stm32/stm32l4-75_85.xml
+++ b/devices/stm32/stm32l4-75_85.xml
@@ -126,8 +126,9 @@
       <instance value="2"/>
     </driver>
     <driver device-pin="v" name="fmc" type="stm32-v1.1"/>
-    <driver name="i2c" type="stm32l4">
+    <driver name="i2c" type="stm32-extended">
       <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32l4-76_86.xml b/devices/stm32/stm32l4-76_86.xml
index 29272dc3..3d173487 100644
--- a/devices/stm32/stm32l4-76_86.xml
+++ b/devices/stm32/stm32l4-76_86.xml
@@ -138,8 +138,9 @@
       <instance value="2"/>
     </driver>
     <driver device-pin="q|v|z" name="fmc" type="stm32-v1.1"/>
-    <driver name="i2c" type="stm32l4">
+    <driver name="i2c" type="stm32-extended">
       <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32l4-96_a6.xml b/devices/stm32/stm32l4-96_a6.xml
index d7c678ad..a18884d2 100644
--- a/devices/stm32/stm32l4-96_a6.xml
+++ b/devices/stm32/stm32l4-96_a6.xml
@@ -150,8 +150,9 @@
     <driver name="dma2d" type="stm32"/>
     <driver device-pin="a|q|v|z" name="fmc" type="stm32-v2.0"/>
     <driver device-name="a6" name="hash" type="stm32-v2.2"/>
-    <driver name="i2c" type="stm32l4">
+    <driver name="i2c" type="stm32-extended">
       <feature value="dnf"/>
+      <feature value="fmp"/>
       <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 aa0bb564..6ca9b184 100644
--- a/devices/stm32/stm32l4-r5_r7_r9.xml
+++ b/devices/stm32/stm32l4-r5_r7_r9.xml
@@ -150,8 +150,9 @@
     <driver device-name="r9" name="dsihost" type="stm32-v1.0"/>
     <driver name="fmc" type="stm32-v2.1"/>
     <driver device-name="r7|r9" name="gfxmmu" type="stm32-v1.0"/>
-    <driver name="i2c" type="stm32l4">
+    <driver name="i2c" type="stm32-extended">
       <feature value="dnf"/>
+      <feature value="fmp"/>
       <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 89d9c530..590d11aa 100644
--- a/devices/stm32/stm32l4-s5_s7_s9.xml
+++ b/devices/stm32/stm32l4-s5_s7_s9.xml
@@ -142,8 +142,9 @@
     <driver name="fmc" type="stm32-v2.1"/>
     <driver device-name="s7|s9" name="gfxmmu" type="stm32-v1.0"/>
     <driver name="hash" type="stm32-v2.2"/>
-    <driver name="i2c" type="stm32l4">
+    <driver name="i2c" type="stm32-extended">
       <feature value="dnf"/>
+      <feature value="fmp"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>