Merge #652

bors[bot] · richardeoin · web-flow · commit 44c254e593c0 · 2022-07-03T23:23:30.000Z
652: H7: Add UART9/USART10 for RM0468 parts, fix base address for RM0455 parts r=adamgreig a=richardeoin

RM0468:
Base address RM0468 Rev 2 page 137
Interrupt offset RM0468 Rev 2 page 741

RM0455:
Base address RM0455 Rev 6 page 133
Interrupt offset RM0455 Rev 6 page 722

Co-authored-by: Richard Meadows &lt;962920+richardeoin@users.noreply.github.com&gt;
diff --git a/devices/common_patches/h7_common_highmemory.yaml b/devices/common_patches/h7_common_highmemory.yaml
@@ -383,14 +383,14 @@ _add:
         value: 83
   UART9:
     derivedFrom: USART1
-    baseAddress: 0x40018000
+    baseAddress: 0x40011800
     interrupts:
       UART9:
          description: UART9 global interrupt
          value: 140
   USART10:
     derivedFrom: USART1
-    baseAddress: 0x4001C000
+    baseAddress: 0x40011C00
     interrupts:
       USART10:
         description: USART10 global interrupt
diff --git a/devices/stm32h735.yaml b/devices/stm32h735.yaml
@@ -71,6 +71,20 @@ _add:
       BDMA_CH7:
         description: BDMA Channel 7 interrupt
         value: 136
+  UART9:
+    derivedFrom: USART1
+    baseAddress: 0x40011800
+    interrupts:
+      UART9:
+         description: UART9 global interrupt
+         value: 155
+  USART10:
+    derivedFrom: USART1
+    baseAddress: 0x40011C00
+    interrupts:
+      USART10:
+        description: USART10 global interrupt
+        value: 156
 
   # Additional timers
   TIM23:
@@ -698,12 +712,39 @@ RCC:
   APB2RSTR:
     _delete:
       - HRTIMRST
+    _add:
+      UART9RST:
+        description: UART9 block reset
+        bitWidth: 1
+        bitOffset: 6
+      USART10RST:
+        description: USART10 block reset
+        bitWidth: 1
+        bitOffset: 7
   APB2ENR:
     _delete:
       - HRTIMEN
+    _add:
+      UART9EN:
+        description: UART9 peripheral clocks enable
+        bitWidth: 1
+        bitOffset: 6
+      USART10EN:
+        description: USART10 peripheral clocks enable
+        bitWidth: 1
+        bitOffset: 7
   APB2LPENR,C1_APB2LPENR:
     _delete:
       - HRTIMLPEN
+    _add:
+      UART9LPEN:
+        description: UART9 peripheral clocks enable during CSleep Mode
+        bitWidth: 1
+        bitOffset: 6
+      USART10LPEN:
+        description: USART10 peripheral clocks enable during CSleep Mode
+        bitWidth: 1
+        bitOffset: 7
   APB4RSTR:
     _add:
       DTSRST:
