From 7c61d66d750a88c32cf8733db695328a2f295da6 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Mon, 11 Feb 2019 08:39:31 +1100
Subject: [PATCH] HAL_ChibiOS: fixed SPI clocks on H7

---
 libraries/AP_HAL_ChibiOS/SPIDevice.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/libraries/AP_HAL_ChibiOS/SPIDevice.cpp b/libraries/AP_HAL_ChibiOS/SPIDevice.cpp
index 8063d3cc98..328cb8e383 100644
--- a/libraries/AP_HAL_ChibiOS/SPIDevice.cpp
+++ b/libraries/AP_HAL_ChibiOS/SPIDevice.cpp
@@ -34,12 +34,19 @@ extern const AP_HAL::HAL& hal;
 #define SPIDEV_MODE1    SPI_CFG2_CPHA
 #define SPIDEV_MODE2    SPI_CFG2_CPOL
 #define SPIDEV_MODE3    SPI_CFG2_CPOL | SPI_CFG2_CPHA
-#else
+
+#define SPI1_CLOCK  STM32_SPI1CLK
+#define SPI2_CLOCK  STM32_SPI2CLK
+#define SPI3_CLOCK  STM32_SPI3CLK
+#define SPI4_CLOCK  STM32_SPI4CLK
+#define SPI5_CLOCK  STM32_SPI5CLK
+#define SPI6_CLOCK  STM32_SPI6CLK
+
+#else // F4 and F7
 #define SPIDEV_MODE0    0
 #define SPIDEV_MODE1    SPI_CR1_CPHA
 #define SPIDEV_MODE2    SPI_CR1_CPOL
 #define SPIDEV_MODE3    SPI_CR1_CPOL | SPI_CR1_CPHA
-#endif
 
 #define SPI1_CLOCK  STM32_PCLK2
 #define SPI2_CLOCK  STM32_PCLK1
@@ -47,6 +54,7 @@ extern const AP_HAL::HAL& hal;
 #define SPI4_CLOCK  STM32_PCLK2
 #define SPI5_CLOCK  STM32_PCLK2
 #define SPI6_CLOCK  STM32_PCLK2
+#endif
 
 // expected bus clock speeds
 static const uint32_t bus_clocks[6] = {