michaelh/zephyr
1
0
Fork 0
Code Releases Activity

i2c: remove Kconfig.defconfig setting of I2C drivers

Browse source 
Now that I2C drivers are enabled based on devicetree
we need to remove any cases of them getting enabled by
Kconfig.defconfig* files as this can lead to errors.

Typically the Kconfig.defconfig* will blindly enable a
sensor and not respect the devicetree state of the I2C.
Additionally we can get problems with prj.conf/defconfig
getting incorrectly overridden.

Signed-off-by: Kumar Gala <galak@kernel.org>
This commit is contained in:
Kumar Gala 2022-07-28 16:24:57 -05:00 • committed by Carles Cufí
commit 5c57a36f9d
54 changed files with 2 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

7
boards/arc/em_starterkit/Kconfig.defconfig
View file

@ -12,11 +12,6 @@ config GPIO_INIT_PRIORITY
endif # GPIO
if I2C
config I2C_DW
default y
if I2C_DW
config I2C_DW_CLOCK_SPEED
@ -24,8 +19,6 @@ config I2C_DW_CLOCK_SPEED
endif # I2C_DW
endif # I2C
if SPI_DW
config SPI_DW_FIFO_DEPTH

11
boards/arc/hsdk/Kconfig.defconfig
View file

@ -11,10 +11,6 @@ if GPIO
config GPIO_INIT_PRIORITY
default 60
# for CY8C95XX
config I2C
default y
endif # GPIO
if SPI_DW
@ -30,11 +26,6 @@ config SPI_DW_ACCESS_WORD_ONLY
endif # SPI_DW
if I2C
config I2C_DW
default y
if I2C_DW
config I2C_DW_CLOCK_SPEED
@ -42,6 +33,4 @@ config I2C_DW_CLOCK_SPEED
endif #I2C_DW
endif #I2C
endif # BOARD_HSDK

7
boards/arm/arduino_due/Kconfig.defconfig
View file

@ -8,11 +8,4 @@ if BOARD_ARDUINO_DUE
config BOARD
default "arduino_due"
if I2C
config I2C_SAM_TWI
default y
endif # I2C
endif # BOARD_ARDUINO_DUE

4
boards/arm/cc3220sf_launchxl/Kconfig.defconfig
View file

@ -7,8 +7,4 @@ if BOARD_CC3220SF_LAUNCHXL
config BOARD
default "cc3220sf_launchxl"
config I2C_CC32XX
default y
depends on I2C
endif # BOARD_CC3220SF_LAUNCHXL

4
boards/arm/cc3235sf_launchxl/Kconfig.defconfig
View file

@ -8,8 +8,4 @@ if BOARD_CC3235SF_LAUNCHXL
config BOARD
default "cc3235sf_launchxl"
config I2C_CC32XX
default y
depends on I2C
endif # BOARD_CC3235SF_LAUNCHXL

6
boards/arm/cyclonev_socdk/Kconfig.defconfig
View file

@ -9,12 +9,10 @@ config BOARD
default "cyclonev_socdk"
depends on BOARD_CVSXDEVKIT
if I2C
config I2C_DW
default y
if I2C_DW
config I2C_DW_CLOCK_SPEED
default 200
endif # I2C
endif # I2C_DW
if EEPROM
config EEPROM_AT24

4
boards/arm/mps2_an385/Kconfig.defconfig
View file

@ -27,10 +27,6 @@ config TIMER_DTMR_CMSDK_APB
endif # COUNTER
config I2C_SBCON
default y
depends on I2C
config ZTEST_STACK_SIZE
default 4096 if ZTEST

4
boards/arm/mps2_an521/Kconfig.defconfig
View file

@ -33,10 +33,6 @@ config WDOG_CMSDK_APB
default y
depends on WATCHDOG
config I2C_SBCON
default y
depends on I2C
if IPM
config IPM_MHU

4
boards/arm/mps3_an547/Kconfig.defconfig
View file

@ -21,8 +21,4 @@ config UART_INTERRUPT_DRIVEN
endif # SERIAL
config I2C_SBCON
default y
depends on I2C
endif

7
boards/arm/rpi_pico/Kconfig.defconfig
View file

@ -9,11 +9,6 @@ config BOARD
config RP2_FLASH_W25Q080
default y
if I2C
config I2C_DW
default y
if I2C_DW
config I2C_DW_CLOCK_SPEED
@ -21,6 +16,4 @@ config I2C_DW_CLOCK_SPEED
endif #I2C_DW
endif #I2C
endif # BOARD_RPI_PICO

3
boards/posix/native_posix/Kconfig.defconfig
View file

@ -79,9 +79,6 @@ if I2C
config EMUL
default y
config I2C_EMUL
default y
endif # I2C
endif # BOARD_NATIVE_POSIX

