Merge #625

bors[bot] · karlp · web-flow · commit c3e3ca5e41a1 · 2021-09-29T00:44:52.000Z
625: stm32wb: Updates for ADC, TIM16, TIM17 r=adamgreig a=karlp



Co-authored-by: Karl Palsson &lt;karlp@etactica.com&gt;
diff --git a/devices/stm32wb55.yaml b/devices/stm32wb55.yaml
@@ -83,6 +83,18 @@ EXTI:
   C2IMR2:
     _split: [IM]
 
+HSEM:
+  _modify:
+    C1IER0:
+      name: C1IER
+    C2IER0:
+      name: C2IER
+
+IPCC:
+  _modify:
+    C1TO2SR:
+      name: C1TOC2SR
+
 SYSCFG:
   _modify:
     IMR1:
@@ -97,6 +109,15 @@ SYSCFG:
       addressOffset: 0x110
 
 TIM16:
+  _add:
+    TISEL:
+      addressOffset: 0x68
+      description: Input Selection
+
+  _modify:
+    AF1:
+      description: TIM16 Alternate function
+
   CR1:
     _add:
       CEN:
@@ -136,6 +157,48 @@ TIM16:
       - BKINE
       - BKINP
 
+TIM17:
+  _add:
+    TISEL:
+      addressOffset: 0x68
+      description: Input Selection
+
+  _modify:
+    DIER:
+      addressOffset: 0xc
+    SR:
+      addressOffset: 0x10
+    EGR:
+      addressOffset: 0x14
+    CCMR1_Output:
+      addressOffset: 0x18
+    CCER:
+      addressOffset: 0x20
+    CNT:
+      addressOffset: 0x24
+    PSC:
+      addressOffset: 0x28
+    ARR:
+      addressOffset: 0x2c
+    RCR:
+      addressOffset: 0x30
+    CCR1:
+      addressOffset: 0x34
+    BDTR:
+      addressOffset: 0x44
+    DCR:
+      addressOffset: 0x48
+    DMAR:
+      addressOffset: 0x4c
+    OR1:
+      addressOffset: 0x50
+      description: TIM17 option register 1
+    AF1:
+      addressOffset: 0x60
+      description: TIM17 Alternate function
+
+
+TIM1[67]:
   DIER:
     _add:
       UIE:
@@ -171,53 +234,34 @@ TIM16:
       - BKINE
       - BKINP
 
-HSEM:
-  _modify:
-    C1IER0:
-      name: C1IER
-    C2IER0:
-      name: C2IER
+  SR:
+    _delete:
+      - TIF
 
-IPCC:
-  _modify:
-    C1TO2SR:
-      name: C1TOC2SR
+  EGR:
+    _delete:
+      - TG
 
-TIM17:
-  DIER:
+  BDTR:
     _add:
-      UIE:
-        description: Update interrupt enable.
-        bitOffset: 0
-        bitWidth: 1
-      CC1IE:
-        description: Capture/Compare 1 interrupt enable.
-        bitOffset: 1
-        bitWidth: 1
-      COMIE:
-        description: COM interrupt enable.
-        bitOffset: 5
-        bitWidth: 1
-      BIE:
-        description: Break interrupt enable.
-        bitOffset: 7
+      BKBID:
+        description: Break bidirectional
+        bitOffset: 28
         bitWidth: 1
-      UDE:
-        description: Update DMA request enable.
-        bitOffset: 8
-        bitWidth: 1
-      CC1DE:
-        description: Capture/Compare 1 DMA request enable.
-        bitOffset: 9
+      BKDSRM:
+        description: Break disarm
+        bitOffset: 26
         bitWidth: 1
 
     _delete:
-      - BKCMP1E
-      - BKCMP1P
-      - BKCMP2E
-      - BKCMP2P
-      - BKINE
-      - BKINP
+      - BKF
+
+  TISEL:
+    _add:
+      TI1SEL:
+        description: Selects TI1 input
+        bitOffset: 0
+        bitWidth: 4
 
 TIM1:
   CCMR3_Output:
@@ -232,3 +276,4 @@ _include:
  - ./common_patches/rtc/rtc_cr.yaml
  - ../peripherals/tim/v2/ccm_common.yaml
  - ./common_patches/wb_adc_common.yaml
+ - ./common_patches/l4_adc_smpr.yaml
