Commit 5b46b48a authored by Vasileios Amoiridis's avatar Vasileios Amoiridis Committed by Wen Zhiwei
Browse files

iio: pressure: bmp280: Fix regmap for BMP280 device 

stable inclusion
from stable-v6.6.55
commit ae6724f9f13e903c1e68ccb044bc3cdbfc194df6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB0MX4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ae6724f9f13e903c1e68ccb044bc3cdbfc194df6



--------------------------------

[ Upstream commit b9065b0250e1705935445ede0a18c1850afe7b75 ]

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

Fixes: 14e8015f ("iio: pressure: bmp280: split driver in logical parts")
Signed-off-by: default avatarVasileios Amoiridis <vassilisamir@gmail.com>
Link: https://patch.msgid.link/20240711211558.106327-2-vassilisamir@gmail.com


Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 5467d5f9

drivers/iio/pressure/bmp280-core.c

+1 −1
Original line number Diff line number Diff line
@@ -852,7 +852,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 = bmp280_channels,

	.num_channels = 3,

drivers/iio/pressure/bmp280-regmap.c

+42 −3
Original line number Diff line number Diff line
@@ -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,

drivers/iio/pressure/bmp280.h

+1 −0
Original line number Diff line number Diff line
@@ -468,6 +468,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;