4
boards/riscv/hifive1_revb/Kconfig.defconfig
View file

@ -18,8 +18,4 @@ config FLASH_LOAD_OFFSET
config SYS_CLOCK_TICKS_PER_SEC
default 128
config I2C_SIFIVE
default y
depends on I2C
endif

3
boards/riscv/tlsr9518adk80d/Kconfig.defconfig
View file

@ -18,9 +18,6 @@ config IEEE802154_TELINK_B91
config NET_CONFIG_IEEE802154_DEV_NAME
default "IEEE802154_b91"
config I2C_TELINK_B91
default y if I2C
config ADC_TELINK_B91
default y if ADC

4
soc/arm/atmel_sam/sam4e/Kconfig.defconfig.series
View file

@ -23,10 +23,6 @@ config SOC_PART_NUMBER
config NUM_IRQS
default 47
config I2C_SAM_TWI
default y
depends on I2C
if NETWORKING
config NET_L2_ETHERNET

4
soc/arm/atmel_sam/sam4l/Kconfig.defconfig.series
View file

@ -41,10 +41,6 @@ config ENTROPY_SAM_RNG
default y
depends on ENTROPY_GENERATOR
config I2C_SAM_TWIM
default y
depends on I2C
config USART_SAM
default y
depends on SERIAL

4
soc/arm/atmel_sam/sam4s/Kconfig.defconfig.series
View file

@ -28,8 +28,4 @@ config SOC_PART_NUMBER
config NUM_IRQS
default 35
config I2C_SAM_TWI
default y
depends on I2C
endif # SOC_SERIES_SAM4S

4
soc/arm/atmel_sam/same70/Kconfig.defconfig.series
View file

@ -49,10 +49,6 @@ config ADC_SAM_AFEC
default y
depends on ADC
config I2C_SAM_TWIHS
default y
depends on I2C
config I2S_SAM_SSC
default y
depends on I2S

4
soc/arm/atmel_sam/samv71/Kconfig.defconfig.series
View file

@ -50,10 +50,6 @@ config ADC_SAM_AFEC
default y
depends on ADC
config I2C_SAM_TWIHS
default y
depends on I2C
config I2S_SAM_SSC
default y
depends on I2S

4
soc/arm/microchip_mec/mec1501/Kconfig.defconfig.mec1501hsz
View file

@ -19,10 +19,6 @@ config ADC_XEC
default y
depends on ADC
config I2C_XEC
default y
depends on I2C
config ESPI_XEC
default y
depends on ESPI

4
soc/arm/microchip_mec/mec172x/Kconfig.defconfig.mec172xnsz
View file

@ -19,10 +19,6 @@ config ADC_XEC_V2
default y
depends on ADC
config I2C_XEC_V2
default y
depends on I2C
config ESPI_XEC_V2
default y
depends on ESPI

4
soc/arm/nuvoton_npcx/npcx7/Kconfig.defconfig.series
View file

@ -26,10 +26,6 @@ config ESPI_NPCX
default y
depends on ESPI
config I2C_NPCX
default y
depends on I2C
source "soc/arm/nuvoton_npcx/npcx7/Kconfig.defconfig.npcx7*"
endif # SOC_SERIES_NPCX7

4
soc/arm/nuvoton_npcx/npcx9/Kconfig.defconfig.series
View file

@ -26,10 +26,6 @@ config ESPI_NPCX
default y
depends on ESPI
config I2C_NPCX
default y
depends on I2C
source "soc/arm/nuvoton_npcx/npcx9/Kconfig.defconfig.npcx9*"
endif # SOC_SERIES_NPCX9

4
soc/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.mcimx6x_m4
View file

@ -11,10 +11,6 @@ config SOC
config FPU
default y
config I2C_IMX
default y
depends on I2C
config IPM_IMX
default y
depends on IPM

4
soc/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.mcimx7_m4
View file

@ -14,10 +14,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
config GPIO
default y
config I2C_IMX
default y
depends on I2C
config IPM_IMX
default y
depends on IPM

4
soc/arm/nxp_imx/rt/Kconfig.defconfig.series
View file

@ -28,10 +28,6 @@ config ENTROPY_MCUX_TRNG
default y if HAS_MCUX_TRNG
depends on ENTROPY_GENERATOR
config I2C_MCUX_LPI2C
default y if HAS_MCUX_LPI2C
depends on I2C
config ADC_MCUX_12B1MSPS_SAR
default y if HAS_MCUX_12B1MSPS_SAR
depends on ADC

4
soc/arm/nxp_imx/rt5xx/Kconfig.defconfig.mimxrt595_cm33
View file

