From 8e8d49a6202a472513354b1db27d2b4ffd23faa5 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 5 Jul 2017 11:04:06 -0500 Subject: [PATCH] i2c: stm32: Cleanup how we enable the specific I2C driver Right now we allow for the I2C subsystem to be built without any drivers enabled that utilize it. When we added support for the new STM32 I2C driver we forced the I2C driver to be enabled if the I2C subsystem was enabled. While this makes a reasonable amount of sense, it breaks current assumptions for various testcases that we need to cleanup. Signed-off-by: Kumar Gala --- arch/arm/soc/st_stm32/stm32f1/Kconfig.series | 1 - arch/arm/soc/st_stm32/stm32f3/Kconfig.series | 1 - arch/arm/soc/st_stm32/stm32f4/Kconfig.series | 1 - arch/arm/soc/st_stm32/stm32l4/Kconfig.series | 1 - boards/arm/96b_carbon/96b_carbon_defconfig | 1 + boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig | 1 + boards/arm/nucleo_f401re/nucleo_f401re_defconfig | 1 + boards/arm/olimexino_stm32/olimexino_stm32_defconfig | 1 + 8 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/soc/st_stm32/stm32f1/Kconfig.series b/arch/arm/soc/st_stm32/stm32f1/Kconfig.series index 2ee2f500ec2..d9863ba0194 100644 --- a/arch/arm/soc/st_stm32/stm32f1/Kconfig.series +++ b/arch/arm/soc/st_stm32/stm32f1/Kconfig.series @@ -14,6 +14,5 @@ config SOC_SERIES_STM32F1X select HAS_STM32CUBE select CPU_HAS_SYSTICK select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL - select I2C_STM32_V1 if I2C help Enable support for STM32F1 MCU series diff --git a/arch/arm/soc/st_stm32/stm32f3/Kconfig.series b/arch/arm/soc/st_stm32/stm32f3/Kconfig.series index 1aa5b782bc3..153b1a6adfe 100644 --- a/arch/arm/soc/st_stm32/stm32f3/Kconfig.series +++ b/arch/arm/soc/st_stm32/stm32f3/Kconfig.series @@ -15,6 +15,5 @@ config SOC_SERIES_STM32F3X select CPU_HAS_SYSTICK select HAS_STM32CUBE select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL - select I2C_STM32_V2 if I2C help Enable support for STM32F3 MCU series diff --git a/arch/arm/soc/st_stm32/stm32f4/Kconfig.series b/arch/arm/soc/st_stm32/stm32f4/Kconfig.series index 0c6d15aa152..0182d1d314b 100644 --- a/arch/arm/soc/st_stm32/stm32f4/Kconfig.series +++ b/arch/arm/soc/st_stm32/stm32f4/Kconfig.series @@ -16,6 +16,5 @@ config SOC_SERIES_STM32F4X select CPU_HAS_MPU select CPU_HAS_SYSTICK select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL - select I2C_STM32_V1 if I2C help Enable support for STM32F4 MCU series diff --git a/arch/arm/soc/st_stm32/stm32l4/Kconfig.series b/arch/arm/soc/st_stm32/stm32l4/Kconfig.series index abd61a82d80..a7e2c5b1ee2 100644 --- a/arch/arm/soc/st_stm32/stm32l4/Kconfig.series +++ b/arch/arm/soc/st_stm32/stm32l4/Kconfig.series @@ -15,6 +15,5 @@ config SOC_SERIES_STM32L4X select CPU_HAS_MPU select CPU_HAS_SYSTICK select CLOCK_CONTROL_STM32_CUBE if CLOCK_CONTROL - select I2C_STM32_V2 if I2C help Enable support for STM32L4 MCU series diff --git a/boards/arm/96b_carbon/96b_carbon_defconfig b/boards/arm/96b_carbon/96b_carbon_defconfig index 7f2b12a2082..530cbc6e567 100644 --- a/boards/arm/96b_carbon/96b_carbon_defconfig +++ b/boards/arm/96b_carbon/96b_carbon_defconfig @@ -16,6 +16,7 @@ CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_1" # enable I2C1 CONFIG_I2C=y +CONFIG_I2C_STM32_V1=y # enable pinmux CONFIG_PINMUX=y diff --git a/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig b/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig index e12f3a2c1df..cea2550d039 100644 --- a/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig +++ b/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig @@ -49,6 +49,7 @@ CONFIG_STM32_ARM_MPU_ENABLE=y #enable I2C CONFIG_I2C=y +CONFIG_I2C_STM32_V2=y #configure HTS221 sensor CONFIG_HTS221_I2C_MASTER_DEV_NAME="I2C_2" diff --git a/boards/arm/nucleo_f401re/nucleo_f401re_defconfig b/boards/arm/nucleo_f401re/nucleo_f401re_defconfig index e58d73f3891..792de1e7a0f 100644 --- a/boards/arm/nucleo_f401re/nucleo_f401re_defconfig +++ b/boards/arm/nucleo_f401re/nucleo_f401re_defconfig @@ -47,3 +47,4 @@ CONFIG_PWM_STM32_2=y #enable I2C CONFIG_I2C=y +CONFIG_I2C_STM32_V1=y diff --git a/boards/arm/olimexino_stm32/olimexino_stm32_defconfig b/boards/arm/olimexino_stm32/olimexino_stm32_defconfig index 098773f2f75..d28178814fd 100644 --- a/boards/arm/olimexino_stm32/olimexino_stm32_defconfig +++ b/boards/arm/olimexino_stm32/olimexino_stm32_defconfig @@ -19,6 +19,7 @@ CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_1" # enable I2C driver CONFIG_I2C=y +CONFIG_I2C_STM32_V1=y # enable pinmux CONFIG_PINMUX=y