michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: boards: Merge HAS_DTS_I2C_DEVICE with HAS_DTS_I2C

Browse source 
Every board that uses dts-enabled i2c drivers has a board-level dts, so
there is no need to have separate configs HAS_DTS_I2C_DEVICE and
HAS_DTS_I2C.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
This commit is contained in:
Maureen Helm 2018-09-29 10:55:23 -05:00 • committed by Kumar Gala
commit 75bc6ba454
38 changed files with 42 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

1
boards/arm/96b_neonkey/Kconfig.board
View file

@ -7,4 +7,3 @@
config BOARD_96B_NEONKEY
bool "96Boards Neonkey"
depends on SOC_STM32F411XE
select HAS_DTS_I2C_DEVICE

1
boards/arm/colibri_imx7d_m4/Kconfig.board
View file

@ -9,4 +9,3 @@ config BOARD_COLIBRI_IMX7D_M4
bool "Toradex Colibri iMX7 Dual"
depends on SOC_SERIES_IMX7_M4
select SOC_PART_NUMBER_MCIMX7D5EVM10SC
select HAS_DTS_I2C_DEVICE

1
boards/arm/frdm_k64f/Kconfig.board
View file

@ -4,6 +4,5 @@ config BOARD_FRDM_K64F
depends on SOC_SERIES_KINETIS_K6X
select SOC_PART_NUMBER_MK64FN1M0VLL12
select HAS_DTS_GPIO_DEVICE
select HAS_DTS_I2C_DEVICE
select HAS_DTS_SPI_DEVICE
select HAS_DTS_SPI_PINS

1
boards/arm/frdm_kl25z/Kconfig.board
View file

@ -9,4 +9,3 @@ config BOARD_FRDM_KL25Z
bool "NXP FRDM-KL25Z"
depends on SOC_SERIES_KINETIS_KL2X
select SOC_PART_NUMBER_MKL25Z128VLK4
select HAS_DTS_I2C_DEVICE

1
boards/arm/frdm_kw41z/Kconfig.board
View file

@ -10,5 +10,4 @@ config BOARD_FRDM_KW41Z
depends on SOC_SERIES_KINETIS_KWX
select SOC_PART_NUMBER_MKW41Z512VHT4
select HAS_DTS_GPIO_DEVICE
select HAS_DTS_I2C_DEVICE
select HAS_DTS_SPI_DEVICE

1
boards/arm/hexiwear_k64/Kconfig.board
View file

@ -10,5 +10,4 @@ config BOARD_HEXIWEAR_K64
depends on SOC_SERIES_KINETIS_K6X
select SOC_PART_NUMBER_MK64FN1M0VDC12
select HAS_DTS_GPIO_DEVICE
select HAS_DTS_I2C_DEVICE
select HAS_DTS_SPI_DEVICE

1
boards/arm/nrf52_pca20020/Kconfig.board
View file

@ -7,5 +7,4 @@
config BOARD_NRF52_PCA20020
bool "nRF52 PCA20020"
select GPIO
select HAS_DTS_I2C_DEVICE
depends on SOC_NRF52832_QFAA

1
boards/arm/reel_board/Kconfig.board
View file

@ -8,4 +8,3 @@ config BOARD_REEL_BOARD
bool "reel Board"
depends on SOC_NRF52840_QIAA
select HAS_DTS_GPIO_DEVICE
select HAS_DTS_I2C_DEVICE if I2C

1
boards/arm/warp7_m4/Kconfig.board
View file

@ -9,6 +9,5 @@ config BOARD_WARP7_M4
bool "WaRP7 iMX7 Solo"
depends on SOC_SERIES_IMX7_M4
select SOC_PART_NUMBER_MCIMX7S3DVK08SA
select HAS_DTS_I2C_DEVICE
select HAS_DTS_GPIO
select HAS_DTS_GPIO_DEVICE

2
drivers/gpio/Kconfig.sx1509b
View file

@ -20,7 +20,7 @@ config GPIO_SX1509B_INIT_PRIORITY
help
Device driver initialization priority.
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config GPIO_SX1509B_DEV_NAME
string "SX1509B GPIO chip Device Name"

2
drivers/led/Kconfig.lp3943
View file

