From 39d388287f2aba66bf2cbd29bfaceb346db06781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20J=C3=A4ger?= <martin@libre.solar>
Date: Fri, 20 Nov 2020 15:47:51 +0100
Subject: [PATCH] drivers: hwinfo: stm32: use generic LL headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use generic LL headers instead of depending on soc.h.

Signed-off-by: Martin Jäger <martin@libre.solar>
---
 drivers/hwinfo/hwinfo_stm32.c  | 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 | 2 +-
 10 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/drivers/hwinfo/hwinfo_stm32.c b/drivers/hwinfo/hwinfo_stm32.c
index 988f7bb28d6..70faeda7957 100644
--- a/drivers/hwinfo/hwinfo_stm32.c
+++ b/drivers/hwinfo/hwinfo_stm32.c
@@ -5,6 +5,7 @@
  */
 
 #include <soc.h>
+#include <stm32_ll_utils.h>
 #include <drivers/hwinfo.h>
 #include <string.h>
 #include <sys/byteorder.h>
diff --git a/soc/arm/st_stm32/stm32f0/soc.h b/soc/arm/st_stm32/stm32f0/soc.h
index ffc98d8b003..fbdf0b509dd 100644
--- a/soc/arm/st_stm32/stm32f0/soc.h
+++ b/soc/arm/st_stm32/stm32f0/soc.h
@@ -57,10 +57,6 @@
 #include <stm32f0xx_ll_dma.h>
 #endif
 
-#ifdef CONFIG_HWINFO_STM32
-#include <stm32f0xx_ll_utils.h>
-#endif
-
 #ifdef CONFIG_PWM_STM32
 #include <stm32f0xx_ll_tim.h>
 #endif /* CONFIG_PWM_STM32 */
diff --git a/soc/arm/st_stm32/stm32f1/soc.h b/soc/arm/st_stm32/stm32f1/soc.h
index ab300ade8bd..1b6a21f5b16 100644
--- a/soc/arm/st_stm32/stm32f1/soc.h
+++ b/soc/arm/st_stm32/stm32f1/soc.h
@@ -51,10 +51,6 @@
 #include <stm32f1xx_ll_dma.h>
 #endif
 
-#ifdef CONFIG_HWINFO_STM32
-#include <stm32f1xx_ll_utils.h>
-#endif
-
 #ifdef CONFIG_PWM_STM32
 #include <stm32f1xx_ll_tim.h>
 #endif /* CONFIG_PWM_STM32 */
diff --git a/soc/arm/st_stm32/stm32f2/soc.h b/soc/arm/st_stm32/stm32f2/soc.h
index 9fe9c4f54fd..ed4ace32611 100644
--- a/soc/arm/st_stm32/stm32f2/soc.h
+++ b/soc/arm/st_stm32/stm32f2/soc.h
@@ -48,10 +48,6 @@
 #include <stm32f2xx_ll_dma.h>
 #endif
 
-#ifdef CONFIG_HWINFO_STM32
-#include <stm32f2xx_ll_utils.h>
-#endif
-
 #ifdef CONFIG_PWM_STM32
 #include <stm32f2xx_ll_tim.h>
 #endif /* CONFIG_PWM_STM32 */
diff --git a/soc/arm/st_stm32/stm32f3/soc.h b/soc/arm/st_stm32/stm32f3/soc.h
index 89b87643aa8..cba4c768531 100644
--- a/soc/arm/st_stm32/stm32f3/soc.h
+++ b/soc/arm/st_stm32/stm32f3/soc.h
@@ -58,10 +58,6 @@
 #include <stm32f3xx_ll_dma.h>
 #endif
 
-#ifdef CONFIG_HWINFO_STM32
-#include <stm32f3xx_ll_utils.h>
-#endif
-
 #ifdef CONFIG_PWM_STM32
 #include <stm32f3xx_ll_tim.h>
 #endif /* CONFIG_PWM_STM32 */
diff --git a/soc/arm/st_stm32/stm32f4/soc.h b/soc/arm/st_stm32/stm32f4/soc.h
index 2d9866bb126..b657d1e983a 100644
--- a/soc/arm/st_stm32/stm32f4/soc.h
+++ b/soc/arm/st_stm32/stm32f4/soc.h
@@ -60,10 +60,6 @@
 #include <stm32f4xx_ll_dma.h>
 #endif
 
-#ifdef CONFIG_HWINFO_STM32
-#include <stm32f4xx_ll_utils.h>
-#endif
-
 #ifdef CONFIG_PWM_STM32
 #include <stm32f4xx_ll_tim.h>
 #endif /* CONFIG_PWM_STM32 */
diff --git a/soc/arm/st_stm32/stm32f7/soc.h b/soc/arm/st_stm32/stm32f7/soc.h
index 7b52737d46e..8a49ddf51e9 100644
--- a/soc/arm/st_stm32/stm32f7/soc.h
+++ b/soc/arm/st_stm32/stm32f7/soc.h
@@ -60,10 +60,6 @@
 #include <stm32f7xx_ll_dma.h>
 #endif
 
-#ifdef CONFIG_HWINFO_STM32
-#include <stm32f7xx_ll_utils.h>
-#endif
-
 #ifdef CONFIG_PWM_STM32
 #include <stm32f7xx_ll_tim.h>
 #endif /* CONFIG_PWM_STM32 */
diff --git a/soc/arm/st_stm32/stm32g0/soc.h b/soc/arm/st_stm32/stm32g0/soc.h
index 8dd2e87d856..3e358974cf2 100644
--- a/soc/arm/st_stm32/stm32g0/soc.h
+++ b/soc/arm/st_stm32/stm32g0/soc.h
@@ -47,10 +47,6 @@
 #include <stm32g0xx_ll_i2c.h>
 #endif
 
-#ifdef CONFIG_HWINFO_STM32
-#include <stm32g0xx_ll_utils.h>
-#endif
-
 #ifdef CONFIG_PWM_STM32
 #include <stm32g0xx_ll_tim.h>
 #endif /* CONFIG_PWM_STM32 */
diff --git a/soc/arm/st_stm32/stm32g4/soc.h b/soc/arm/st_stm32/stm32g4/soc.h
index 7510791e85f..9438fcd2de9 100644
--- a/soc/arm/st_stm32/stm32g4/soc.h
+++ b/soc/arm/st_stm32/stm32g4/soc.h
@@ -57,10 +57,6 @@
 #include <stm32g4xx_ll_pwr.h>
 #endif
 
-#ifdef CONFIG_HWINFO_STM32
-#include <stm32g4xx_ll_utils.h>
-#endif
-
 #ifdef CONFIG_PWM_STM32
 #include <stm32g4xx_ll_tim.h>
 #endif /* CONFIG_PWM_STM32 */
diff --git a/soc/arm/st_stm32/stm32h7/soc.h b/soc/arm/st_stm32/stm32h7/soc.h
index 80aaecae5ee..3095388ce10 100644
--- a/soc/arm/st_stm32/stm32h7/soc.h
+++ b/soc/arm/st_stm32/stm32h7/soc.h
@@ -45,7 +45,7 @@
 #include <stm32h7xx_ll_system.h>
 #endif /* CONFIG_GPIO_STM32 */
 
-#if defined(CONFIG_HWINFO_STM32) || defined(CONFIG_CLOCK_CONTROL_STM32_CUBE)
+#if defined(CONFIG_CLOCK_CONTROL_STM32_CUBE)
 #include <stm32h7xx_ll_utils.h>
 #endif