diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c index 1105918..d665a6e 100644 --- a/drivers/iio/accel/bmc150-accel-core.c +++ b/drivers/iio/accel/bmc150-accel-core.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -1670,6 +1671,8 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, struct iio_dev *indio_dev; int ret; + if (dmi_match(DMI_BOARD_NAME, "RC71L") || (dmi_match(DMI_BOARD_NAME, "AB05-AMD") && dmi_match(DMI_PRODUCT_NAME, "AIR Plus"))) + return -ENODEV; // Abort loading bmc150 for ASUS ROG ALLY, Ayaneo Air Plus indio_dev = devm_iio_device_alloc(dev, sizeof(*data)); if (!indio_dev) return -ENOMEM; diff --git a/drivers/iio/imu/bmi323/bmi323_i2c.c b/drivers/iio/imu/bmi323/bmi323_i2c.c index 20a8001..346ba2d 100644 --- a/drivers/iio/imu/bmi323/bmi323_i2c.c +++ b/drivers/iio/imu/bmi323/bmi323_i2c.c @@ -5,6 +5,7 @@ * Copyright (C) 2023, Jagath Jog J */ +#include #include #include #include @@ -93,6 +94,12 @@ static int bmi323_i2c_probe(struct i2c_client *i2c) return bmi323_core_probe(dev); } +static const struct acpi_device_id bmi323_acpi_match[] = { + {"BOSC0200"}, + { }, +}; +MODULE_DEVICE_TABLE(acpi, bmi323_acpi_match); + static const struct i2c_device_id bmi323_i2c_ids[] = { { "bmi323" }, { } @@ -109,6 +116,7 @@ static struct i2c_driver bmi323_i2c_driver = { .driver = { .name = "bmi323", .of_match_table = bmi323_of_i2c_match, + .acpi_match_table = ACPI_PTR(bmi323_acpi_match), }, .probe = bmi323_i2c_probe, .id_table = bmi323_i2c_ids, diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index d752e9c..b495dba 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -571,6 +572,14 @@ static const struct iio_mount_matrix iio_mount_idmatrix = { } }; +static const struct iio_mount_matrix iio_mount_invert_x_matrix = { + .rotation = { + "-1", "0", "0", + "0", "1", "0", + "0", "0", "1" + } +}; + static int iio_setup_mount_idmatrix(const struct device *dev, struct iio_mount_matrix *matrix) { @@ -579,6 +588,14 @@ static int iio_setup_mount_idmatrix(const struct device *dev, return 0; } +static int iio_setup_mount_invert_x_matrix(const struct device *dev, + struct iio_mount_matrix *matrix) +{ + *matrix = iio_mount_invert_x_matrix; + dev_info(dev, "using inverted X-axis mounting matrix...\n"); + return 0; +} + ssize_t iio_show_mount_matrix(struct iio_dev *indio_dev, uintptr_t priv, const struct iio_chan_spec *chan, char *buf) { @@ -615,6 +632,8 @@ int iio_read_mount_matrix(struct device *dev, struct iio_mount_matrix *matrix) int err; err = device_property_read_string_array(dev, "mount-matrix", matrix->rotation, len); + if (dmi_match(DMI_BOARD_NAME, "RC71L")) + return iio_setup_mount_invert_x_matrix(dev, matrix); if (err == len) return 0; diff --git a/drivers/iio/imu/bmi323/bmi323_core.c b/drivers/iio/imu/bmi323/bmi323_core.c index 0bd5ded..ded8596 100644 --- a/drivers/iio/imu/bmi323/bmi323_core.c +++ b/drivers/iio/imu/bmi323/bmi323_core.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -285,6 +286,9 @@ static const int bmi323_acc_gyro_odr[][2] = { { 200, 0 }, { 400, 0 }, { 800, 0 }, + { 1600, 0}, + { 3200, 0}, + { 6400, 0}, }; static const int bmi323_acc_gyro_odrns[] = {