@ -14,7 +14,7 @@ menuconfig LP3943
states at a specified rate. Each channel can drive up to 25 mA
per LED.
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config LP3943_DEV_NAME
string "LP3943 device name"

2
drivers/led/Kconfig.lp5562
View file

@ -13,7 +13,7 @@ menuconfig LP5562
LP5562 LED driver has 4 channels (RGBW). Each channel can drive up to
25.5 mA per LED.
if !HAS_DTS_I2C_DEVICE && LP5562
if !HAS_DTS_I2C && LP5562
config LP5562_DEV_NAME
string "LP5562 device name"

2
drivers/led/Kconfig.pca9633
View file

@ -13,7 +13,7 @@ menuconfig PCA9633
PCA9633 LED driver has 4 channels each with multi-programmable
states. Each channel can drive up to 25 mA per LED.
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config PCA9633_DEV_NAME
string "PCA9633 device name"

4
drivers/sensor/adt7420/Kconfig
View file

@ -14,7 +14,7 @@ menuconfig ADT7420
if ADT7420
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config ADT7420_NAME
string "Driver name"
@ -40,7 +40,7 @@ config ADT7420_I2C_MASTER_DEV_NAME
Specify the device name of the I2C master device to which the
ADT7420 chip is connected.
endif # !HAS_DTS_I2C_DEVICE
endif # !HAS_DTS_I2C
config ADT7420_TEMP_HYST
int "Temperature hysteresis in °C"

4
drivers/sensor/adxl372/Kconfig
View file

@ -28,7 +28,7 @@ config ADXL372_SPI
endchoice
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config ADXL372_DEV_NAME
string "ADXL372 device name"
@ -53,7 +53,7 @@ config ADXL372_I2C_MASTER_DEV_NAME
Specify the device name of the I2C master device to which the
ADXL372 chip is connected.
endif # !HAS_DTS_I2C_DEVICE
endif # !HAS_DTS_I2C
if !HAS_DTS_SPI_DEVICE

4
drivers/sensor/apds9960/Kconfig
View file

@ -13,7 +13,7 @@ menuconfig APDS9960
if APDS9960
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config APDS9960_I2C_DEV_NAME
string "I2C Master"
@ -28,7 +28,7 @@ config APDS9960_DRV_NAME
help
Device name with which the APDS9960 is identified.
endif # !HAS_DTS_I2C_DEVICE
endif # !HAS_DTS_I2C
if !HAS_DTS_GPIO_DEVICE

2
drivers/sensor/ccs811/Kconfig
View file

@ -14,7 +14,7 @@ menuconfig CCS811
if CCS811
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config CCS811_NAME
string "Driver name"

4
drivers/sensor/fxas21002/Kconfig
View file

@ -13,7 +13,7 @@ menuconfig FXAS21002
if FXAS21002
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config FXAS21002_NAME
string "Device name"
@ -31,7 +31,7 @@ config FXAS21002_I2C_ADDRESS
The I2C slave address can be configured by the SA0 input pin. This
option should usually be set by the board defconfig.
endif # !HAS_DTS_I2C_DEVICE
endif # !HAS_DTS_I2C
config FXAS21002_WHOAMI
hex "WHOAMI value"

4
drivers/sensor/fxos8700/Kconfig
View file

@ -13,7 +13,7 @@ menuconfig FXOS8700
if FXOS8700
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config FXOS8700_NAME
string "Device name"
@ -31,7 +31,7 @@ config FXOS8700_I2C_ADDRESS
The I2C slave address can be configured by the SA0 and SA1 input
pins. This option should usually be set by the board defconfig.
endif # !HAS_DTS_I2C_DEVICE
endif # !HAS_DTS_I2C
config FXOS8700_WHOAMI
hex "WHOAMI value"

4
drivers/sensor/hdc1008/Kconfig
View file

@ -14,7 +14,7 @@ menuconfig HDC1008
if HDC1008
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config HDC1008_NAME
string "Driver name"
@ -38,7 +38,7 @@ config HDC1008_I2C_MASTER_DEV_NAME
Specify the device name of the I2C master device to which the
HDC1008 chip is connected.
endif # !HAS_DTS_I2C_DEVICE
endif # !HAS_DTS_I2C
if !HAS_DTS_GPIO_DEVICE

2
drivers/sensor/hts221/Kconfig
View file

@ -12,7 +12,7 @@ menuconfig HTS221
if HTS221
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config HTS221_NAME
string "Driver name"

2
drivers/sensor/lis3mdl/Kconfig
View file

@ -12,7 +12,7 @@ menuconfig LIS3MDL
if LIS3MDL
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config LIS3MDL_NAME
string "Driver name"

2
drivers/sensor/lps22hb/Kconfig
View file

@ -13,7 +13,7 @@ menuconfig LPS22HB
if LPS22HB
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config LPS22HB_DEV_NAME
string "Device name"

2
drivers/sensor/lps25hb/Kconfig
View file

@ -13,7 +13,7 @@ menuconfig LPS25HB
if LPS25HB
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config LPS25HB_DEV_NAME
string "Device name"

2
drivers/sensor/lsm6ds0/Kconfig
View file

@ -16,7 +16,7 @@ menuconfig LSM6DS0
if LSM6DS0
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config LSM6DS0_DEV_NAME
string "LSM6DS0 device name"

6
drivers/sensor/lsm6dsl/Kconfig
View file

@ -33,10 +33,10 @@ endchoice
config LSM6DSL_DEV_NAME
string "LSM6DSL device name"
depends on (LSM6DSL_I2C && !HAS_DTS_I2C_DEVICE) || LSM6DSL_SPI
depends on (LSM6DSL_I2C && !HAS_DTS_I2C) || LSM6DSL_SPI
default "LSM6DSL"
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config LSM6DSL_I2C_ADDR
hex "LSM6DSL I2C address"
@ -56,7 +56,7 @@ config LSM6DSL_I2C_MASTER_DEV_NAME
Specify the device name of the I2C master device to which LSM6DSL is
connected.
endif #HAS_DTS_I2C_DEVICE
endif #HAS_DTS_I2C
if !HAS_DTS_SPI_DEVICE

4
drivers/sensor/max30101/Kconfig
View file

@ -11,7 +11,7 @@ menuconfig MAX30101
if MAX30101
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config MAX30101_NAME
string "Driver name"
@ -21,7 +21,7 @@ config MAX30101_I2C_NAME
string "I2C device name"
default "I2C_0"
endif # !HAS_DTS_I2C_DEVICE
endif # !HAS_DTS_I2C
config MAX30101_SMP_AVE
int "Sample averaging"

4
drivers/sensor/mma8451q/Kconfig
View file

@ -13,7 +13,7 @@ menuconfig MMA8451Q
if MMA8451Q
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config MMA8451Q_NAME
string "Device name"
@ -30,7 +30,7 @@ config MMA8451Q_I2C_ADDRESS
I2C address of the MMA8451Q sensor.
0x1D: I2C_ADDR
endif # !HAS_DTS_I2C_DEVICE
endif # !HAS_DTS_I2C
config MMA8451Q_WHOAMI
hex "WHOAMI value"

2
drivers/sensor/vl53l0x/Kconfig
View file

@ -15,7 +15,7 @@ menuconfig VL53L0X
if VL53L0X
if !HAS_DTS_I2C_DEVICE
if !HAS_DTS_I2C
config VL53L0X_NAME
string "Driver name"

7
dts/Kconfig
View file

@ -32,13 +32,6 @@ config HAS_DTS_I2C
This option specifies that the target platform supports device tree
configuration for I2c.
config HAS_DTS_I2C_DEVICE
bool
depends on HAS_DTS_I2C
help
This option specifies that the target platform supports device tree
configuration for sensors.
config HAS_DTS_SPI
bool
depends on HAS_DTS

4
samples/boards/arduino_101/environmental_sensing/sensor/dts.fixup
View file

@ -4,13 +4,13 @@
* SPDX-License-Identifier: Apache-2.0
*/
#if defined(CONFIG_HAS_DTS_I2C_DEVICE)
#if defined(CONFIG_HAS_DTS_I2C)
#define CONFIG_HDC1008_NAME INTEL_QMSI_SS_I2C_80012000_TI_HDC1008_40_LABEL
#define CONFIG_HDC1008_I2C_MASTER_DEV_NAME INTEL_QMSI_SS_I2C_80012000_TI_HDC1008_40_BUS_NAME
#define CONFIG_HDC1008_I2C_ADDR INTEL_QMSI_SS_I2C_80012000_TI_HDC1008_40_BASE_ADDRESS
#endif /* CONFIG_HAS_DTS_I2C_DEVICE */
#endif /* CONFIG_HAS_DTS_I2C */
#if defined(CONFIG_HAS_DTS_GPIO_DEVICE)

2
samples/drivers/led_lp5562/dts.fixup
View file

@ -1,4 +1,4 @@
#if defined(CONFIG_HAS_DTS_I2C_DEVICE)
#if defined(CONFIG_HAS_DTS_I2C)
#ifndef CONFIG_LP5562_DEV_NAME
#define CONFIG_LP5562_DEV_NAME NORDIC_NRF_I2C_40003000_TI_LP5562_30_LABEL

2
samples/drivers/led_pca9633/dts.fixup
View file

@ -1,4 +1,4 @@
#if defined(CONFIG_HAS_DTS_I2C_DEVICE)
#if defined(CONFIG_HAS_DTS_I2C)
#ifndef CONFIG_PCA9633_DEV_NAME
#define CONFIG_PCA9633_DEV_NAME ST_STM32_I2C_V2_40005400_NXP_PCA9633_62_LABEL

4
samples/sensor/adt7420/dts.fixup
View file

@ -1,4 +1,4 @@
#if defined(CONFIG_HAS_DTS_I2C_DEVICE)
#if defined(CONFIG_HAS_DTS_I2C)
#ifndef CONFIG_ADT7420_NAME
#define CONFIG_ADT7420_NAME ""
@ -6,4 +6,4 @@
#define CONFIG_ADT7420_I2C_MASTER_DEV_NAME ""
#endif
#endif /* CONFIG_HAS_DTS_I2C_DEVICE */
#endif /* CONFIG_HAS_DTS_I2C */

4
samples/sensor/adxl372/dts.fixup
View file

@ -1,4 +1,4 @@
#if defined(CONFIG_HAS_DTS_I2C_DEVICE)
#if defined(CONFIG_HAS_DTS_I2C)
#ifndef CONFIG_ADXL372_DEV_NAME
#define CONFIG_ADXL372_DEV_NAME ""
@ -8,7 +8,7 @@
#define CONFIG_ADXL372_I2C_MASTER_DEV_NAME ""
#endif
#endif /* CONFIG_HAS_DTS_I2C_DEVICE */
#endif /* CONFIG_HAS_DTS_I2C */
#if defined(CONFIG_HAS_DTS_SPI_DEVICE)

4
samples/sensor/ccs811/dts.fixup
View file

@ -1,4 +1,4 @@
#if defined(CONFIG_HAS_DTS_I2C_DEVICE)
#if defined(CONFIG_HAS_DTS_I2C)
#ifndef CONFIG_CCS811_NAME
#define CONFIG_CCS811_NAME ""
@ -6,4 +6,4 @@
#define CONFIG_CCS811_I2C_MASTER_DEV_NAME ""
#endif
#endif /* CONFIG_HAS_DTS_I2C_DEVICE */
#endif /* CONFIG_HAS_DTS_I2C */

1
soc/arm/st_stm32/Kconfig
View file

@ -9,7 +9,6 @@ config SOC_FAMILY_STM32
bool
# omit prompt to signify a "hidden" option
select HAS_SEGGER_RTT
select HAS_DTS_I2C_DEVICE if I2C
select HAS_DTS_SPI_DEVICE if SPI
if SOC_FAMILY_STM32

4
tests/drivers/build_all/dts.fixup
View file

@ -1,4 +1,4 @@
#if defined(CONFIG_HAS_DTS_I2C_DEVICE)
#if defined(CONFIG_HAS_DTS_I2C)
#ifndef CONFIG_ADT7420_NAME
#define CONFIG_ADT7420_NAME ""
@ -105,7 +105,7 @@
#define CONFIG_VL53L0X_I2C_MASTER_DEV_NAME ""
#endif
#endif /* CONFIG_HAS_DTS_I2C_DEVICE */
#endif /* CONFIG_HAS_DTS_I2C */
#if defined(CONFIG_HAS_DTS_SPI_DEVICE)