driver/sensor: lsm6dsl: align driver to auto-generated dts macros
Use auto-generated device tree macros in LSM6DSL driver to avoid
usage of dts.fixup code for it.
Signed-off-by: Armando Visconti <armando.visconti@st.com>
diff --git a/boards/arm/96b_argonkey/dts_fixup.h b/boards/arm/96b_argonkey/dts_fixup.h
index fa3df60..dc7cd56 100644
--- a/boards/arm/96b_argonkey/dts_fixup.h
+++ b/boards/arm/96b_argonkey/dts_fixup.h
@@ -9,13 +9,6 @@
* generated data matches the driver definitions.
*/
-#define DT_LSM6DSL_DEV_NAME DT_ST_STM32_SPI_40003800_ST_LSM6DSL_1_LABEL
-#define DT_LSM6DSL_SPI_SELECT_SLAVE DT_ST_STM32_SPI_40003800_ST_LSM6DSL_1_BASE_ADDRESS
-#define DT_LSM6DSL_SPI_MASTER_DEV_NAME DT_ST_STM32_SPI_40003800_ST_LSM6DSL_1_BUS_NAME
-#define DT_LSM6DSL_SPI_BUS_FREQ DT_ST_STM32_SPI_40003800_ST_LSM6DSL_1_SPI_MAX_FREQUENCY
-#define DT_LSM6DSL_GPIO_DEV_NAME DT_ST_STM32_SPI_40003800_ST_LSM6DSL_1_IRQ_GPIOS_CONTROLLER
-#define DT_LSM6DSL_GPIO_PIN_NUM DT_ST_STM32_SPI_40003800_ST_LSM6DSL_1_IRQ_GPIOS_PIN
-
#define CONFIG_LP3943_DEV_NAME DT_ST_STM32_I2C_V1_40005C00_TI_LP3943_60_LABEL
#define CONFIG_LP3943_I2C_ADDRESS DT_ST_STM32_I2C_V1_40005C00_TI_LP3943_60_BASE_ADDRESS
#define CONFIG_LP3943_I2C_MASTER_DEV_NAME DT_ST_STM32_I2C_V1_40005C00_TI_LP3943_60_BUS_NAME
diff --git a/boards/arm/disco_l475_iot1/dts_fixup.h b/boards/arm/disco_l475_iot1/dts_fixup.h
index 37b8e9f..f443ae0 100644
--- a/boards/arm/disco_l475_iot1/dts_fixup.h
+++ b/boards/arm/disco_l475_iot1/dts_fixup.h
@@ -8,12 +8,6 @@
#define DT_LIS3MDL_I2C_ADDR DT_ST_STM32_I2C_V2_40005800_ST_LIS3MDL_MAGN_1E_BASE_ADDRESS
#define DT_LIS3MDL_I2C_MASTER_DEV_NAME DT_ST_STM32_I2C_V2_40005800_ST_LIS3MDL_MAGN_1E_BUS_NAME
-#define DT_LSM6DSL_DEV_NAME DT_ST_STM32_I2C_V2_40005800_ST_LSM6DSL_6A_LABEL
-#define DT_LSM6DSL_I2C_ADDR DT_ST_STM32_I2C_V2_40005800_ST_LSM6DSL_6A_BASE_ADDRESS
-#define DT_LSM6DSL_I2C_MASTER_DEV_NAME DT_ST_STM32_I2C_V2_40005800_ST_LSM6DSL_6A_BUS_NAME
-#define DT_LSM6DSL_GPIO_DEV_NAME DT_ST_STM32_I2C_V2_40005800_ST_LSM6DSL_6A_IRQ_GPIOS_CONTROLLER
-#define DT_LSM6DSL_GPIO_PIN_NUM DT_ST_STM32_I2C_V2_40005800_ST_LSM6DSL_6A_IRQ_GPIOS_PIN
-
#define CONFIG_BT_SPI_DEV_NAME DT_ST_STM32_SPI_FIFO_40003C00_ST_SPBTLE_RF_0_BUS_NAME
#define CONFIG_BT_SPI_MAX_CLK_FREQ DT_ST_STM32_SPI_FIFO_40003C00_ST_SPBTLE_RF_0_SPI_MAX_FREQUENCY
diff --git a/boards/shields/x_nucleo_iks01a2/dts_fixup.h b/boards/shields/x_nucleo_iks01a2/dts_fixup.h
index c86958d..26ac27e 100644
--- a/boards/shields/x_nucleo_iks01a2/dts_fixup.h
+++ b/boards/shields/x_nucleo_iks01a2/dts_fixup.h
@@ -5,10 +5,6 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#define DT_LSM6DSL_DEV_NAME ARDUINO_I2C_ST_LSM6DSL_6B_LABEL
-#define DT_LSM6DSL_I2C_ADDR ARDUINO_I2C_ST_LSM6DSL_6B_BASE_ADDRESS
-#define DT_LSM6DSL_I2C_MASTER_DEV_NAME ARDUINO_I2C_ST_LSM6DSL_6B_BUS_NAME
-
#define DT_LIS2MDL_DEV_NAME ARDUINO_I2C_ST_LIS2MDL_MAGN_1E_LABEL
#define DT_LIS2MDL_I2C_ADDRESS ARDUINO_I2C_ST_LIS2MDL_MAGN_1E_BASE_ADDRESS
#define DT_LIS2MDL_I2C_MASTER_DEV_NAME ARDUINO_I2C_ST_LIS2MDL_MAGN_1E_BUS_NAME
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.c b/drivers/sensor/lsm6dsl/lsm6dsl.c
index 8792e7e..ed0fb8c 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl.c
@@ -773,11 +773,7 @@
}
static struct lsm6dsl_config lsm6dsl_config = {
-#ifdef DT_ST_LSM6DSL_BUS_SPI
- .comm_master_dev_name = DT_LSM6DSL_SPI_MASTER_DEV_NAME,
-#else
- .comm_master_dev_name = DT_LSM6DSL_I2C_MASTER_DEV_NAME,
-#endif
+ .comm_master_dev_name = DT_ST_LSM6DSL_0_BUS_NAME,
};
static int lsm6dsl_init(struct device *dev)
@@ -823,6 +819,6 @@
static struct lsm6dsl_data lsm6dsl_data;
-DEVICE_AND_API_INIT(lsm6dsl, DT_LSM6DSL_DEV_NAME, lsm6dsl_init,
+DEVICE_AND_API_INIT(lsm6dsl, DT_ST_LSM6DSL_0_LABEL, lsm6dsl_init,
&lsm6dsl_data, &lsm6dsl_config, POST_KERNEL,
CONFIG_SENSOR_INIT_PRIORITY, &lsm6dsl_api_funcs);
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
index d974bed..bb8d43f 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c
@@ -15,7 +15,7 @@
#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_ST_LSM6DSL_0_BASE_ADDRESS;
#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
LOG_MODULE_DECLARE(LSM6DSL);
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c
index 976231a..15d05fc 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c
@@ -26,10 +26,10 @@
#define SPI_CS NULL
static struct spi_config lsm6dsl_spi_conf = {
- .frequency = DT_LSM6DSL_SPI_BUS_FREQ,
+ .frequency = DT_ST_LSM6DSL_0_SPI_MAX_FREQUENCY,
.operation = (SPI_OP_MODE_MASTER | SPI_MODE_CPOL |
SPI_MODE_CPHA | SPI_WORD_SET(8) | SPI_LINES_SINGLE),
- .slave = DT_LSM6DSL_SPI_SELECT_SLAVE,
+ .slave = DT_ST_LSM6DSL_0_BASE_ADDRESS,
.cs = SPI_CS,
};
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
index 4fbb0cd..35129bd 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
+++ b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
@@ -25,7 +25,7 @@
__ASSERT_NO_MSG(trig->type == SENSOR_TRIG_DATA_READY);
- gpio_pin_disable_callback(drv_data->gpio, DT_LSM6DSL_GPIO_PIN_NUM);
+ gpio_pin_disable_callback(drv_data->gpio, DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN);
drv_data->data_ready_handler = handler;
if (handler == NULL) {
@@ -34,7 +34,7 @@
drv_data->data_ready_trigger = *trig;
- gpio_pin_enable_callback(drv_data->gpio, DT_LSM6DSL_GPIO_PIN_NUM);
+ gpio_pin_enable_callback(drv_data->gpio, DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN);
return 0;
}
@@ -47,7 +47,7 @@
ARG_UNUSED(pins);
- gpio_pin_disable_callback(dev, DT_LSM6DSL_GPIO_PIN_NUM);
+ gpio_pin_disable_callback(dev, DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN);
#if defined(CONFIG_LSM6DSL_TRIGGER_OWN_THREAD)
k_sem_give(&drv_data->gpio_sem);
@@ -66,7 +66,7 @@
&drv_data->data_ready_trigger);
}
- gpio_pin_enable_callback(drv_data->gpio, DT_LSM6DSL_GPIO_PIN_NUM);
+ gpio_pin_enable_callback(drv_data->gpio, DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN);
}
#ifdef CONFIG_LSM6DSL_TRIGGER_OWN_THREAD
@@ -99,20 +99,20 @@
struct lsm6dsl_data *drv_data = dev->driver_data;
/* setup data ready gpio interrupt */
- drv_data->gpio = device_get_binding(DT_LSM6DSL_GPIO_DEV_NAME);
+ drv_data->gpio = device_get_binding(DT_ST_LSM6DSL_0_IRQ_GPIOS_CONTROLLER);
if (drv_data->gpio == NULL) {
LOG_ERR("Cannot get pointer to %s device.",
- DT_LSM6DSL_GPIO_DEV_NAME);
+ DT_ST_LSM6DSL_0_IRQ_GPIOS_CONTROLLER);
return -EINVAL;
}
- gpio_pin_configure(drv_data->gpio, DT_LSM6DSL_GPIO_PIN_NUM,
+ gpio_pin_configure(drv_data->gpio, DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN,
GPIO_DIR_IN | GPIO_INT | GPIO_INT_EDGE |
GPIO_INT_ACTIVE_HIGH | GPIO_INT_DEBOUNCE);
gpio_init_callback(&drv_data->gpio_cb,
lsm6dsl_gpio_callback,
- BIT(DT_LSM6DSL_GPIO_PIN_NUM));
+ BIT(DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN));
if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) {
LOG_ERR("Could not set gpio callback.");
@@ -143,7 +143,7 @@
drv_data->dev = dev;
#endif
- gpio_pin_enable_callback(drv_data->gpio, DT_LSM6DSL_GPIO_PIN_NUM);
+ gpio_pin_enable_callback(drv_data->gpio, DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN);
return 0;
}
diff --git a/samples/boards/96b_argonkey/src/main.c b/samples/boards/96b_argonkey/src/main.c
index fcee8e6..0eacfb3 100644
--- a/samples/boards/96b_argonkey/src/main.c
+++ b/samples/boards/96b_argonkey/src/main.c
@@ -170,11 +170,11 @@
#endif
#ifdef CONFIG_LSM6DSL
- struct device *accel_dev = device_get_binding(DT_LSM6DSL_DEV_NAME);
+ struct device *accel_dev = device_get_binding(DT_ST_LSM6DSL_0_LABEL);
if (!accel_dev) {
printk("Could not get pointer to %s sensor\n",
- DT_LSM6DSL_DEV_NAME);
+ DT_ST_LSM6DSL_0_LABEL);
return;
}
diff --git a/samples/sensor/lsm6dsl/src/main.c b/samples/sensor/lsm6dsl/src/main.c
index 4cd0462..c0362b5 100644
--- a/samples/sensor/lsm6dsl/src/main.c
+++ b/samples/sensor/lsm6dsl/src/main.c
@@ -100,7 +100,7 @@
int cnt = 0;
char out_str[64];
struct sensor_value odr_attr;
- struct device *lsm6dsl_dev = device_get_binding(DT_LSM6DSL_DEV_NAME);
+ struct device *lsm6dsl_dev = device_get_binding(DT_ST_LSM6DSL_0_LABEL);
if (lsm6dsl_dev == NULL) {
printk("Could not get LSM6DSL device\n");
diff --git a/samples/shields/x_nucleo_iks01a2/src/main.c b/samples/shields/x_nucleo_iks01a2/src/main.c
index d9f0a19..ccce1e9 100644
--- a/samples/shields/x_nucleo_iks01a2/src/main.c
+++ b/samples/shields/x_nucleo_iks01a2/src/main.c
@@ -18,7 +18,7 @@
struct sensor_value magn[3];
struct device *hts221 = device_get_binding(DT_ST_HTS221_0_LABEL);
struct device *lps22hb = device_get_binding(DT_ST_LPS22HB_PRESS_0_LABEL);
- struct device *lsm6dsl = device_get_binding(DT_LSM6DSL_DEV_NAME);
+ struct device *lsm6dsl = device_get_binding(DT_ST_LSM6DSL_0_LABEL);
struct device *lsm303agr_a = device_get_binding(DT_ST_LIS2DH_0_LABEL);
struct device *lsm303agr_m = device_get_binding(DT_LIS2MDL_DEV_NAME);
diff --git a/tests/drivers/build_all/dts_fixup.h b/tests/drivers/build_all/dts_fixup.h
index 2e5177b..ef52263 100644
--- a/tests/drivers/build_all/dts_fixup.h
+++ b/tests/drivers/build_all/dts_fixup.h
@@ -106,12 +106,12 @@
#define CONFIG_GPIO_SX1509B_I2C_MASTER_DEV_NAME ""
#endif
-#ifndef DT_LSM6DSL_DEV_NAME
-#define DT_LSM6DSL_DEV_NAME ""
-#define DT_LSM6DSL_I2C_ADDR 0
-#define DT_LSM6DSL_I2C_MASTER_DEV_NAME ""
-#define DT_LSM6DSL_GPIO_DEV_NAME ""
-#define DT_LSM6DSL_GPIO_PIN_NUM 0
+#ifndef DT_ST_LSM6DSL_0_LABEL
+#define DT_ST_LSM6DSL_0_LABEL ""
+#define DT_ST_LSM6DSL_0_BASE_ADDRESS 0x6a
+#define DT_ST_LSM6DSL_0_BUS_NAME ""
+#define DT_ST_LSM6DSL_0_IRQ_GPIOS_CONTROLLER ""
+#define DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN 0
#define DT_ST_LSM6DSL_BUS_I2C 1
#endif
@@ -212,6 +212,16 @@
#define DT_ST_LIS2DH_0_BUS_SPI 1
#endif
+#ifndef DT_ST_LSM6DSL_0_LABEL
+#define DT_ST_LSM6DSL_0_LABEL ""
+#define DT_ST_LSM6DSL_0_BASE_ADDRESS 0
+#define DT_ST_LSM6DSL_0_BUS_NAME ""
+#define DT_ST_LSM6DSL_0_IRQ_GPIOS_CONTROLLER ""
+#define DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN 0
+#define DT_ST_LSM6DSL_0_SPI_MAX_FREQUENCY 6400000
+#define DT_ST_LSM6DSL_BUS_SPI 1
+#endif
+
#ifndef DT_ST_LIS2DS12_0_LABEL
#define DT_ST_LIS2DS12_0_LABEL ""
#define DT_ST_LIS2DS12_0_BUS_NAME ""