@ -12,10 +12,6 @@ config PINMUX_MCUX_LPC
default y
depends on PINMUX
config I2C_MCUX_FLEXCOMM
default y if HAS_MCUX_FLEXCOMM
depends on I2C
config DMA_MCUX_LPC
default y
depends on DMA

4
soc/arm/nxp_imx/rt6xx/Kconfig.defconfig.mimxrt685_cm33
View file

@ -12,10 +12,6 @@ config PINMUX_MCUX_LPC
default y
depends on PINMUX
config I2C_MCUX_FLEXCOMM
default y if HAS_MCUX_FLEXCOMM
depends on I2C
config I2S_MCUX_FLEXCOMM
default y if HAS_MCUX_FLEXCOMM
depends on I2S

4
soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12
View file

@ -19,10 +19,6 @@ config DAC_MCUX_DAC
config GPIO
default y
config I2C_MCUX
default y
depends on I2C
config ENTROPY_MCUX_RNGA
default y
depends on ENTROPY_GENERATOR

4
soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12
View file

@ -27,10 +27,6 @@ config CAN_MCUX_FLEXCAN
config GPIO
default y
config I2C_MCUX
default y
depends on I2C
config SPI
default n

4
soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk66f18
View file

@ -27,10 +27,6 @@ config CAN_MCUX_FLEXCAN
config GPIO
default y
config I2C_MCUX
default y
depends on I2C
config ETH_MCUX
default y
depends on NET_L2_ETHERNET

4
soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series
View file

@ -34,10 +34,6 @@ config SOC_FLASH_MCUX
config GPIO
default y
config I2C_MCUX
default y
depends on I2C
config USB_KINETIS
default y
depends on USB_DEVICE_DRIVER

4
soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series
View file

@ -54,10 +54,6 @@ config SOC_FLASH_MCUX
default y
depends on FLASH
config I2C_MCUX_LPI2C
default y
depends on I2C
config ADC_MCUX_ADC12
default y
depends on ADC

4
soc/arm/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4
View file

@ -15,10 +15,6 @@ config ADC_MCUX_ADC16
default y
depends on ADC
config I2C_MCUX
default y
depends on I2C
config SOC_FLASH_MCUX
default y
depends on FLASH

4
soc/arm/nxp_kinetis/kv5x/Kconfig.defconfig.series
View file

@ -23,10 +23,6 @@ config SOC_FLASH_MCUX
config GPIO
default y
config I2C_MCUX
default y
depends on I2C
source "soc/arm/nxp_kinetis/kv5x/Kconfig.defconfig.mkv*"
endif # SOC_SERIES_KINETIS_KV5X

4
soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512
View file

@ -20,10 +20,6 @@ config ADC_MCUX_ADC16
default y
depends on ADC
config I2C_MCUX
default y
depends on I2C
config SPI
default y

4
soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw40z4
View file

@ -14,10 +14,6 @@ config ADC_MCUX_ADC16
default y
depends on ADC
config I2C_MCUX
default y
depends on I2C
config ENTROPY_MCUX_TRNG
default y
depends on ENTROPY_GENERATOR

4
soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4
View file

@ -19,10 +19,6 @@ config COUNTER_MCUX_RTC
default y
depends on COUNTER
config I2C_MCUX
default y
depends on I2C
config ENTROPY_MCUX_TRNG
default y
depends on ENTROPY_GENERATOR

4
soc/arm/nxp_lpc/Kconfig.defconfig
View file

@ -3,10 +3,6 @@
source "soc/arm/nxp_lpc/*/Kconfig.defconfig.series"
config I2C_MCUX_FLEXCOMM
default y if HAS_MCUX_FLEXCOMM
depends on I2C
config SERIAL_INIT_PRIORITY
default 55
depends on SERIAL

7
soc/arm/nxp_lpc/lpc11u6x/Kconfig.defconfig.series
View file

@ -24,11 +24,4 @@ config PINMUX_INIT_PRIORITY
endif # PINMUX
if I2C
config I2C_LPC11U6X
default y
endif # I2C
endif # SOC_SERIES_LPC11U6X

4
soc/arm/silabs_exx32/efm32gg11b/Kconfig.defconfig.efm32gg11b
View file

@ -7,10 +7,6 @@ config GPIO_GECKO
default y
depends on GPIO || LOG_BACKEND_SWO
config I2C_GECKO
default y
depends on I2C
config SOC_FLASH_GECKO
default y
depends on FLASH

4
soc/arm/silabs_exx32/efm32hg/Kconfig.defconfig.efm32hg
View file

@ -3,10 +3,6 @@
# Copyright (c) 2018 Marcio Montenegro
# SPDX-License-Identifier: Apache-2.0
config I2C_GECKO
default y
depends on I2C
config SOC_FLASH_GECKO
default y
depends on FLASH

