drivers: sensor: Remove Kconfigs conditioned upon !HAS_DTS_SPI Make device tree required for these sensor drivers. Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
diff --git a/drivers/sensor/adxl372/Kconfig b/drivers/sensor/adxl372/Kconfig index 70a4e26..02b9386 100644 --- a/drivers/sensor/adxl372/Kconfig +++ b/drivers/sensor/adxl372/Kconfig
@@ -7,7 +7,7 @@ menuconfig ADXL372 bool "ADXL372 Three Axis High-g I2C/SPI accelerometer" - depends on (I2C && HAS_DTS_I2C) || SPI + depends on (I2C && HAS_DTS_I2C) || (SPI && HAS_DTS_SPI) help Enable driver for ADXL372 Three-Axis Digital Accelerometers. @@ -28,62 +28,6 @@ endchoice -if !HAS_DTS_SPI - -config ADXL372_DEV_NAME - string "ADXL372 device name" - depends on ADXL372_SPI - default "ADXL372" - -config ADXL372_SPI_DEV_NAME - string "SPI device where ADXL372 is connected" - depends on ADXL372_SPI - default "SPI_0" - help - Specify the device name of the SPI device to which ADXL372 is - connected. - -config ADXL372_SPI_DEV_SLAVE - int "SPI Slave Select where ADXL372 is connected" - depends on ADXL372_SPI - default 2 - help - Specify the slave select pin of the SPI to which ADXL372 is - connected. - -config ADXL372_SPI_GPIO_CS - bool "ADXL372 SPI CS through a GPIO pin" - depends on ADXL372_SPI - help - This option is useful if one needs to manage SPI CS through a GPIO - pin to by-pass the SPI controller's CS logic. - -config ADXL372_SPI_BUS_FREQ - int "ADXL372 SPI bus speed in Hz" - range 10000 10000000 - default 8000000 - help - This is the maximum supported SPI bus frequency. The chip supports a - frequency up to 10MHz. - -config ADXL372_SPI_GPIO_CS_DRV_NAME - string "GPIO driver's name to use to drive SPI CS through" - default "GPIO_0" - depends on ADXL372_SPI_GPIO_CS - help - This option is mandatory to set which GPIO controller to use in order - to actually emulate the SPI CS. - -config ADXL372_SPI_GPIO_CS_PIN - int "GPIO PIN to use to drive SPI CS through" - default 0 - depends on ADXL372_SPI_GPIO_CS - help - This option is mandatory to set which GPIO pin to use in order - to actually emulate the SPI CS. - -endif # !HAS_DTS_SPI - choice prompt "Operating mode" default ADXL372_PEAK_DETECT_MODE
diff --git a/drivers/sensor/lsm6dsl/Kconfig b/drivers/sensor/lsm6dsl/Kconfig index 44af555..245a59e 100644 --- a/drivers/sensor/lsm6dsl/Kconfig +++ b/drivers/sensor/lsm6dsl/Kconfig
@@ -9,7 +9,7 @@ menuconfig LSM6DSL bool "LSM6DSL I2C/SPI accelerometer and gyroscope Chip" - depends on (I2C && HAS_DTS_I2C) || SPI + depends on (I2C && HAS_DTS_I2C) || (SPI && HAS_DTS_SPI) help Enable driver for LSM6DSL accelerometer and gyroscope sensor. @@ -31,61 +31,6 @@ endchoice -config LSM6DSL_DEV_NAME - string "LSM6DSL device name" - depends on LSM6DSL_SPI - default "LSM6DSL" - -if !HAS_DTS_SPI - -config LSM6DSL_SPI_SELECT_SLAVE - hex "LSM6DSL SPI slave select pin" - depends on LSM6DSL_SPI - default 1 - help - LSM6DSL SPI chip select pin (active low). - -config LSM6DSL_SPI_BUS_FREQ - int "LSM6DSL SPI bus speed in Hz" - default 8000000 - depends on LSM6DSL_SPI - help - This is the maximum supported SPI bus frequency. The chip supports a - frequency up to 10MHz. - -config LSM6DSL_SPI_MASTER_DEV_NAME - string "SPI master name where LSM6DSL chip is connected" - depends on LSM6DSL_SPI - default "SPI_2" - help - Specify the device name of the spi master device to which LSM6DSL is - connected. - -config LSM6DSL_SPI_GPIO_CS - bool "LSM6DSL SPI CS through a GPIO pin" - depends on LSM6DSL_SPI - help - This option is useful if one needs to manage SPI CS through a GPIO - pin to by-pass the SPI controller's CS logic. - -config LSM6DSL_SPI_GPIO_CS_DRV_NAME - string "GPIO driver's name to use to drive SPI CS through" - default "" - depends on LSM6DSL_SPI_GPIO_CS - help - This option is mandatory to set which GPIO controller to use in order - to actually emulate the SPI CS. - -config LSM6DSL_SPI_GPIO_CS_PIN - int "GPIO PIN to use to drive SPI CS through" - default 0 - depends on LSM6DSL_SPI_GPIO_CS - help - This option is mandatory to set which GPIO pin to use in order - to actually emulate the SPI CS. - -endif # !HAS_DTS_SPI - choice LSM6DSL_TRIGGER_MODE prompt "Trigger mode" help