Merge #723

723: Fix L4 `ADC?.DR.RDATA` field name and description. r=richardeoin a=reitermarkus Co-authored-by: Markus Reiter <me@reitermark.us>
stm32-rs · May 15, 2022 · c4d20d6 · c4d20d6
2 parents 064db43 + b5cf26e
commit c4d20d6
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,9 @@ Family-specific:
     * Add SDMMC2EN and SDMMC2RST to F765, F7x7, F7x9 (#662)
     * Fix incorrect bit position for Ethernet MMCTIMR TGFM (#689)
 
+* L4:
+    * Fix ADC RDATA field name and description. (#723)
+
 ## [v0.14.0] 2021-10-02
 
 Family-specific:

diff --git a/devices/common_patches/adc_dr_rdata.yaml b/devices/common_patches/adc_dr_rdata.yaml
@@ -0,0 +1,6 @@
+"ADC?":
+  DR:
+    _modify:
+      regularDATA:
+        name: RDATA
+        description: Regular data
diff --git a/devices/common_patches/f3_adc.yaml b/devices/common_patches/f3_adc.yaml
@@ -1,3 +1,6 @@
+_include:
+  - adc_dr_rdata.yaml
+
 "ADC?":
   SQR1:
     _modify:
@@ -18,7 +21,3 @@
     _modify:
       ADVREGEN:
         bitWidth: 2
-  DR:
-    _modify:
-      regularDATA:
-        name: RDATA
diff --git a/devices/common_patches/l4_adc.yaml b/devices/common_patches/l4_adc.yaml
@@ -0,0 +1,2 @@
+_include:
+  - adc_dr_rdata.yaml
diff --git a/devices/common_patches/stm32l4x2_l412.yaml b/devices/common_patches/stm32l4x2_l412.yaml
@@ -151,6 +151,7 @@ _include:
  - ../../peripherals/usb/usb_with_LPM.yaml
  - flash/flash_boot0s.yaml
  - ../../peripherals/sai/sai.yaml
+ - l4_adc.yaml
  - l4_adc_common.yaml
  - l4_adc_smpr.yaml
  - l4_adc_sqr1.yaml

diff --git a/devices/stm32l4x1.yaml b/devices/stm32l4x1.yaml
@@ -127,6 +127,7 @@ _include:
  - ./common_patches/flash/flash_boot0s.yaml
  - ../peripherals/fw/fw_l0_l4.yaml
  - ../peripherals/sai/sai.yaml
+ - ./common_patches/l4_adc.yaml
  - ./common_patches/l4_adc_common.yaml
  - ./common_patches/l4_adc_smpr.yaml
  - ./common_patches/l4_adc_sqr1.yaml

diff --git a/devices/stm32l4x3.yaml b/devices/stm32l4x3.yaml
@@ -10,7 +10,7 @@ RCC:
       USBF:
         name: USBFSEN
         description: USB FS clock enable
-        
+
   # SVD incorrectly shifts CRCEN/CRCRST/CRCSMEN  11 bits instead of 12
   AHB1ENR:
     _modify:
@@ -158,6 +158,7 @@ _include:
  - ../peripherals/fw/fw_l0_l4.yaml
  - ../peripherals/sai/sai.yaml
  - common_patches/dma_interrupt_names.yaml
+ - ./common_patches/l4_adc.yaml
  - ./common_patches/l4_adc_common.yaml
  - ./common_patches/l4_adc_smpr.yaml
  - ./common_patches/l4_adc_sqr1.yaml

diff --git a/devices/stm32l4x5.yaml b/devices/stm32l4x5.yaml
@@ -186,6 +186,7 @@ _include:
  - ../peripherals/fw/fw_l0_l4.yaml
  - ../peripherals/sai/sai.yaml
  - common_patches/dma_interrupt_names.yaml
+ - ./common_patches/l4_adc.yaml
  - ./common_patches/l4_adc_smpr.yaml
  - ./common_patches/l4_adc_sqr1.yaml
  - ./common_patches/l4_spi.yaml