From 669e0f3b32712f89e4f6a5b339a56ed4e6b0302b Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 22 Oct 2019 08:22:35 -0500 Subject: [PATCH] i2c: Move how we set HAS_DTS_I2C Now that all I2C drivers utilize DTS we can select HAS_DTS_I2C in a common place and don't need to do it per driver. Signed-off-by: Kumar Gala --- boards/arm/efm32pg_stk3402a/Kconfig.board | 1 - boards/arm/efr32mg_sltb004a/Kconfig.board | 1 - boards/riscv/hifive1_revb/Kconfig.defconfig | 3 --- drivers/i2c/Kconfig | 9 +-------- drivers/i2c/Kconfig.cc13xx_cc26xx | 1 - drivers/i2c/Kconfig.dw | 1 - drivers/i2c/Kconfig.esp32 | 1 - drivers/i2c/Kconfig.nrfx | 1 - drivers/i2c/Kconfig.sam0 | 1 - drivers/i2c/Kconfig.sbcon | 1 - drivers/i2c/Kconfig.sifive | 1 - drivers/i2c/Kconfig.stm32 | 2 -- drivers/i2c/Kconfig.xec | 1 - 13 files changed, 1 insertion(+), 23 deletions(-) diff --git a/boards/arm/efm32pg_stk3402a/Kconfig.board b/boards/arm/efm32pg_stk3402a/Kconfig.board index 7726fb0f6e4..291dd3fd483 100644 --- a/boards/arm/efm32pg_stk3402a/Kconfig.board +++ b/boards/arm/efm32pg_stk3402a/Kconfig.board @@ -9,4 +9,3 @@ config BOARD_EFM32PG_STK3402A bool "SiLabs EFM32PG-STK3402A (Pearl Gecko)" depends on SOC_SERIES_EFM32PG12B select SOC_PART_NUMBER_EFM32PG12B500F1024GL125 - select HAS_DTS_I2C diff --git a/boards/arm/efr32mg_sltb004a/Kconfig.board b/boards/arm/efr32mg_sltb004a/Kconfig.board index 8cf0eb9ad16..4e12e5ea5b2 100644 --- a/boards/arm/efr32mg_sltb004a/Kconfig.board +++ b/boards/arm/efr32mg_sltb004a/Kconfig.board @@ -9,4 +9,3 @@ config BOARD_EFR32MG_SLTB004A bool "SiLabs EFR32MG-SLTB004A (Thunderboard Sense 2)" depends on SOC_SERIES_EFR32MG12P select SOC_PART_NUMBER_EFR32MG12P332F1024GL125 - select HAS_DTS_I2C diff --git a/boards/riscv/hifive1_revb/Kconfig.defconfig b/boards/riscv/hifive1_revb/Kconfig.defconfig index a8c31a1e4b6..afd5e19682d 100644 --- a/boards/riscv/hifive1_revb/Kconfig.defconfig +++ b/boards/riscv/hifive1_revb/Kconfig.defconfig @@ -29,7 +29,4 @@ config I2C_SIFIVE default y endif -config HAS_DTS_I2C - default y - endif diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index f6d7004edcc..468e683f84b 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -11,6 +11,7 @@ # menuconfig I2C bool "I2C Drivers" + select HAS_DTS_I2C help Enable I2C Driver Configuration @@ -76,42 +77,36 @@ config I2C_GECKO config I2C_SAM_TWIHS bool "Atmel SAM (TWIHS) I2C driver" depends on SOC_FAMILY_SAM - select HAS_DTS_I2C help Enable Atmel SAM MCU Family (TWIHS) I2C bus driver. config I2C_SAM_TWI bool "Atmel SAM (TWI) I2C driver" depends on SOC_FAMILY_SAM - select HAS_DTS_I2C help Enable Atmel SAM MCU Family (TWI) I2C bus driver. config I2C_MCUX bool "MCUX I2C driver" depends on HAS_MCUX - select HAS_DTS_I2C help Enable the mcux I2C driver. config I2C_MCUX_LPI2C bool "MCUX LPI2C driver" depends on HAS_MCUX_LPI2C && CLOCK_CONTROL - select HAS_DTS_I2C help Enable the mcux LPI2C driver. config I2C_IMX bool "i.MX I2C driver" depends on HAS_IMX_I2C - select HAS_DTS_I2C help Enable the i.MX I2C driver. config I2C_CC32XX bool "CC32XX I2C driver" depends on SOC_SERIES_CC32XX - select HAS_DTS_I2C help Enable the CC32XX I2C driver. @@ -123,7 +118,6 @@ config I2C_BITBANG config I2C_NIOS2 bool "Nios-II I2C driver" depends on HAS_ALTERA_HAL - select HAS_DTS_I2C help Enable the Nios-II I2C driver. @@ -136,7 +130,6 @@ config I2C_0_IRQ_PRI config I2C_RV32M1_LPI2C bool "RV32M1 LPI2C driver" depends on HAS_RV32M1_LPI2C && CLOCK_CONTROL - select HAS_DTS_I2C help Enable the RV32M1 LPI2C driver. diff --git a/drivers/i2c/Kconfig.cc13xx_cc26xx b/drivers/i2c/Kconfig.cc13xx_cc26xx index 352a8cb4503..e4bb099afd9 100644 --- a/drivers/i2c/Kconfig.cc13xx_cc26xx +++ b/drivers/i2c/Kconfig.cc13xx_cc26xx @@ -7,6 +7,5 @@ config I2C_CC13XX_CC26XX bool "TI SimpleLink CC13xx / CC26xx I2C driver" depends on SOC_SERIES_CC13X2_CC26X2 - select HAS_DTS_I2C help Enable support for I2C on the TI SimpleLink CC13xx / CC26xx series. diff --git a/drivers/i2c/Kconfig.dw b/drivers/i2c/Kconfig.dw index 04aa318c0b4..e39abd13c88 100644 --- a/drivers/i2c/Kconfig.dw +++ b/drivers/i2c/Kconfig.dw @@ -11,7 +11,6 @@ config HAS_I2C_DW menuconfig I2C_DW bool "Design Ware I2C support" - select HAS_DTS_I2C depends on HAS_I2C_DW help Enable the Design Ware I2C driver diff --git a/drivers/i2c/Kconfig.esp32 b/drivers/i2c/Kconfig.esp32 index 5200607bb34..d1427c4d3fb 100644 --- a/drivers/i2c/Kconfig.esp32 +++ b/drivers/i2c/Kconfig.esp32 @@ -10,7 +10,6 @@ menuconfig I2C_ESP32 bool "ESP32 I2C" depends on SOC_ESP32 select GPIO_ESP32 - select HAS_DTS_I2C help Enables the ESP32 I2C driver diff --git a/drivers/i2c/Kconfig.nrfx b/drivers/i2c/Kconfig.nrfx index 66ea2b4c576..81c2c7cdf93 100644 --- a/drivers/i2c/Kconfig.nrfx +++ b/drivers/i2c/Kconfig.nrfx @@ -9,7 +9,6 @@ menuconfig I2C_NRFX bool "nRF TWI nrfx drivers" default y depends on SOC_FAMILY_NRF - select HAS_DTS_I2C help Enable support for nrfx TWI drivers for nRF MCU series. Peripherals with the same instance ID cannot be used together, diff --git a/drivers/i2c/Kconfig.sam0 b/drivers/i2c/Kconfig.sam0 index 9e0b39456f6..6ee4d62dd13 100644 --- a/drivers/i2c/Kconfig.sam0 +++ b/drivers/i2c/Kconfig.sam0 @@ -9,7 +9,6 @@ if SOC_FAMILY_SAM0 menuconfig I2C_SAM0 bool "SAM0 series I2C SERCOM driver" default y - select HAS_DTS_I2C help Enable the SAM0 series SERCOM I2C driver. diff --git a/drivers/i2c/Kconfig.sbcon b/drivers/i2c/Kconfig.sbcon index c56be89cd25..dc70361456b 100644 --- a/drivers/i2c/Kconfig.sbcon +++ b/drivers/i2c/Kconfig.sbcon @@ -8,4 +8,3 @@ config I2C_SBCON bool "I2C driver for ARM's SBCon two-wire serial bus interface" depends on ARM select I2C_BITBANG - select HAS_DTS_I2C diff --git a/drivers/i2c/Kconfig.sifive b/drivers/i2c/Kconfig.sifive index fa2584b807b..6e8ccc5c1d0 100644 --- a/drivers/i2c/Kconfig.sifive +++ b/drivers/i2c/Kconfig.sifive @@ -7,6 +7,5 @@ config I2C_SIFIVE bool "Sifive I2C driver" depends on SOC_SERIES_RISCV_SIFIVE_FREEDOM - depends on HAS_DTS_I2C help Enable I2C support on SiFive Freedom diff --git a/drivers/i2c/Kconfig.stm32 b/drivers/i2c/Kconfig.stm32 index 1282f997abc..3265d6d715b 100644 --- a/drivers/i2c/Kconfig.stm32 +++ b/drivers/i2c/Kconfig.stm32 @@ -15,7 +15,6 @@ if I2C_STM32 config I2C_STM32_V1 bool depends on SOC_SERIES_STM32F1X || SOC_SERIES_STM32F4X || SOC_SERIES_STM32L1X - select HAS_DTS_I2C select USE_STM32_LL_I2C select I2C_STM32_INTERRUPT if I2C_SLAVE help @@ -25,7 +24,6 @@ config I2C_STM32_V1 config I2C_STM32_V2 bool depends on SOC_SERIES_STM32F0X || SOC_SERIES_STM32F3X || SOC_SERIES_STM32F7X || SOC_SERIES_STM32L0X || SOC_SERIES_STM32L4X || SOC_SERIES_STM32WBX || SOC_SERIES_STM32MP1X || SOC_SERIES_STM32G4X - select HAS_DTS_I2C select USE_STM32_LL_I2C select USE_STM32_LL_RCC if SOC_SERIES_STM32F0X || SOC_SERIES_STM32F3X select I2C_STM32_INTERRUPT if I2C_SLAVE diff --git a/drivers/i2c/Kconfig.xec b/drivers/i2c/Kconfig.xec index a3bd6fdfa48..bb409683938 100644 --- a/drivers/i2c/Kconfig.xec +++ b/drivers/i2c/Kconfig.xec @@ -8,7 +8,6 @@ menuconfig I2C_XEC bool "XEC Microchip I2C driver" depends on SOC_FAMILY_MEC - select HAS_DTS_I2C help Enable the Microchip XEC I2C driver.