From a24770bd121482aeec23fd5ee8693d1da111a4bb Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 4 Dec 2018 16:23:18 -0600 Subject: [PATCH] sensor: lsm6dsl: Update DTS support Now that we can support the same compatible but different bus types, update the LSM6DSL support to utilize the same compatible for either I2C or SPI. We rename the i2c binding file to st,lsm6dsl-i2c.yaml just to be a bit more clear. Signed-off-by: Kumar Gala --- boards/arm/96b_argonkey/96b_argonkey.dts | 2 +- boards/arm/96b_argonkey/dts_fixup.h | 12 ++++++------ .../sensor/{st,lsm6dsl.yaml => st,lsm6dsl-i2c.yaml} | 0 dts/bindings/sensor/st,lsm6dsl-spi.yaml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename dts/bindings/sensor/{st,lsm6dsl.yaml => st,lsm6dsl-i2c.yaml} (100%) diff --git a/boards/arm/96b_argonkey/96b_argonkey.dts b/boards/arm/96b_argonkey/96b_argonkey.dts index 82ab4f254d7..8d926a6613e 100644 --- a/boards/arm/96b_argonkey/96b_argonkey.dts +++ b/boards/arm/96b_argonkey/96b_argonkey.dts @@ -61,7 +61,7 @@ /* ST Microelectronics LSM6DSL accel/gyro sensor */ lsm6dsl@1 { - compatible = "st,lsm6dsl-spi"; + compatible = "st,lsm6dsl"; reg = <1>; spi-max-frequency = <1000000>; irq-gpios = <&gpiob 1 0>; diff --git a/boards/arm/96b_argonkey/dts_fixup.h b/boards/arm/96b_argonkey/dts_fixup.h index 895b53527b9..1e863c449ff 100644 --- a/boards/arm/96b_argonkey/dts_fixup.h +++ b/boards/arm/96b_argonkey/dts_fixup.h @@ -20,12 +20,12 @@ #define DT_VL53L0X_I2C_ADDR DT_ST_STM32_I2C_V1_40005800_ST_VL53L0X_29_BASE_ADDRESS #define DT_VL53L0X_I2C_MASTER_DEV_NAME DT_ST_STM32_I2C_V1_40005800_ST_VL53L0X_29_BUS_NAME -#define DT_LSM6DSL_DEV_NAME DT_ST_STM32_SPI_40003800_ST_LSM6DSL_SPI_1_LABEL -#define DT_LSM6DSL_SPI_SELECT_SLAVE DT_ST_STM32_SPI_40003800_ST_LSM6DSL_SPI_1_BASE_ADDRESS -#define DT_LSM6DSL_SPI_MASTER_DEV_NAME DT_ST_STM32_SPI_40003800_ST_LSM6DSL_SPI_1_BUS_NAME -#define DT_LSM6DSL_SPI_BUS_FREQ DT_ST_STM32_SPI_40003800_ST_LSM6DSL_SPI_1_SPI_MAX_FREQUENCY -#define DT_LSM6DSL_GPIO_DEV_NAME DT_ST_STM32_SPI_40003800_ST_LSM6DSL_SPI_1_IRQ_GPIOS_CONTROLLER -#define DT_LSM6DSL_GPIO_PIN_NUM DT_ST_STM32_SPI_40003800_ST_LSM6DSL_SPI_1_IRQ_GPIOS_PIN +#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 diff --git a/dts/bindings/sensor/st,lsm6dsl.yaml b/dts/bindings/sensor/st,lsm6dsl-i2c.yaml similarity index 100% rename from dts/bindings/sensor/st,lsm6dsl.yaml rename to dts/bindings/sensor/st,lsm6dsl-i2c.yaml diff --git a/dts/bindings/sensor/st,lsm6dsl-spi.yaml b/dts/bindings/sensor/st,lsm6dsl-spi.yaml index 3a1e20b0db2..1719525fd86 100644 --- a/dts/bindings/sensor/st,lsm6dsl-spi.yaml +++ b/dts/bindings/sensor/st,lsm6dsl-spi.yaml @@ -16,7 +16,7 @@ inherits: properties: compatible: - constraint: "st,lsm6dsl-spi" + constraint: "st,lsm6dsl" irq-gpios: type: compound