4
soc/arm/silabs_exx32/efm32jg12b/Kconfig.defconfig.efm32jg12b
View file

@ -3,10 +3,6 @@
# Copyright (c) 2019 Lemonbeat GmbH
# SPDX-License-Identifier: Apache-2.0
config I2C_GECKO
default y
depends on I2C
config SOC_FLASH_GECKO
default y
depends on FLASH

4
soc/arm/silabs_exx32/efm32pg12b/Kconfig.defconfig.efm32pg12b
View file

@ -3,10 +3,6 @@
# Copyright (c) 2018 Christian Taedcke
# SPDX-License-Identifier: Apache-2.0
config I2C_GECKO
default y
depends on I2C
config SOC_FLASH_GECKO
default y
depends on FLASH

4
soc/arm/silabs_exx32/efm32pg1b/Kconfig.defconfig.efm32pg1b
View file

@ -3,10 +3,6 @@
# Copyright (c) 2020 Rafael Dias Menezes
# SPDX-License-Identifier: Apache-2.0
config I2C_GECKO
default y
depends on I2C
config SOC_FLASH_GECKO
default y
depends on FLASH

4
soc/arm/silabs_exx32/efm32wg/Kconfig.defconfig.efm32wg
View file

@ -3,10 +3,6 @@
# Copyright (c) 2017 Christian Taedcke
# SPDX-License-Identifier: Apache-2.0
config I2C_GECKO
default y
depends on I2C
config SOC_FLASH_GECKO
default y
depends on FLASH

4
soc/arm/silabs_exx32/efr32bg13p/Kconfig.defconfig.efr32bg13p
View file

@ -3,10 +3,6 @@
# Copyright (c) 2020 Piotr Mienkowski
# SPDX-License-Identifier: Apache-2.0
config I2C_GECKO
default y
depends on I2C
config SOC_FLASH_GECKO
default y
depends on FLASH

4
soc/arm/silabs_exx32/efr32fg13p/Kconfig.defconfig.efr32fg13p
View file

@ -3,10 +3,6 @@
# Copyright (c) 2018 Christian Taedcke
# SPDX-License-Identifier: Apache-2.0
config I2C_GECKO
default y
depends on I2C
config SOC_FLASH_GECKO
default y
depends on FLASH

4
soc/arm/silabs_exx32/efr32fg1p/Kconfig.defconfig.efr32fg1p
View file

@ -3,10 +3,6 @@
# Copyright (c) 2018 Christian Taedcke
# SPDX-License-Identifier: Apache-2.0
config I2C_GECKO
default y
depends on I2C
config SOC_FLASH_GECKO
default y
depends on FLASH

4
soc/arm/silabs_exx32/efr32mg12p/Kconfig.defconfig.efr32mg12p
View file

@ -3,10 +3,6 @@
# Copyright (c) 2018 Diego Sueiro
# SPDX-License-Identifier: Apache-2.0
config I2C_GECKO
default y
depends on I2C
config SOC_FLASH_GECKO
default y
depends on FLASH

4
soc/arm/silabs_exx32/efr32mg21/Kconfig.defconfig.efr32mg21
View file

@ -7,10 +7,6 @@ config GPIO_GECKO
default y
depends on GPIO || LOG_BACKEND_SWO
config I2C_GECKO
default y
depends on I2C
config SOC_FLASH_GECKO
default y
depends on FLASH

4
soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series
View file

@ -29,10 +29,6 @@ config ENTROPY_CC13XX_CC26XX_RNG
default y
depends on ENTROPY_GENERATOR
config I2C_CC13XX_CC26XX
default y
depends on I2C
if IEEE802154
config IEEE802154_CC13XX_CC26XX

4
soc/riscv/openisa_rv32m1/Kconfig.defconfig
View file

@ -122,10 +122,6 @@ config RV32M1_INTMUX_CHANNEL_7
endif # MULTI_LEVEL_INTERRUPTS
config I2C_RV32M1_LPI2C
default y
depends on I2C
if FLASH
config SOC_FLASH_RV32M1

4
soc/x86/apollo_lake/Kconfig.defconfig
View file

@ -26,8 +26,4 @@ config X86_DYNAMIC_IRQ_STUBS
default 16
depends on DYNAMIC_INTERRUPTS
config I2C_DW
default y
depends on I2C
endif # SOC_APOLLO_LAKE

4
soc/x86/elkhart_lake/Kconfig.defconfig
View file

@ -16,8 +16,4 @@ config X86_DYNAMIC_IRQ_STUBS
default 16
depends on DYNAMIC_INTERRUPTS
config I2C_DW
default y
depends on I2C
endif # SOC_ELKHART_LAKE