From c7cfbceb0ef2f0261fe9720cde27decd6da45fb0 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Fri, 10 Sep 2021 10:30:32 +0000 Subject: [PATCH 1/3] stm32wb55: sort peripherals No semantic change, but keep peripherals sorted. Signed-off-by: Karl Palsson --- devices/stm32wb55.yaml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/devices/stm32wb55.yaml b/devices/stm32wb55.yaml index 88cbdb4e9..df35d975a 100644 --- a/devices/stm32wb55.yaml +++ b/devices/stm32wb55.yaml @@ -77,6 +77,18 @@ EXTI: C2IMR2: _split: [IM] +HSEM: + _modify: + C1IER0: + name: C1IER + C2IER0: + name: C2IER + +IPCC: + _modify: + C1TO2SR: + name: C1TOC2SR + SYSCFG: _modify: IMR1: @@ -165,17 +177,6 @@ TIM16: - BKINE - BKINP -HSEM: - _modify: - C1IER0: - name: C1IER - C2IER0: - name: C2IER - -IPCC: - _modify: - C1TO2SR: - name: C1TOC2SR TIM17: DIER: From 7c56531306b72a71aeaa0d93e1c11a95505adbca Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Fri, 10 Sep 2021 10:31:05 +0000 Subject: [PATCH 2/3] stm32wb: use same ADC SMPR fixes as L4. Signed-off-by: Karl Palsson --- devices/stm32wb55.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/devices/stm32wb55.yaml b/devices/stm32wb55.yaml index df35d975a..355da9946 100644 --- a/devices/stm32wb55.yaml +++ b/devices/stm32wb55.yaml @@ -227,3 +227,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 From f1517fe53be728d04672d1a6a80689ad67e215ed Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Fri, 10 Sep 2021 11:30:15 +0000 Subject: [PATCH 3/3] stm32wb: review TIM16/TIM17 Missing registers, extra bits to delete, and a swathe of incorrect addresses for TIM17 Compared by hand against RM0434rev8. Signed-off-by: Karl Palsson --- devices/stm32wb55.yaml | 103 +++++++++++++++++++++++++++++------------ 1 file changed, 73 insertions(+), 30 deletions(-) diff --git a/devices/stm32wb55.yaml b/devices/stm32wb55.yaml index 355da9946..21b498463 100644 --- a/devices/stm32wb55.yaml +++ b/devices/stm32wb55.yaml @@ -103,6 +103,15 @@ SYSCFG: addressOffset: 0x110 TIM16: + _add: + TISEL: + addressOffset: 0x68 + description: Input Selection + + _modify: + AF1: + description: TIM16 Alternate function + CR1: _add: CEN: @@ -142,6 +151,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: @@ -177,42 +228,34 @@ TIM16: - BKINE - BKINP + SR: + _delete: + - TIF -TIM17: - DIER: + EGR: + _delete: + - TG + + 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: