From fe303c42cc605e83ec815ef1affb00f129b088d3 Mon Sep 17 00:00:00 2001
From: Erwan Gouriou <erwan.gouriou@linaro.org>
Date: Thu, 10 Oct 2019 11:11:57 +0200
Subject: [PATCH] soc: stm32: replace use of Kconfig I2C by I2C_STM32

For LL header inclusion, use _STM32 Kconfig symbol
(related to the driver), rather than generic symbol,
that could theoretically use an alternate solution.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
---
 soc/arm/st_stm32/stm32f0/soc.h  | 2 +-
 soc/arm/st_stm32/stm32f1/soc.h  | 2 +-
 soc/arm/st_stm32/stm32f3/soc.h  | 2 +-
 soc/arm/st_stm32/stm32f4/soc.h  | 2 +-
 soc/arm/st_stm32/stm32f7/soc.h  | 2 +-
 soc/arm/st_stm32/stm32l1/soc.h  | 2 +-
 soc/arm/st_stm32/stm32l4/soc.h  | 2 +-
 soc/arm/st_stm32/stm32mp1/soc.h | 2 +-
 soc/arm/st_stm32/stm32wb/soc.h  | 5 +++--
 9 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/soc/arm/st_stm32/stm32f0/soc.h b/soc/arm/st_stm32/stm32f0/soc.h
index b0e3be5346d..e3971eccdfc 100644
--- a/soc/arm/st_stm32/stm32f0/soc.h
+++ b/soc/arm/st_stm32/stm32f0/soc.h
@@ -51,7 +51,7 @@
 #include <stm32f0xx_ll_wwdg.h>
 #endif
 
-#ifdef CONFIG_I2C_STM32_V2
+#ifdef CONFIG_I2C_STM32
 #include <stm32f0xx_ll_i2c.h>
 #endif
 
diff --git a/soc/arm/st_stm32/stm32f1/soc.h b/soc/arm/st_stm32/stm32f1/soc.h
index f192986ca01..7f1958c57ec 100644
--- a/soc/arm/st_stm32/stm32f1/soc.h
+++ b/soc/arm/st_stm32/stm32f1/soc.h
@@ -43,7 +43,7 @@
 #include <stm32f1xx_ll_system.h>
 #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */
 
-#ifdef CONFIG_I2C
+#ifdef CONFIG_I2C_STM32
 #include <stm32f1xx_ll_i2c.h>
 #endif
 
diff --git a/soc/arm/st_stm32/stm32f3/soc.h b/soc/arm/st_stm32/stm32f3/soc.h
index 7aeb33c6431..ff572a7b9c3 100644
--- a/soc/arm/st_stm32/stm32f3/soc.h
+++ b/soc/arm/st_stm32/stm32f3/soc.h
@@ -44,7 +44,7 @@
 #include <stm32f3xx_ll_system.h>
 #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */
 
-#ifdef CONFIG_I2C
+#ifdef CONFIG_I2C_STM32
 #include <stm32f3xx_ll_i2c.h>
 #endif
 
diff --git a/soc/arm/st_stm32/stm32f4/soc.h b/soc/arm/st_stm32/stm32f4/soc.h
index 3a785476d31..d0c11ff50dd 100644
--- a/soc/arm/st_stm32/stm32f4/soc.h
+++ b/soc/arm/st_stm32/stm32f4/soc.h
@@ -42,7 +42,7 @@
 #include <stm32f4xx_ll_usart.h>
 #endif
 
-#ifdef CONFIG_I2C
+#ifdef CONFIG_I2C_STM32
 #include <stm32f4xx_ll_i2c.h>
 #endif
 
diff --git a/soc/arm/st_stm32/stm32f7/soc.h b/soc/arm/st_stm32/stm32f7/soc.h
index 74cdbe20d2b..56a7fc534d4 100644
--- a/soc/arm/st_stm32/stm32f7/soc.h
+++ b/soc/arm/st_stm32/stm32f7/soc.h
@@ -41,7 +41,7 @@
 #include <stm32f7xx_ll_usart.h>
 #endif
 
-#ifdef CONFIG_I2C
+#ifdef CONFIG_I2C_STM32
 #include <stm32f7xx_ll_i2c.h>
 #endif
 
diff --git a/soc/arm/st_stm32/stm32l1/soc.h b/soc/arm/st_stm32/stm32l1/soc.h
index 19e0962019b..1879c3599d5 100644
--- a/soc/arm/st_stm32/stm32l1/soc.h
+++ b/soc/arm/st_stm32/stm32l1/soc.h
@@ -47,7 +47,7 @@
 #include <stm32l1xx_ll_exti.h>
 #endif
 
-#ifdef CONFIG_I2C
+#ifdef CONFIG_I2C_STM32
 #include <stm32l1xx_ll_i2c.h>
 #endif
 
diff --git a/soc/arm/st_stm32/stm32l4/soc.h b/soc/arm/st_stm32/stm32l4/soc.h
index 25be37f3d3a..391e4f3090a 100644
--- a/soc/arm/st_stm32/stm32l4/soc.h
+++ b/soc/arm/st_stm32/stm32l4/soc.h
@@ -55,7 +55,7 @@
 #include <stm32l4xx_ll_spi.h>
 #endif
 
-#ifdef CONFIG_I2C
+#ifdef CONFIG_I2C_STM32
 #include <stm32l4xx_ll_i2c.h>
 #endif
 
diff --git a/soc/arm/st_stm32/stm32mp1/soc.h b/soc/arm/st_stm32/stm32mp1/soc.h
index 582e37f9f0d..7c7a54b31ce 100644
--- a/soc/arm/st_stm32/stm32mp1/soc.h
+++ b/soc/arm/st_stm32/stm32mp1/soc.h
@@ -54,7 +54,7 @@
 #include <stm32mp1xx_ll_ipcc.h>
 #endif
 
-#ifdef CONFIG_I2C
+#ifdef CONFIG_I2C_STM32
 #include <stm32mp1xx_ll_i2c.h>
 #endif
 
diff --git a/soc/arm/st_stm32/stm32wb/soc.h b/soc/arm/st_stm32/stm32wb/soc.h
index cfbc248ee9a..a3a2f7c8daa 100644
--- a/soc/arm/st_stm32/stm32wb/soc.h
+++ b/soc/arm/st_stm32/stm32wb/soc.h
@@ -52,9 +52,10 @@
 #ifdef CONFIG_FLASH
 #include <stm32wbxx_ll_hsem.h>
 #endif /* CONFIG_FLASH */
-#ifdef CONFIG_I2C
+
+#ifdef CONFIG_I2C_STM32
 #include <stm32wbxx_ll_i2c.h>
-#endif /* CONFIG_I2C */
+#endif /* CONFIG_I2C_STM32 */
 
 #ifdef CONFIG_SPI_STM32
 #include <stm32wbxx_ll_spi.h>