Skip to content

Commit b51cfea

Browse files
galakAnas Nashif
authored andcommitted
sensors: dts: cleanup usage of HAS_DTS_I2C_DEVICE
Move to new Kconfig pattern in which we use an if !HAS_DTS_I2C_DEVICE block for the Kconfig symbols that can now come from DT generation. This pattern is useful to allow us to define default values for the generated symbols for build-all testing. Fixes: #5877 Signed-off-by: Kumar Gala <[email protected]>
1 parent 7361d3d commit b51cfea

File tree

4 files changed

+28
-12
lines changed

4 files changed

+28
-12
lines changed

drivers/sensor/lis3mdl/Kconfig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,20 @@ menuconfig LIS3MDL
1212
help
1313
Enable driver for LIS3MDL I2C-based magnetometer.
1414

15+
if !HAS_DTS_I2C_DEVICE
16+
1517
config LIS3MDL_NAME
1618
string
1719
prompt "Driver name"
1820
default "LIS3MDL"
19-
depends on LIS3MDL && !HAS_DTS_I2C_DEVICE
21+
depends on LIS3MDL
2022
help
2123
Device name with which the LIS3MDL sensor is identified.
2224

2325
config LIS3MDL_I2C_ADDR
2426
hex
2527
prompt "I2C address"
26-
depends on LIS3MDL && !HAS_DTS_I2C_DEVICE
28+
depends on LIS3MDL
2729
default 0x1C
2830
help
2931
I2C address of the LIS3MDL sensor.
@@ -33,12 +35,14 @@ config LIS3MDL_I2C_ADDR
3335
config LIS3MDL_I2C_MASTER_DEV_NAME
3436
string
3537
prompt "I2C master where LIS3MDL is connected"
36-
depends on LIS3MDL && !HAS_DTS_I2C_DEVICE
38+
depends on LIS3MDL
3739
default "I2C_0"
3840
help
3941
Specify the device name of the I2C master device to which LIS3MDL is
4042
connected.
4143

44+
endif
45+
4246
choice
4347
prompt "Trigger mode"
4448
depends on LIS3MDL

drivers/sensor/lps22hb/Kconfig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,20 @@ menuconfig LPS22HB
1313
Enable driver for LPS22HB I2C-based pressure and temperature
1414
sensor.
1515

16+
if !HAS_DTS_I2C_DEVICE
17+
1618
config LPS22HB_DEV_NAME
1719
string
1820
prompt "Device name"
1921
default "LPS22HB"
20-
depends on LPS22HB && !HAS_DTS_I2C_DEVICE
22+
depends on LPS22HB
2123
help
2224
Device name used for LPS22HB sensor identification.
2325

2426
config LPS22HB_I2C_ADDR
2527
hex
2628
prompt "I2C address"
27-
depends on LPS22HB && !HAS_DTS_I2C_DEVICE
29+
depends on LPS22HB
2830
default 0x5D
2931
range 0x5C 0x5D
3032
help
@@ -35,12 +37,14 @@ config LPS22HB_I2C_ADDR
3537
config LPS22HB_I2C_MASTER_DEV_NAME
3638
string
3739
prompt "I2C master where LPS22HB is connected"
38-
depends on LPS22HB && !HAS_DTS_I2C_DEVICE
40+
depends on LPS22HB
3941
default I2C_0_NAME
4042
help
4143
Specify the device name of the I2C master device to which
4244
LPS22HB is connected.
4345

46+
endif
47+
4448
menu "Attributes"
4549
depends on LPS22HB
4650

drivers/sensor/lsm6dsl/Kconfig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@ menuconfig LSM6DSL
1515
Enable driver for LSM6DSL I2C-based accelerometer and gyroscope
1616
sensor.
1717

18+
if !HAS_DTS_I2C_DEVICE
19+
1820
config LSM6DSL_DEV_NAME
1921
string "LSM6DSL device name"
20-
depends on LSM6DSL && !HAS_DTS_I2C_DEVICE
22+
depends on LSM6DSL
2123
default "LSM6DSL"
2224

2325
config LSM6DSL_I2C_ADDR
2426
hex
2527
prompt "LSM6DSL I2C address"
26-
depends on LSM6DSL && !HAS_DTS_I2C_DEVICE
28+
depends on LSM6DSL
2729
default 0x6A
2830
range 0x6A 0x6B
2931
help
@@ -33,12 +35,14 @@ config LSM6DSL_I2C_ADDR
3335

3436
config LSM6DSL_I2C_MASTER_DEV_NAME
3537
string "I2C master where LSM6DSL chip is connected"
36-
depends on LSM6DSL && !HAS_DTS_I2C_DEVICE
38+
depends on LSM6DSL
3739
default I2C_0_NAME
3840
help
3941
Specify the device name of the I2C master device to which LSM6DSL is
4042
connected.
4143

44+
endif
45+
4246
config LSM6DSL_ENABLE_TEMP
4347
bool "Enable temperature"
4448
depends on LSM6DSL

drivers/sensor/vl53l0x/Kconfig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,35 @@ menuconfig VL53L0X
1515
help
1616
Enable driver for VL53L0X I2C-based time of flight sensor.
1717

18+
if !HAS_DTS_I2C_DEVICE
19+
1820
config VL53L0X_NAME
1921
string
2022
prompt "Driver name"
2123
default "VL53L0X"
22-
depends on VL53L0X && !HAS_DTS_I2C_DEVICE
24+
depends on VL53L0X
2325
help
2426
Device name with which the VL53L0X sensor is identified.
2527

2628
config VL53L0X_I2C_ADDR
2729
int
2830
prompt "Vl53l0x I2C address"
2931
default 0x29
30-
depends on VL53L0X && !HAS_DTS_I2C_DEVICE
32+
depends on VL53L0X
3133
help
3234
address of the i2c used for the vl53l0x sensor
3335

3436
config VL53L0X_I2C_MASTER_DEV_NAME
3537
string
3638
prompt "I2C master where VL53L0X is connected"
37-
depends on VL53L0X && !HAS_DTS_I2C_DEVICE
39+
depends on VL53L0X
3840
default "I2C_0"
3941
help
4042
Specify the device name of the I2C master device to which VL53L0X is
4143
connected.
4244

45+
endif
46+
4347
config VL53L0X_XSHUT_GPIO_DEV_NAME
4448
string
4549
prompt "GPIO device"

0 commit comments

Comments
 (0)