From 0665e1c2e7ed7ea75a7c4bcd42762b73daffdd7f Mon Sep 17 00:00:00 2001
From: Richard Meadows <962920+richardeoin@users.noreply.github.com>
Date: Sat, 30 Oct 2021 18:46:32 +0200
Subject: [PATCH 1/2] H7: Add UART9/USART10 for RM0468 parts, fix base address
 for RM0455 parts

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
---
 devices/common_patches/h7_common_highmemory.yaml |  4 ++--
 devices/stm32h735.yaml                           | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/devices/common_patches/h7_common_highmemory.yaml b/devices/common_patches/h7_common_highmemory.yaml
index 1db0d8a38..870ad255b 100644
--- a/devices/common_patches/h7_common_highmemory.yaml
+++ b/devices/common_patches/h7_common_highmemory.yaml
@@ -382,14 +382,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
index 77087612d..92235d744 100644
--- 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
 
 # PWR block
 PWR:

From bb60ad7cc9d4a71cf778beed75f9a935eec49914 Mon Sep 17 00:00:00 2001
From: Richard Meadows <962920+richardeoin@users.noreply.github.com>
Date: Sat, 30 Oct 2021 22:00:09 +0200
Subject: [PATCH 2/2] H7: Add RCC registers for UART9/USART10 on RM0468 parts

---
 devices/stm32h735.yaml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/devices/stm32h735.yaml b/devices/stm32h735.yaml
index 92235d744..06ab4bbb9 100644
--- a/devices/stm32h735.yaml
+++ b/devices/stm32h735.yaml
@@ -443,12 +443,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: