From 4cfd4a707d196821be59cc49904de3e3c108747d Mon Sep 17 00:00:00 2001
From: Alexander Wachter <alexander@wachter.cloud>
Date: Thu, 20 Feb 2020 12:37:03 +0100
Subject: [PATCH] SoC: stm32: Include LL utilities if HWINFO is selected

Include stm32XXxx_ll_utils.h in soc.h for every stm32 SoC,
if CONFIG_HWINFO_STM32 is selected.

Signed-off-by: Alexander Wachter <alexander@wachter.cloud>
---
 drivers/hwinfo/Kconfig         | 1 -
 soc/arm/st_stm32/stm32f0/soc.h | 4 ++++
 soc/arm/st_stm32/stm32f1/soc.h | 4 ++++
 soc/arm/st_stm32/stm32f2/soc.h | 4 ++++
 soc/arm/st_stm32/stm32f3/soc.h | 4 ++++
 soc/arm/st_stm32/stm32f4/soc.h | 4 ++++
 soc/arm/st_stm32/stm32f7/soc.h | 4 ++++
 soc/arm/st_stm32/stm32g0/soc.h | 4 ++++
 soc/arm/st_stm32/stm32g4/soc.h | 4 ++++
 soc/arm/st_stm32/stm32h7/soc.h | 4 ++++
 10 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/drivers/hwinfo/Kconfig b/drivers/hwinfo/Kconfig
index 737bb481980..82be51b664b 100644
--- a/drivers/hwinfo/Kconfig
+++ b/drivers/hwinfo/Kconfig
@@ -23,7 +23,6 @@ config HWINFO_STM32
 	bool "STM32 hwinfo"
 	default y
 	depends on SOC_FAMILY_STM32
-	select USE_STM32_LL_UTILS
 	select HWINFO_HAS_DRIVER
 	help
 	  Enable STM32 hwinfo driver.
diff --git a/soc/arm/st_stm32/stm32f0/soc.h b/soc/arm/st_stm32/stm32f0/soc.h
index 76bd99ce6c7..21dd6653aa8 100644
--- a/soc/arm/st_stm32/stm32f0/soc.h
+++ b/soc/arm/st_stm32/stm32f0/soc.h
@@ -71,6 +71,10 @@
 #include <stm32f0xx_ll_dma.h>
 #endif
 
+#ifdef CONFIG_HWINFO_STM32
+#include <stm32f0xx_ll_utils.h>
+#endif
+
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _STM32F0_SOC_H_ */
diff --git a/soc/arm/st_stm32/stm32f1/soc.h b/soc/arm/st_stm32/stm32f1/soc.h
index 3e68da54fe9..439c8d334ad 100644
--- a/soc/arm/st_stm32/stm32f1/soc.h
+++ b/soc/arm/st_stm32/stm32f1/soc.h
@@ -71,6 +71,10 @@
 #include <stm32f1xx_ll_dma.h>
 #endif
 
+#ifdef CONFIG_HWINFO_STM32
+#include <stm32f1xx_ll_utils.h>
+#endif
+
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _STM32F1_SOC_H_ */
diff --git a/soc/arm/st_stm32/stm32f2/soc.h b/soc/arm/st_stm32/stm32f2/soc.h
index fa978115854..32e0ebb5ff8 100644
--- a/soc/arm/st_stm32/stm32f2/soc.h
+++ b/soc/arm/st_stm32/stm32f2/soc.h
@@ -62,6 +62,10 @@
 #include <stm32f2xx_ll_dma.h>
 #endif
 
+#ifdef CONFIG_HWINFO_STM32
+#include <stm32f2xx_ll_utils.h>
+#endif
+
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _STM32F2_SOC_H_ */
diff --git a/soc/arm/st_stm32/stm32f3/soc.h b/soc/arm/st_stm32/stm32f3/soc.h
index 29c8fa7a5f5..4f328a13afc 100644
--- a/soc/arm/st_stm32/stm32f3/soc.h
+++ b/soc/arm/st_stm32/stm32f3/soc.h
@@ -78,6 +78,10 @@
 #include <stm32f3xx_ll_dma.h>
 #endif
 
+#ifdef CONFIG_HWINFO_STM32
+#include <stm32f3xx_ll_utils.h>
+#endif
+
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _STM32F3_SOC_H_ */
diff --git a/soc/arm/st_stm32/stm32f4/soc.h b/soc/arm/st_stm32/stm32f4/soc.h
index 949c4f83d18..fdfdbec5fe1 100644
--- a/soc/arm/st_stm32/stm32f4/soc.h
+++ b/soc/arm/st_stm32/stm32f4/soc.h
@@ -80,6 +80,10 @@
 #include <stm32f4xx_ll_dma.h>
 #endif
 
+#ifdef CONFIG_HWINFO_STM32
+#include <stm32f4xx_ll_utils.h>
+#endif
+
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _STM32F4_SOC_H_ */
diff --git a/soc/arm/st_stm32/stm32f7/soc.h b/soc/arm/st_stm32/stm32f7/soc.h
index d04704d52ee..24cac826620 100644
--- a/soc/arm/st_stm32/stm32f7/soc.h
+++ b/soc/arm/st_stm32/stm32f7/soc.h
@@ -79,6 +79,10 @@
 #include <stm32f7xx_ll_dma.h>
 #endif
 
+#ifdef CONFIG_HWINFO_STM32
+#include <stm32f7xx_ll_utils.h>
+#endif
+
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _STM32F7_SOC_H_ */
diff --git a/soc/arm/st_stm32/stm32g0/soc.h b/soc/arm/st_stm32/stm32g0/soc.h
index 3b12f87bfdb..00de3518792 100644
--- a/soc/arm/st_stm32/stm32g0/soc.h
+++ b/soc/arm/st_stm32/stm32g0/soc.h
@@ -52,6 +52,10 @@
 #include <stm32g0xx_ll_usart.h>
 #endif
 
+#ifdef CONFIG_HWINFO_STM32
+#include <stm32g0xx_ll_utils.h>
+#endif
+
 /* Add include for DTS generated information */
 #include <devicetree.h>
 
diff --git a/soc/arm/st_stm32/stm32g4/soc.h b/soc/arm/st_stm32/stm32g4/soc.h
index e4279204e9e..3a6a9c9d547 100644
--- a/soc/arm/st_stm32/stm32g4/soc.h
+++ b/soc/arm/st_stm32/stm32g4/soc.h
@@ -78,6 +78,10 @@
 #include <stm32g4xx_ll_pwr.h>
 #endif
 
+#ifdef CONFIG_HWINFO_STM32
+#include <stm32g4xx_ll_utils.h>
+#endif
+
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _STM32G4_SOC_H_ */
diff --git a/soc/arm/st_stm32/stm32h7/soc.h b/soc/arm/st_stm32/stm32h7/soc.h
index 3bda6ecc21d..08a25129901 100644
--- a/soc/arm/st_stm32/stm32h7/soc.h
+++ b/soc/arm/st_stm32/stm32h7/soc.h
@@ -60,6 +60,10 @@
 #include <stm32h7xx_ll_usart.h>
 #endif /* CONFIG_SERIAL_HAS_DRIVER */
 
+#ifdef CONFIG_HWINFO_STM32
+#include <stm32h7xx_ll_utils.h>
+#endif
+
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _STM32F7_SOC_H7_ */