iio: pressure: bmp280: Fix regmap for BMP280 device

Up to now, the BMP280 device is using the regmap of the BME280 which
has registers that exist only in the BME280 device.

Fixes: 14e8015f8569 ("iio: pressure: bmp280: split driver in logical parts")
Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
Link: https://patch.msgid.link/20240711211558.106327-2-vassilisamir@gmail.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index 2fc5724196e31553352b2c5609adfa801f85456b..cc8553177977d4a756f7f6e3b5cc1a796e0fe479 100644 (file)
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -1186,7 +1186,7 @@ const struct bmp280_chip_info bme280_chip_info = {
        .id_reg = BMP280_REG_ID,
        .chip_id = bme280_chip_ids,
        .num_chip_id = ARRAY_SIZE(bme280_chip_ids),
-       .regmap_config = &bmp280_regmap_config,
+       .regmap_config = &bme280_regmap_config,
        .start_up_time = 2000,
        .channels = bme280_channels,
        .num_channels = ARRAY_SIZE(bme280_channels),

diff --git a/drivers/iio/pressure/bmp280-regmap.c b/drivers/iio/pressure/bmp280-regmap.c
index fa52839474b18b418291401b3e5151322875f46c..d27d68edd90656cbdce89a652a1700f82ededbfb 100644 (file)
--- a/drivers/iio/pressure/bmp280-regmap.c
+++ b/drivers/iio/pressure/bmp280-regmap.c
@@ -41,7 +41,7 @@ const struct regmap_config bmp180_regmap_config = {
 };
 EXPORT_SYMBOL_NS(bmp180_regmap_config, IIO_BMP280);
 
-static bool bmp280_is_writeable_reg(struct device *dev, unsigned int reg)
+static bool bme280_is_writeable_reg(struct device *dev, unsigned int reg)
 {
        switch (reg) {
        case BMP280_REG_CONFIG:
@@ -54,7 +54,35 @@ static bool bmp280_is_writeable_reg(struct device *dev, unsigned int reg)
        }
 }
 
+static bool bmp280_is_writeable_reg(struct device *dev, unsigned int reg)
+{
+       switch (reg) {
+       case BMP280_REG_CONFIG:
+       case BMP280_REG_CTRL_MEAS:
+       case BMP280_REG_RESET:
+               return true;
+       default:
+               return false;
+       }
+}
+
 static bool bmp280_is_volatile_reg(struct device *dev, unsigned int reg)
+{
+       switch (reg) {
+       case BMP280_REG_TEMP_XLSB:
+       case BMP280_REG_TEMP_LSB:
+       case BMP280_REG_TEMP_MSB:
+       case BMP280_REG_PRESS_XLSB:
+       case BMP280_REG_PRESS_LSB:
+       case BMP280_REG_PRESS_MSB:
+       case BMP280_REG_STATUS:
+               return true;
+       default:
+               return false;
+       }
+}
+
+static bool bme280_is_volatile_reg(struct device *dev, unsigned int reg)
 {
        switch (reg) {
        case BME280_REG_HUMIDITY_LSB:
@@ -71,7 +99,6 @@ static bool bmp280_is_volatile_reg(struct device *dev, unsigned int reg)
                return false;
        }
 }
-
 static bool bmp380_is_writeable_reg(struct device *dev, unsigned int reg)
 {
        switch (reg) {
@@ -167,7 +194,7 @@ const struct regmap_config bmp280_regmap_config = {
        .reg_bits = 8,
        .val_bits = 8,
 
-       .max_register = BME280_REG_HUMIDITY_LSB,
+       .max_register = BMP280_REG_TEMP_XLSB,
        .cache_type = REGCACHE_RBTREE,
 
        .writeable_reg = bmp280_is_writeable_reg,
@@ -175,6 +202,18 @@ const struct regmap_config bmp280_regmap_config = {
 };
 EXPORT_SYMBOL_NS(bmp280_regmap_config, IIO_BMP280);
 
+const struct regmap_config bme280_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+
+       .max_register = BME280_REG_HUMIDITY_LSB,
+       .cache_type = REGCACHE_RBTREE,
+
+       .writeable_reg = bme280_is_writeable_reg,
+       .volatile_reg = bme280_is_volatile_reg,
+};
+EXPORT_SYMBOL_NS(bme280_regmap_config, IIO_BMP280);
+
 const struct regmap_config bmp380_regmap_config = {
        .reg_bits = 8,
        .val_bits = 8,

diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h
index 0933e411ae2cf6bf7b6af322e6eeca807bf37291..4b0ebce001df801a3481f6af30bf94fda85aa538 100644 (file)
--- a/drivers/iio/pressure/bmp280.h
+++ b/drivers/iio/pressure/bmp280.h
@@ -490,6 +490,7 @@ extern const struct bmp280_chip_info bmp580_chip_info;
 /* Regmap configurations */
 extern const struct regmap_config bmp180_regmap_config;
 extern const struct regmap_config bmp280_regmap_config;
+extern const struct regmap_config bme280_regmap_config;
 extern const struct regmap_config bmp380_regmap_config;
 extern const struct regmap_config bmp580_regmap_config;