From 220ddb9738b2bbf7b0ab4a02900983a7b4b70e0b Mon Sep 17 00:00:00 2001
From: Yannis Damigos <giannis.damigos@gmail.com>
Date: Fri, 23 Jun 2017 11:27:17 +0200
Subject: [PATCH] soc: stm32: F1/F3/F4/L4: enable I2C LL

Signed-off-by: Yannis Damigos <giannis.damigos@gmail.com>
Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
---
 arch/arm/soc/st_stm32/stm32f1/soc.h | 4 ++++
 arch/arm/soc/st_stm32/stm32f3/soc.h | 4 ++++
 arch/arm/soc/st_stm32/stm32f4/soc.h | 4 ++++
 arch/arm/soc/st_stm32/stm32l4/soc.h | 4 ++++
 ext/hal/st/stm32cube/Kbuild         | 3 +++
 5 files changed, 19 insertions(+)

diff --git a/arch/arm/soc/st_stm32/stm32f1/soc.h b/arch/arm/soc/st_stm32/stm32f1/soc.h
index 1612a8261ef..88380e8d33b 100644
--- a/arch/arm/soc/st_stm32/stm32f1/soc.h
+++ b/arch/arm/soc/st_stm32/stm32f1/soc.h
@@ -56,6 +56,10 @@ enum stm32f10x_pin_config_mode {
 #include <stm32f1xx_ll_system.h>
 #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */
 
+#ifdef CONFIG_I2C
+#include <stm32f1xx_ll_i2c.h>
+#endif
+
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _STM32F1_SOC_H_ */
diff --git a/arch/arm/soc/st_stm32/stm32f3/soc.h b/arch/arm/soc/st_stm32/stm32f3/soc.h
index 85bdd58cd9b..15323d2faf0 100644
--- a/arch/arm/soc/st_stm32/stm32f3/soc.h
+++ b/arch/arm/soc/st_stm32/stm32f3/soc.h
@@ -59,6 +59,10 @@ enum stm32f3x_pin_config_mode {
 #include <stm32f3xx_ll_system.h>
 #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */
 
+#ifdef CONFIG_I2C
+#include <stm32f3xx_ll_i2c.h>
+#endif
+
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _STM32F3_SOC_H_ */
diff --git a/arch/arm/soc/st_stm32/stm32f4/soc.h b/arch/arm/soc/st_stm32/stm32f4/soc.h
index d611d1b07e5..50aab46d3c6 100644
--- a/arch/arm/soc/st_stm32/stm32f4/soc.h
+++ b/arch/arm/soc/st_stm32/stm32f4/soc.h
@@ -59,6 +59,10 @@ enum stm32f4x_pin_config_mode {
 #include <stm32f4xx_ll_system.h>
 #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */
 
+#ifdef CONFIG_I2C
+#include <stm32f4xx_ll_i2c.h>
+#endif
+
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _STM32F4_SOC_H_ */
diff --git a/arch/arm/soc/st_stm32/stm32l4/soc.h b/arch/arm/soc/st_stm32/stm32l4/soc.h
index 2b86ce753ce..b40b2029bb4 100644
--- a/arch/arm/soc/st_stm32/stm32l4/soc.h
+++ b/arch/arm/soc/st_stm32/stm32l4/soc.h
@@ -42,6 +42,10 @@
 #include <stm32l4xx_ll_system.h>
 #endif /* CONFIG_CLOCK_CONTROL_STM32_CUBE */
 
+#ifdef CONFIG_I2C
+#include <stm32l4xx_ll_i2c.h>
+#endif
+
 #endif /* !_ASMLANGUAGE */
 
 #endif /* _STM32L4X_SOC_H_ */
diff --git a/ext/hal/st/stm32cube/Kbuild b/ext/hal/st/stm32cube/Kbuild
index a0c8be8f2fd..08eb37581ab 100644
--- a/ext/hal/st/stm32cube/Kbuild
+++ b/ext/hal/st/stm32cube/Kbuild
@@ -6,6 +6,7 @@ obj-y += stm32f1xx/drivers/src/stm32f1xx_hal_rcc.o
 obj-$(CONFIG_CLOCK_CONTROL_STM32_CUBE) += stm32f1xx/drivers/src/stm32f1xx_ll_utils.o
 obj-$(CONFIG_PWM) += stm32f1xx/drivers/src/stm32f1xx_hal_tim.o
 obj-$(CONFIG_SERIAL_HAS_DRIVER) += stm32f1xx/drivers/src/stm32f1xx_hal_uart.o
+obj-$(CONFIG_I2C) += stm32f1xx/drivers/src/stm32f1xx_ll_i2c.o
 obj-y += stm32f1xx/soc/system_stm32f1xx.o
 endif
 
@@ -23,6 +24,7 @@ obj-y += stm32f4xx/drivers/src/stm32f4xx_hal_rcc.o
 obj-$(CONFIG_CLOCK_CONTROL_STM32_CUBE) += stm32f4xx/drivers/src/stm32f4xx_ll_utils.o
 obj-$(CONFIG_PWM) += stm32f4xx/drivers/src/stm32f4xx_hal_tim.o
 obj-$(CONFIG_SERIAL_HAS_DRIVER) += stm32f4xx/drivers/src/stm32f4xx_hal_uart.o
+obj-$(CONFIG_I2C) += stm32f4xx/drivers/src/stm32f4xx_ll_i2c.o
 obj-y += stm32f4xx/soc/system_stm32f4xx.o
 endif
 
@@ -37,6 +39,7 @@ obj-y += stm32l4xx/drivers/src/stm32l4xx_hal_rcc.o
 obj-$(CONFIG_CLOCK_CONTROL_STM32_CUBE) += stm32l4xx/drivers/src/stm32l4xx_ll_utils.o
 obj-$(CONFIG_PWM) += stm32l4xx/drivers/src/stm32l4xx_hal_tim.o
 obj-$(CONFIG_SERIAL_HAS_DRIVER) += stm32l4xx/drivers/src/stm32l4xx_hal_uart.o
+obj-$(CONFIG_I2C) += stm32l4xx/drivers/src/stm32l4xx_ll_i2c.o
 obj-y += stm32l4xx/soc/system_stm32l4xx.o
 endif