Commit cc7a151f authored by Luis Ubieda's avatar Luis Ubieda Committed by Fabio Baltieri
Browse files

sensor: lsm6ds: Do not enable Streaming for buses with no RTIO support 



Ensure the corresponding bus enables RTIO (I2C, I3C or SPI) before
instantiating rtio-dependent elements. Otherwise, enabling it for
another bus (e.g: SPI_RTIO when the LSM6DS is also on I3C with no
I3C_RTIO) will cause a build-time failure.

Signed-off-by: default avatarLuis Ubieda <luisf@croxel.com>
parent 6230b348

drivers/sensor/st/lsm6dsv16x/lsm6dsv16x.c

+15 −6
Original line number Diff line number Diff line
@@ -1329,9 +1329,12 @@ static int lsm6dsv16x_pm_action(const struct device *dev, enum pm_device_action 
	}



#define LSM6DSV16X_DEFINE_SPI(inst)					\

	IF_ENABLED(CONFIG_LSM6DSV16X_STREAM, (LSM6DSV16X_SPI_RTIO_DEFINE(inst))); \

	IF_ENABLED(UTIL_AND(CONFIG_LSM6DSV16X_STREAM,			\

			    CONFIG_SPI_RTIO),				\

		   (LSM6DSV16X_SPI_RTIO_DEFINE(inst)));			\

	static struct lsm6dsv16x_data lsm6dsv16x_data_##inst =	{	\

		IF_ENABLED(CONFIG_LSM6DSV16X_STREAM,			\

		IF_ENABLED(UTIL_AND(CONFIG_LSM6DSV16X_STREAM,		\

				    CONFIG_SPI_RTIO),			\

			(.rtio_ctx = &lsm6dsv16x_rtio_ctx_##inst,	\

			 .iodev = &lsm6dsv16x_iodev_##inst,		\

			 .bus_type = BUS_SPI,))				\
@@ -1358,9 +1361,12 @@ static int lsm6dsv16x_pm_action(const struct device *dev, enum pm_device_action 




#define LSM6DSV16X_DEFINE_I2C(inst)					\

	IF_ENABLED(CONFIG_LSM6DSV16X_STREAM, (LSM6DSV16X_I2C_RTIO_DEFINE(inst))); \

	IF_ENABLED(UTIL_AND(CONFIG_LSM6DSV16X_STREAM,			\

			    CONFIG_I2C_RTIO),				\

		   (LSM6DSV16X_I2C_RTIO_DEFINE(inst)));			\

	static struct lsm6dsv16x_data lsm6dsv16x_data_##inst =	{	\

		IF_ENABLED(CONFIG_LSM6DSV16X_STREAM,			\

		IF_ENABLED(UTIL_AND(CONFIG_LSM6DSV16X_STREAM,		\

				    CONFIG_I2C_RTIO),			\

			(.rtio_ctx = &lsm6dsv16x_rtio_ctx_##inst,	\

			 .iodev = &lsm6dsv16x_iodev_##inst,		\

			 .bus_type = BUS_I2C,))				\
@@ -1391,9 +1397,12 @@ static int lsm6dsv16x_pm_action(const struct device *dev, enum pm_device_action 
	}



#define LSM6DSV16X_DEFINE_I3C(inst)					\

	IF_ENABLED(CONFIG_LSM6DSV16X_STREAM, (LSM6DSV16X_I3C_RTIO_DEFINE(inst))); \

	IF_ENABLED(UTIL_AND(CONFIG_LSM6DSV16X_STREAM,			\

			    CONFIG_I3C_RTIO),				\

		   (LSM6DSV16X_I3C_RTIO_DEFINE(inst)));			\

	static struct lsm6dsv16x_data lsm6dsv16x_data_##inst = {	\

		IF_ENABLED(CONFIG_LSM6DSV16X_STREAM,			\

		IF_ENABLED(UNTIL_AND(CONFIG_LSM6DSV16X_STREAM,		\

				     CONFIG_I3C_RTIO),			\

			(.rtio_ctx = &lsm6dsv16x_rtio_ctx_##inst,	\

			 .iodev = &lsm6dsv16x_i3c_iodev_##inst,		\

			 .bus_type = BUS_I3C,))				\

CRA Git | Maintained and supported by SUSTech CRA and CCSE