[dfg] DMA signal de-duplication

Author: rleh

devices/stm32/stm32f0-70.xml

@@ -200,7 +200,6 @@
           </signal>
           <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="1" name="up"/>
-          <signal device-size="b" driver="tim" instance="1" name="up"/>
           <signal device-size="b" driver="tim" instance="15" name="ch1"/>
           <signal device-size="b" driver="tim" instance="15" name="com"/>
           <signal device-size="b" driver="tim" instance="15" name="trig"/>

devices/stm32/stm32f0-71.xml

@@ -237,7 +237,6 @@
           </signal>
           <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="1" name="up"/>
-          <signal driver="tim" instance="1" name="up"/>
           <signal driver="tim" instance="15" name="ch1"/>
           <signal driver="tim" instance="15" name="com"/>
           <signal driver="tim" instance="15" name="trig"/>

devices/stm32/stm32f0-72.xml

@@ -248,7 +248,6 @@
           </signal>
           <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="1" name="up"/>
-          <signal driver="tim" instance="1" name="up"/>
           <signal driver="tim" instance="15" name="ch1"/>
           <signal driver="tim" instance="15" name="com"/>
           <signal driver="tim" instance="15" name="trig"/>

devices/stm32/stm32f0-78.xml

@@ -231,7 +231,6 @@
           </signal>
           <signal driver="tim" instance="1" name="ch3"/>
           <signal driver="tim" instance="1" name="up"/>
-          <signal driver="tim" instance="1" name="up"/>
           <signal driver="tim" instance="15" name="ch1"/>
           <signal driver="tim" instance="15" name="com"/>
           <signal driver="tim" instance="15" name="trig"/>

devices/stm32/stm32f1-00-4_6.xml

@@ -144,7 +144,6 @@
           <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="1" name="ch3"/>
-          <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="3" name="ch1"/>

devices/stm32/stm32f1-00-8_b.xml

@@ -159,7 +159,6 @@
           <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="1" name="ch3"/>
-          <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="3" name="ch1"/>

devices/stm32/stm32f1-00-c_d_e.xml

@@ -179,7 +179,6 @@
           <signal driver="tim" instance="1" name="ch1"/>
           <signal driver="tim" instance="1" name="ch2"/>
           <signal driver="tim" instance="1" name="ch3"/>
-          <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="3" name="ch1"/>

devices/stm32/stm32f3-73_78.xml

@@ -277,12 +277,6 @@
           <signal driver="tim" instance="17" name="ch1">
             <remap position="12" mask="1" id="1"/>
           </signal>
-          <signal driver="tim" instance="17" name="ch1">
-            <remap position="12" mask="1" id="1"/>
-          </signal>
-          <signal driver="tim" instance="17" name="up">
-            <remap position="12" mask="1" id="1"/>
-          </signal>
           <signal driver="tim" instance="17" name="up">
             <remap position="12" mask="1" id="1"/>
           </signal>

tools/generator/dfg/stm32/stm_device_tree.py

@@ -335,6 +335,15 @@ def rv(param, default=[]):
                 dma_streams['1'].pop('6')
                 dma_streams['1'].pop('7')
 
+        # De-duplicate DMA signal entries
+        def deduplicate_list(l):
+            return [i for n, i in enumerate(l) if i not in l[n + 1:]]
+        for stream in dma_streams:
+            for channel in dma_streams[stream]:
+                for signal in dma_streams[stream][channel]:
+                    dma_streams[stream][channel][signal] = deduplicate_list(
+                        dma_streams[stream][channel][signal])
+
         # if p["dma_naming"][1] == "request":
         #     print(did, dmaFile.filename)
         p["dma"] = dma_streams