michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/sensor/lsm6dsl: Use DT defines to select I2C/SPI bus

Browse source 
Remove configuration parameter CONFIG_BUS_TYPE. Now we may
make use of DT_ST_LSM6DSL_BUS_I2C and DT_ST_LSM6DSL_BUS_SPI
definition to select the bus.

Signed-off-by: Armando Visconti <armando.visconti@st.com>
This commit is contained in:
Armando Visconti 2018-12-14 15:34:32 +01:00 • committed by Kumar Gala
commit f300dedcc1
7 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boards/arm/96b_argonkey/Kconfig.defconfig
View file

@ -78,10 +78,6 @@ endif # DMA
if LSM6DSL if LSM6DSL
choice LSM6DSL_BUS_TYPE
default LSM6DSL_SPI
endchoice
choice LSM6DSL_TRIGGER_MODE choice LSM6DSL_TRIGGER_MODE
default LSM6DSL_TRIGGER_GLOBAL_THREAD default LSM6DSL_TRIGGER_GLOBAL_THREAD
endchoice endchoice

4
drivers/sensor/lsm6dsl/CMakeLists.txt
View file

@ -1,7 +1,7 @@
zephyr_library() zephyr_library()
zephyr_library_sources_ifdef(CONFIG_LSM6DSL lsm6dsl.c) zephyr_library_sources_ifdef(CONFIG_LSM6DSL lsm6dsl.c)
zephyr_library_sources_ifdef(CONFIG_LSM6DSL_SPI lsm6dsl_spi.c) zephyr_library_sources_ifdef(CONFIG_LSM6DSL lsm6dsl_spi.c)
zephyr_library_sources_ifdef(CONFIG_LSM6DSL_I2C lsm6dsl_i2c.c) zephyr_library_sources_ifdef(CONFIG_LSM6DSL lsm6dsl_i2c.c)
zephyr_library_sources_ifdef(CONFIG_LSM6DSL_TRIGGER lsm6dsl_trigger.c) zephyr_library_sources_ifdef(CONFIG_LSM6DSL_TRIGGER lsm6dsl_trigger.c)
zephyr_library_sources_ifdef(CONFIG_LSM6DSL_SENSORHUB lsm6dsl_shub.c) zephyr_library_sources_ifdef(CONFIG_LSM6DSL_SENSORHUB lsm6dsl_shub.c)

15
drivers/sensor/lsm6dsl/Kconfig
View file

@ -16,21 +16,6 @@ menuconfig LSM6DSL
if LSM6DSL if LSM6DSL
choice LSM6DSL_BUS_TYPE
prompt "Interface to AP"
help
Select interface the LSM6DSL driver is connected to AP
config LSM6DSL_I2C
depends on I2C
bool "I2C Interface"
config LSM6DSL_SPI
depends on SPI
bool "SPI Interface"
endchoice
choice LSM6DSL_TRIGGER_MODE choice LSM6DSL_TRIGGER_MODE
prompt "Trigger mode" prompt "Trigger mode"
help help

4
drivers/sensor/lsm6dsl/lsm6dsl.c
View file

@ -773,7 +773,7 @@ static int lsm6dsl_init_chip(struct device *dev)
} }
static struct lsm6dsl_config lsm6dsl_config = { static struct lsm6dsl_config lsm6dsl_config = {
#ifdef CONFIG_LSM6DSL_SPI #ifdef DT_ST_LSM6DSL_BUS_SPI
.comm_master_dev_name = DT_LSM6DSL_SPI_MASTER_DEV_NAME, .comm_master_dev_name = DT_LSM6DSL_SPI_MASTER_DEV_NAME,
#else #else
.comm_master_dev_name = DT_LSM6DSL_I2C_MASTER_DEV_NAME, .comm_master_dev_name = DT_LSM6DSL_I2C_MASTER_DEV_NAME,
@ -792,7 +792,7 @@ static int lsm6dsl_init(struct device *dev)
return -EINVAL; return -EINVAL;
} }
#ifdef CONFIG_LSM6DSL_SPI #ifdef DT_ST_LSM6DSL_BUS_SPI
lsm6dsl_spi_init(dev); lsm6dsl_spi_init(dev);
#else #else
lsm6dsl_i2c_init(dev); lsm6dsl_i2c_init(dev);

3
drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
View file

@ -13,6 +13,8 @@
#include "lsm6dsl.h" #include "lsm6dsl.h"
#ifdef DT_ST_LSM6DSL_BUS_I2C
static u16_t lsm6dsl_i2c_slave_addr = DT_LSM6DSL_I2C_ADDR; static u16_t lsm6dsl_i2c_slave_addr = DT_LSM6DSL_I2C_ADDR;
#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
@ -61,3 +63,4 @@ int lsm6dsl_i2c_init(struct device *dev)
return 0; return 0;
} }
#endif /* DT_ST_LSM6DSL_BUS_I2C */

3
drivers/sensor/lsm6dsl/lsm6dsl_spi.c
View file

@ -12,6 +12,8 @@
#include "lsm6dsl.h" #include "lsm6dsl.h"
#include <logging/log.h> #include <logging/log.h>
#ifdef DT_ST_LSM6DSL_BUS_SPI
#define LSM6DSL_SPI_READ (1 << 7) #define LSM6DSL_SPI_READ (1 << 7)
#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
@ -168,3 +170,4 @@ int lsm6dsl_spi_init(struct device *dev)
return 0; return 0;
} }
#endif /* DT_ST_LSM6DSL_BUS_SPI */

1
tests/drivers/build_all/dts_fixup.h
View file

@ -102,6 +102,7 @@
#define DT_LSM6DSL_I2C_MASTER_DEV_NAME "" #define DT_LSM6DSL_I2C_MASTER_DEV_NAME ""
#define DT_LSM6DSL_GPIO_DEV_NAME "" #define DT_LSM6DSL_GPIO_DEV_NAME ""
#define DT_LSM6DSL_GPIO_PIN_NUM 0 #define DT_LSM6DSL_GPIO_PIN_NUM 0
#define DT_ST_LSM6DSL_BUS_I2C 1
#endif #endif
#ifndef DT_LPS22HB_DEV_NAME #ifndef DT_LPS22HB_DEV_NAME