H735: fix conflicting rules and one duplicate rule

closes #605
stm32-rs · bors · Sep 3, 2021 · Sep 2, 2021 · Sep 2, 2021 · f8ba54ff1793f831e222912529f7c4f864c8432c
commit f8ba54ff1793f831e222912529f7c4f864c8432c
diff --git a/devices/common_patches/h7_rcc_src_sel.yaml b/devices/common_patches/h7_rcc_src_sel.yaml
@@ -1,67 +1,22 @@
 # Rename *SRC to *SEL in H7 domain kernel clock configuration registers (DxCCIPR)
 
-# Applies only to RM0433, RM0399 and RM0468 parts
+# Applies only to RM0433 and RM0399
+
+_include:
+  - h7_rcc_src_sel_common.yaml
 
 RCC:
   D1CCIPR:
     _modify:
-      CKPERSRC:
-          name: CKPERSEL
-      SDMMCSRC:
-          name: SDMMCSEL
       QSPISRC:
           name: QSPISEL
-      FMCSRC:
-          name: FMCSEL
   D2CCIP1R:
     _modify:
       SWPSRC:
           name: SWPSEL
-      FDCANSRC:
-          name: FDCANSEL
-      DFSDM1SRC:
-          name: DFSDM1SEL
-      SPDIFSRC:
-          name: SPDIFSEL
-      SPI45SRC:
-          name: SPI45SEL
-      SPI123SRC:
-          name: SPI123SEL
-      SAI23SRC:
-          name: SAI23SEL
-      SAI1SRC:
-          name: SAI1SEL
   D2CCIP2R:
     _modify:
-      LPTIM1SRC:
-          name: LPTIM1SEL
-      CECSRC:
-          name: CECSEL
-      USBSRC:
-          name: USBSEL
       I2C123SRC:
           name: I2C123SEL
-      RNGSRC:
-          name: RNGSEL
       USART16SRC:
           name: USART16SEL
-      USART234578SRC:
-          name: USART234578SEL
-  D3CCIPR:
-    _modify:
-      SPI6SRC:
-          name: SPI6SEL
-      SAI4BSRC:
-          name: SAI4BSEL
-      SAI4ASRC:
-          name: SAI4ASEL
-      ADCSRC:
-          name: ADCSEL
-      LPTIM345SRC:
-          name: LPTIM345SEL
-      LPTIM2SRC:
-          name: LPTIM2SEL
-      I2C4SRC:
-          name: I2C4SEL
-      LPUART1SRC:
-          name: LPUART1SEL
diff --git a/devices/common_patches/h7_rcc_src_sel_common.yaml b/devices/common_patches/h7_rcc_src_sel_common.yaml
@@ -0,0 +1,59 @@
+# Rename *SRC to *SEL in H7 domain kernel clock configuration registers (DxCCIPR)
+
+# Applies only to RM0433, RM0399 and RM0468 parts
+
+RCC:
+  D1CCIPR:
+    _modify:
+      CKPERSRC:
+          name: CKPERSEL
+      SDMMCSRC:
+          name: SDMMCSEL
+      FMCSRC:
+          name: FMCSEL
+  D2CCIP1R:
+    _modify:
+      FDCANSRC:
+          name: FDCANSEL
+      DFSDM1SRC:
+          name: DFSDM1SEL
+      SPDIFSRC:
+          name: SPDIFSEL
+      SPI45SRC:
+          name: SPI45SEL
+      SPI123SRC:
+          name: SPI123SEL
+      SAI23SRC:
+          name: SAI23SEL
+      SAI1SRC:
+          name: SAI1SEL
+  D2CCIP2R:
+    _modify:
+      LPTIM1SRC:
+          name: LPTIM1SEL
+      CECSRC:
+          name: CECSEL
+      USBSRC:
+          name: USBSEL
+      RNGSRC:
+          name: RNGSEL
+      USART234578SRC:
+          name: USART234578SEL
+  D3CCIPR:
+    _modify:
+      SPI6SRC:
+          name: SPI6SEL
+      SAI4BSRC:
+          name: SAI4BSEL
+      SAI4ASRC:
+          name: SAI4ASEL
+      ADCSRC:
+          name: ADCSEL
+      LPTIM345SRC:
+          name: LPTIM345SEL
+      LPTIM2SRC:
+          name: LPTIM2SEL
+      I2C4SRC:
+          name: I2C4SEL
+      LPUART1SRC:
+          name: LPUART1SEL
diff --git a/devices/stm32h735.yaml b/devices/stm32h735.yaml
@@ -392,9 +392,6 @@ RCC:
         description: I2C5 block enable during CSleep Mode
         bitWidth: 1
         bitOffset: 25
-    _modify:
-      HDMICECLPEN:
-        name: CECLPEN
   APB1HRSTR:
     _modify:
       SWPRST:
@@ -498,7 +495,7 @@ _include:
  - common_patches/dma/mdma.yaml
  - common_patches/fdcan/fdcan_h7.yaml
  - common_patches/fsmc/fsmc_sdram_cluster.yaml
- - common_patches/h7_rcc_src_sel.yaml
+ - common_patches/h7_rcc_src_sel_common.yaml
  - common_patches/h7_ethernet_combined_desc.yaml
  - common_patches/h7_exti_singlecore.yaml
  - common_patches/h7_dmacr.yaml