drivers: counter: stm32: use generic LL headers Use generic LL headers instead of depending on soc.h. Signed-off-by: Martin Jäger <martin@libre.solar>
diff --git a/drivers/counter/counter_ll_stm32_rtc.c b/drivers/counter/counter_ll_stm32_rtc.c index 860fafc..013801d 100644 --- a/drivers/counter/counter_ll_stm32_rtc.c +++ b/drivers/counter/counter_ll_stm32_rtc.c
@@ -18,6 +18,10 @@ #include <sys/util.h> #include <kernel.h> #include <soc.h> +#include <stm32_ll_exti.h> +#include <stm32_ll_pwr.h> +#include <stm32_ll_rcc.h> +#include <stm32_ll_rtc.h> #include <drivers/counter.h> #include <logging/log.h>
diff --git a/soc/arm/st_stm32/stm32f0/soc.h b/soc/arm/st_stm32/stm32f0/soc.h index f2281d2..aba771b 100644 --- a/soc/arm/st_stm32/stm32f0/soc.h +++ b/soc/arm/st_stm32/stm32f0/soc.h
@@ -35,12 +35,6 @@ #include <stm32f0xx_ll_system.h> #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */ -#if defined(CONFIG_COUNTER_RTC_STM32) -#include <stm32f0xx_ll_rtc.h> -#include <stm32f0xx_ll_exti.h> -#include <stm32f0xx_ll_pwr.h> -#endif - #ifdef CONFIG_DMA_STM32 #include <stm32f0xx_ll_dma.h> #endif
diff --git a/soc/arm/st_stm32/stm32f2/soc.h b/soc/arm/st_stm32/stm32f2/soc.h index d5aed98..9d60337 100644 --- a/soc/arm/st_stm32/stm32f2/soc.h +++ b/soc/arm/st_stm32/stm32f2/soc.h
@@ -34,12 +34,6 @@ #include <stm32f2xx_ll_system.h> #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */ -#if defined(CONFIG_COUNTER_RTC_STM32) -#include <stm32f2xx_ll_rtc.h> -#include <stm32f2xx_ll_exti.h> -#include <stm32f2xx_ll_pwr.h> -#endif - #ifdef CONFIG_DMA_STM32 #include <stm32f2xx_ll_dma.h> #endif
diff --git a/soc/arm/st_stm32/stm32f3/soc.h b/soc/arm/st_stm32/stm32f3/soc.h index 89eb5d4..144e5a4 100644 --- a/soc/arm/st_stm32/stm32f3/soc.h +++ b/soc/arm/st_stm32/stm32f3/soc.h
@@ -36,12 +36,6 @@ #include <stm32f3xx_ll_system.h> #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */ -#if defined(CONFIG_COUNTER_RTC_STM32) -#include <stm32f3xx_ll_rtc.h> -#include <stm32f3xx_ll_exti.h> -#include <stm32f3xx_ll_pwr.h> -#endif - #ifdef CONFIG_DMA_STM32 #include <stm32f3xx_ll_dma.h> #endif
diff --git a/soc/arm/st_stm32/stm32f4/soc.h b/soc/arm/st_stm32/stm32f4/soc.h index 92b3378..312125f 100644 --- a/soc/arm/st_stm32/stm32f4/soc.h +++ b/soc/arm/st_stm32/stm32f4/soc.h
@@ -38,12 +38,6 @@ #include <stm32f4xx_ll_system.h> #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */ -#if defined(CONFIG_COUNTER_RTC_STM32) -#include <stm32f4xx_ll_rtc.h> -#include <stm32f4xx_ll_exti.h> -#include <stm32f4xx_ll_pwr.h> -#endif - #ifdef CONFIG_DMA_STM32 #include <stm32f4xx_ll_dma.h> #endif
diff --git a/soc/arm/st_stm32/stm32f7/soc.h b/soc/arm/st_stm32/stm32f7/soc.h index fb13a0e..17e13d7 100644 --- a/soc/arm/st_stm32/stm32f7/soc.h +++ b/soc/arm/st_stm32/stm32f7/soc.h
@@ -38,12 +38,6 @@ #include <stm32f7xx_ll_pwr.h> #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */ -#if defined(CONFIG_COUNTER_RTC_STM32) -#include <stm32f7xx_ll_rtc.h> -#include <stm32f7xx_ll_exti.h> -#include <stm32f7xx_ll_pwr.h> -#endif - #ifdef CONFIG_DMA_STM32 #include <stm32f7xx_ll_dma.h> #endif
diff --git a/soc/arm/st_stm32/stm32g4/soc.h b/soc/arm/st_stm32/stm32g4/soc.h index 689dcef..f87e9ae 100644 --- a/soc/arm/st_stm32/stm32g4/soc.h +++ b/soc/arm/st_stm32/stm32g4/soc.h
@@ -39,12 +39,6 @@ #include <stm32g4xx_ll_exti.h> #endif -#if defined(CONFIG_COUNTER_RTC_STM32) -#include <stm32g4xx_ll_rtc.h> -#include <stm32g4xx_ll_exti.h> -#include <stm32g4xx_ll_pwr.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 d71c381..c4c1697 100644 --- a/soc/arm/st_stm32/stm32h7/soc.h +++ b/soc/arm/st_stm32/stm32h7/soc.h
@@ -44,12 +44,6 @@ #include <stm32h7xx_ll_utils.h> #endif -#ifdef CONFIG_COUNTER_RTC_STM32 -#include <stm32h7xx_ll_rtc.h> -#include <stm32h7xx_ll_exti.h> -#include <stm32h7xx_ll_pwr.h> -#endif /* CONFIG_COUNTER_RTC_STM32 */ - #endif /* !_ASMLANGUAGE */ #endif /* _STM32F7_SOC_H7_ */
diff --git a/soc/arm/st_stm32/stm32l0/soc.h b/soc/arm/st_stm32/stm32l0/soc.h index 8288bdf..c92b2b5 100644 --- a/soc/arm/st_stm32/stm32l0/soc.h +++ b/soc/arm/st_stm32/stm32l0/soc.h
@@ -35,12 +35,6 @@ #include <stm32l0xx_ll_rcc.h> #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */ -#if defined(CONFIG_COUNTER_RTC_STM32) -#include <stm32l0xx_ll_rtc.h> -#include <stm32l0xx_ll_exti.h> -#include <stm32l0xx_ll_pwr.h> -#endif - #ifdef CONFIG_DMA_STM32 #include <stm32l0xx_ll_dma.h> #endif
diff --git a/soc/arm/st_stm32/stm32l1/soc.h b/soc/arm/st_stm32/stm32l1/soc.h index 63d95f2..e7ea95d 100644 --- a/soc/arm/st_stm32/stm32l1/soc.h +++ b/soc/arm/st_stm32/stm32l1/soc.h
@@ -35,12 +35,6 @@ #include <stm32l1xx_ll_exti.h> #endif -#if defined(CONFIG_COUNTER_RTC_STM32) -#include <stm32l1xx_ll_rtc.h> -#include <stm32l1xx_ll_exti.h> -#include <stm32l1xx_ll_pwr.h> -#endif - #endif /* !_ASMLANGUAGE */ #endif /* _STM32L1_SOC_H_ */
diff --git a/soc/arm/st_stm32/stm32l4/soc.h b/soc/arm/st_stm32/stm32l4/soc.h index 1ceb23e..45eea28 100644 --- a/soc/arm/st_stm32/stm32l4/soc.h +++ b/soc/arm/st_stm32/stm32l4/soc.h
@@ -41,12 +41,6 @@ #include <stm32l4xx_ll_pwr.h> #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */ -#if defined(CONFIG_COUNTER_RTC_STM32) -#include <stm32l4xx_ll_rtc.h> -#include <stm32l4xx_ll_exti.h> -#include <stm32l4xx_ll_pwr.h> -#endif - #ifdef CONFIG_USB /* Required to remove USB transceiver supply isolation */ #include <stm32l4xx_ll_pwr.h>
diff --git a/soc/arm/st_stm32/stm32wb/soc.h b/soc/arm/st_stm32/stm32wb/soc.h index 5284044..08214e4 100644 --- a/soc/arm/st_stm32/stm32wb/soc.h +++ b/soc/arm/st_stm32/stm32wb/soc.h
@@ -26,13 +26,6 @@ /* Add include for DTS generated information */ #include <st_stm32_dt.h> -#if defined(CONFIG_COUNTER_RTC_STM32) -#include <stm32wbxx_ll_rtc.h> -#include <stm32wbxx_ll_exti.h> -#include <stm32wbxx_ll_pwr.h> -#include <stm32wbxx_ll_bus.h> -#endif - #ifdef CONFIG_CLOCK_CONTROL_STM32_CUBE #include <stm32wbxx_ll_utils.h> #include <stm32wbxx_ll_bus.h>