From f315afd0a78b286e36945f9bd7d300b7abbd3416 Mon Sep 17 00:00:00 2001
From: Erwan Gouriou <erwan.gouriou@linaro.org>
Date: Tue, 29 May 2018 10:06:14 +0200
Subject: [PATCH] arch: stm32: Fix inclusion of SPI headers

In some STM32 series, SPI LL headers where included under
CONFIG_CLOCK_CONTROL_STM32_CUBE flag definition.
Fix this and use CONFIG_SPI_STM32 instead.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
---
 arch/arm/soc/st_stm32/stm32f3/soc.h | 5 ++++-
 arch/arm/soc/st_stm32/stm32f4/soc.h | 5 ++++-
 arch/arm/soc/st_stm32/stm32l4/soc.h | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/arch/arm/soc/st_stm32/stm32f3/soc.h b/arch/arm/soc/st_stm32/stm32f3/soc.h
index 2d09beec7c0..97e783355a6 100644
--- a/arch/arm/soc/st_stm32/stm32f3/soc.h
+++ b/arch/arm/soc/st_stm32/stm32f3/soc.h
@@ -42,13 +42,16 @@
 #include <stm32f3xx_ll_bus.h>
 #include <stm32f3xx_ll_rcc.h>
 #include <stm32f3xx_ll_system.h>
-#include <stm32f3xx_ll_spi.h>
 #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */
 
 #ifdef CONFIG_I2C
 #include <stm32f3xx_ll_i2c.h>
 #endif
 
+#ifdef CONFIG_SPI_STM32
+#include <stm32f3xx_ll_spi.h>
+#endif
+
 #ifdef CONFIG_IWDG_STM32
 #include <stm32f3xx_ll_iwdg.h>
 #endif
diff --git a/arch/arm/soc/st_stm32/stm32f4/soc.h b/arch/arm/soc/st_stm32/stm32f4/soc.h
index 2df5cebb50e..668b38e83c0 100644
--- a/arch/arm/soc/st_stm32/stm32f4/soc.h
+++ b/arch/arm/soc/st_stm32/stm32f4/soc.h
@@ -37,7 +37,6 @@
 #include <stm32f4xx_ll_bus.h>
 #include <stm32f4xx_ll_rcc.h>
 #include <stm32f4xx_ll_system.h>
-#include <stm32f4xx_ll_spi.h>
 #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */
 
 #ifdef CONFIG_SERIAL_HAS_DRIVER
@@ -48,6 +47,10 @@
 #include <stm32f4xx_ll_i2c.h>
 #endif
 
+#ifdef CONFIG_SPI_STM32
+#include <stm32f4xx_ll_spi.h>
+#endif
+
 #ifdef CONFIG_ENTROPY_STM32_RNG
 #include <stm32f4xx_ll_rng.h>
 #endif
diff --git a/arch/arm/soc/st_stm32/stm32l4/soc.h b/arch/arm/soc/st_stm32/stm32l4/soc.h
index e3041a946dd..2ae0897883f 100644
--- a/arch/arm/soc/st_stm32/stm32l4/soc.h
+++ b/arch/arm/soc/st_stm32/stm32l4/soc.h
@@ -41,9 +41,12 @@
 #include <stm32l4xx_ll_bus.h>
 #include <stm32l4xx_ll_rcc.h>
 #include <stm32l4xx_ll_system.h>
-#include <stm32l4xx_ll_spi.h>
 #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */
 
+#ifdef CONFIG_SPI_STM32
+#include <stm32l4xx_ll_spi.h>
+#endif
+
 #ifdef CONFIG_I2C
 #include <stm32l4xx_ll_i2c.h>
 #endif