michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sensor: lis2dh: Use general DT_<COMPAT>_BUS_<BUS> define.

Browse source 
Match what other drivers are doing and use the general BUS define.
Change DT_ST_LIS2DH_0_BUS_SPI to DT_ST_LIS2DH_BUS_SPI

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2019-06-22 15:23:20 -05:00 • committed by Kumar Gala
commit 0a99f53c80
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/sensor/lis2dh/lis2dh.h
View file

@ -18,7 +18,7 @@
#define LIS2DH_BUS_ADDRESS DT_INST_0_ST_LIS2DH_BASE_ADDRESS #define LIS2DH_BUS_ADDRESS DT_INST_0_ST_LIS2DH_BASE_ADDRESS
#define LIS2DH_BUS_DEV_NAME DT_INST_0_ST_LIS2DH_BUS_NAME #define LIS2DH_BUS_DEV_NAME DT_INST_0_ST_LIS2DH_BUS_NAME
#if defined(DT_ST_LIS2DH_0_BUS_SPI) #if defined(DT_ST_LIS2DH_BUS_SPI)
#include <spi.h> #include <spi.h>
#define LIS2DH_SPI_READ_BIT BIT(7) #define LIS2DH_SPI_READ_BIT BIT(7)
@ -161,7 +161,7 @@
#define LIS2DH_REG_INT2_DUR 0x37 #define LIS2DH_REG_INT2_DUR 0x37
/* sample buffer size includes status register */ /* sample buffer size includes status register */
#if defined(DT_ST_LIS2DH_0_BUS_SPI) #if defined(DT_ST_LIS2DH_BUS_SPI)
#define LIS2DH_BUF_SZ 8 #define LIS2DH_BUF_SZ 8
#define LIS2DH_DATA_OFS 1 #define LIS2DH_DATA_OFS 1
#else #else
@ -184,7 +184,7 @@
union lis2dh_sample { union lis2dh_sample {
u8_t raw[LIS2DH_BUF_SZ]; u8_t raw[LIS2DH_BUF_SZ];
struct { struct {
#if defined(DT_ST_LIS2DH_0_BUS_SPI) #if defined(DT_ST_LIS2DH_BUS_SPI)
u8_t dummy; u8_t dummy;
#endif #endif
u8_t status; u8_t status;
@ -193,7 +193,7 @@ union lis2dh_sample {
}; };
struct lis2dh_data { struct lis2dh_data {
#if defined(DT_ST_LIS2DH_0_BUS_SPI) #if defined(DT_ST_LIS2DH_BUS_SPI)
struct device *spi; struct device *spi;
struct spi_config spi_cfg; struct spi_config spi_cfg;
#else #else
@ -226,7 +226,7 @@ struct lis2dh_data {
#endif /* CONFIG_LIS2DH_TRIGGER */ #endif /* CONFIG_LIS2DH_TRIGGER */
}; };
#if defined(DT_ST_LIS2DH_0_BUS_SPI) #if defined(DT_ST_LIS2DH_BUS_SPI)
int lis2dh_spi_access(struct lis2dh_data *ctx, u8_t cmd, int lis2dh_spi_access(struct lis2dh_data *ctx, u8_t cmd,
void *data, size_t length); void *data, size_t length);
#endif #endif
@ -235,7 +235,7 @@ static inline int lis2dh_bus_configure(struct device *dev)
{ {
struct lis2dh_data *lis2dh = dev->driver_data; struct lis2dh_data *lis2dh = dev->driver_data;
#if defined(DT_ST_LIS2DH_0_BUS_SPI) #if defined(DT_ST_LIS2DH_BUS_SPI)
lis2dh->spi = device_get_binding(LIS2DH_BUS_DEV_NAME); lis2dh->spi = device_get_binding(LIS2DH_BUS_DEV_NAME);
if (lis2dh->spi == NULL) { if (lis2dh->spi == NULL) {
LOG_ERR("Could not get pointer to %s device", LOG_ERR("Could not get pointer to %s device",
@ -267,7 +267,7 @@ static inline int lis2dh_burst_read(struct device *dev, u8_t start_addr,
{ {
struct lis2dh_data *lis2dh = dev->driver_data; struct lis2dh_data *lis2dh = dev->driver_data;
#if defined(DT_ST_LIS2DH_0_BUS_SPI) #if defined(DT_ST_LIS2DH_BUS_SPI)
start_addr |= LIS2DH_SPI_READ_BIT | LIS2DH_SPI_AUTOINC_ADDR; start_addr |= LIS2DH_SPI_READ_BIT | LIS2DH_SPI_AUTOINC_ADDR;
return lis2dh_spi_access(lis2dh, start_addr, buf, num_bytes); return lis2dh_spi_access(lis2dh, start_addr, buf, num_bytes);
@ -285,7 +285,7 @@ static inline int lis2dh_reg_read_byte(struct device *dev, u8_t reg_addr,
{ {
struct lis2dh_data *lis2dh = dev->driver_data; struct lis2dh_data *lis2dh = dev->driver_data;
#if defined(DT_ST_LIS2DH_0_BUS_SPI) #if defined(DT_ST_LIS2DH_BUS_SPI)
reg_addr |= LIS2DH_SPI_READ_BIT; reg_addr |= LIS2DH_SPI_READ_BIT;
return lis2dh_spi_access(lis2dh, reg_addr, value, 1); return lis2dh_spi_access(lis2dh, reg_addr, value, 1);
@ -302,7 +302,7 @@ static inline int lis2dh_burst_write(struct device *dev, u8_t start_addr,
{ {
struct lis2dh_data *lis2dh = dev->driver_data; struct lis2dh_data *lis2dh = dev->driver_data;
#if defined(DT_ST_LIS2DH_0_BUS_SPI) #if defined(DT_ST_LIS2DH_BUS_SPI)
start_addr |= LIS2DH_SPI_AUTOINC_ADDR; start_addr |= LIS2DH_SPI_AUTOINC_ADDR;
return lis2dh_spi_access(lis2dh, start_addr, buf, num_bytes); return lis2dh_spi_access(lis2dh, start_addr, buf, num_bytes);
@ -320,7 +320,7 @@ static inline int lis2dh_reg_write_byte(struct device *dev, u8_t reg_addr,
{ {
struct lis2dh_data *lis2dh = dev->driver_data; struct lis2dh_data *lis2dh = dev->driver_data;
#if defined(DT_ST_LIS2DH_0_BUS_SPI) #if defined(DT_ST_LIS2DH_BUS_SPI)
reg_addr &= LIS2DH_SPI_ADDR_MASK; reg_addr &= LIS2DH_SPI_ADDR_MASK;
return lis2dh_spi_access(lis2dh, reg_addr, &value, 1); return lis2dh_spi_access(lis2dh, reg_addr, &value, 1);

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

@ -243,7 +243,7 @@
#define DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER "" #define DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER ""
#define DT_INST_0_ST_LIS2DH_IRQ_GPIOS_PIN 0 #define DT_INST_0_ST_LIS2DH_IRQ_GPIOS_PIN 0
#define DT_INST_0_ST_LIS2DH_SPI_MAX_FREQUENCY 6400000 #define DT_INST_0_ST_LIS2DH_SPI_MAX_FREQUENCY 6400000
#define DT_ST_LIS2DH_0_BUS_SPI 1 #define DT_ST_LIS2DH_BUS_SPI 1
#endif #endif
#ifndef DT_INST_0_ST_LSM6DSL_LABEL #ifndef DT_INST_0_ST_LSM6DSL_LABEL