From 8e3bf3015a50de11a353d0d2da1d689e21e7341d Mon Sep 17 00:00:00 2001
From: Raphael Lehmann <raphael@rleh.de>
Date: Thu, 12 Sep 2019 03:53:27 +0200
Subject: [PATCH] [stm32] g4 u(s)art has no tcbgt

---
 devices/stm32/stm32g4-31_41.xml              | 2 --
 devices/stm32/stm32g4-71.xml                 | 2 --
 devices/stm32/stm32g4-73_83.xml              | 2 --
 devices/stm32/stm32g4-74_84.xml              | 2 --
 tools/generator/dfg/stm32/stm_peripherals.py | 8 ++++----
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/devices/stm32/stm32g4-31_41.xml b/devices/stm32/stm32g4-31_41.xml
index eaff2486..40f1bd0e 100644
--- a/devices/stm32/stm32g4-31_41.xml
+++ b/devices/stm32/stm32g4-31_41.xml
@@ -226,14 +226,12 @@
     </driver>
     <driver name="tracer_emb" type="stm32-v1.0"/>
     <driver device-pin="m|r|v" name="uart" type="stm32-extended">
-      <feature value="tcbgt"/>
       <instance value="4"/>
     </driver>
     <driver name="ucpd" type="stm32-v1.0">
       <instance value="1"/>
     </driver>
     <driver name="usart" type="stm32-extended">
-      <feature value="tcbgt"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance device-pin="c|m|r|v" value="3"/>
diff --git a/devices/stm32/stm32g4-71.xml b/devices/stm32/stm32g4-71.xml
index 8349e864..294dacca 100644
--- a/devices/stm32/stm32g4-71.xml
+++ b/devices/stm32/stm32g4-71.xml
@@ -223,7 +223,6 @@
     </driver>
     <driver name="tracer_emb" type="stm32-v1.0"/>
     <driver device-pin="m|q|r|v" name="uart" type="stm32-extended">
-      <feature value="tcbgt"/>
       <instance value="4"/>
       <instance value="5"/>
     </driver>
@@ -231,7 +230,6 @@
       <instance value="1"/>
     </driver>
     <driver name="usart" type="stm32-extended">
-      <feature value="tcbgt"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32g4-73_83.xml b/devices/stm32/stm32g4-73_83.xml
index 163fb03e..877b66eb 100644
--- a/devices/stm32/stm32g4-73_83.xml
+++ b/devices/stm32/stm32g4-73_83.xml
@@ -270,7 +270,6 @@
     </driver>
     <driver name="tracer_emb" type="stm32-v1.0"/>
     <driver device-pin="m|q|r|v" name="uart" type="stm32-extended">
-      <feature value="tcbgt"/>
       <instance value="4"/>
       <instance value="5"/>
     </driver>
@@ -278,7 +277,6 @@
       <instance value="1"/>
     </driver>
     <driver name="usart" type="stm32-extended">
-      <feature value="tcbgt"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/devices/stm32/stm32g4-74_84.xml b/devices/stm32/stm32g4-74_84.xml
index c198f328..44fc7ce1 100644
--- a/devices/stm32/stm32g4-74_84.xml
+++ b/devices/stm32/stm32g4-74_84.xml
@@ -281,7 +281,6 @@
     </driver>
     <driver name="tracer_emb" type="stm32-v1.0"/>
     <driver device-pin="m|q|r|v" name="uart" type="stm32-extended">
-      <feature value="tcbgt"/>
       <instance value="4"/>
       <instance value="5"/>
     </driver>
@@ -289,7 +288,6 @@
       <instance value="1"/>
     </driver>
     <driver name="usart" type="stm32-extended">
-      <feature value="tcbgt"/>
       <instance value="1"/>
       <instance value="2"/>
       <instance value="3"/>
diff --git a/tools/generator/dfg/stm32/stm_peripherals.py b/tools/generator/dfg/stm32/stm_peripherals.py
index 93b45843..903a16d5 100644
--- a/tools/generator/dfg/stm32/stm_peripherals.py
+++ b/tools/generator/dfg/stm32/stm_peripherals.py
@@ -388,12 +388,12 @@
                 'hardware': 'stm32-extended',
                 'features': ['tcbgt'],
                 'protocols': ['uart'],
-                'devices': [{'family': ['l4'], 'name': ['r5', 'r7', 'r9', 's5', 's7', 's9']}, {'family': ['g0', 'g4', 'wb']}]
+                'devices': [{'family': ['l4'], 'name': ['r5', 'r7', 'r9', 's5', 's7', 's9']}, {'family': ['g0', 'wb']}]
             },{
                 'hardware': 'stm32-extended',
                 'features': [],
                 'protocols': ['uart'],
-                'devices': [{'family': ['f7', 'l4']}]
+                'devices': [{'family': ['f7', 'l4', 'g4']}]
             },{
                 'hardware': 'stm32',
                 'features': ['over8'],
@@ -419,12 +419,12 @@
                 'hardware': 'stm32-extended',
                 'features': ['tcbgt'],
                 'protocols': ['uart', 'spi'],
-                'devices': [{'family': ['l4'], 'name': ['r5', 'r7', 'r9', 's5', 's7', 's9']}, {'family': ['g0', 'g4', 'wb']}]
+                'devices': [{'family': ['l4'], 'name': ['r5', 'r7', 'r9', 's5', 's7', 's9']}, {'family': ['g0', 'wb']}]
             },{
                 'hardware': 'stm32-extended',
                 'features': [],
                 'protocols': ['uart', 'spi'],
-                'devices': [{'family': ['f7', 'l4']}]
+                'devices': [{'family': ['f7', 'l4', 'g4']}]
             },{
                 'hardware': 'stm32',
                 'features': ['over8'],