Skip to contentSkip to conversation

iio: pressure: bmp280: Add support for BMP390

PATCH Superseded Angel Iglesias 3 participants 9 messages Aug 17, 2023 – Aug 28, 2023 IIO

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover iio: pressure: bmp280: Add support for BMP390

Adds support for the Bosch BMP390 pressure sensors. This new series shares the regmap present on the BMP380 family of sensors.

Patch 1 introduces a minor refactor to allow multiple device IDs per family of chip_info, making room for extended sensor families with various IDs sharing the same regmap.
Patch 2 adds the BMP390 id to the list of BMP380 devices id list.

Angel Iglesias (2):
iio: pressure: bmp280: Allow multiple chips id per family of devices
iio: pressure: bmp280: Add support for BMP390

 drivers/iio/pressure/bmp280-core.c | 51 ++++++++++++++++++++++++------
 drivers/iio/pressure/bmp280.h      |  4 ++-
 2 files changed, 44 insertions(+), 11 deletions(-)

base-commit: 14b7447cec15ee8dfdfe0da66ba1e280ded7e00a

Signature · 1 line
2.41.0
#1 lore raw

PATCH 1/2 iio: pressure: bmp280: Allow multiple chips id per family of devices

Improve device detection in certain chip families known to have various chip ids.

drivers/iio/pressure/bmp280-core.c +41 -10
index 6089f3f9d8f4..67941a67e513 100644
@@ -794,10 +794,12 @@ static int bmp280_chip_config(struct bmp280_data *data)
 }
 
 static const int bmp280_oversampling_avail[] = { 1, 2, 4, 8, 16 };
+static const int bmp280_chip_ids[] = { BMP280_CHIP_ID };
 
 const struct bmp280_chip_info bmp280_chip_info = {
 	.id_reg = BMP280_REG_ID,
-	.chip_id = BMP280_CHIP_ID,
+	.chip_id = bmp280_chip_ids,
+	.num_chip_id = ARRAY_SIZE(bmp280_chip_ids),
 	.regmap_config = &bmp280_regmap_config,
 	.start_up_time = 2000,
 	.channels = bmp280_channels,
@@ -846,9 +848,12 @@ static int bme280_chip_config(struct bmp280_data *data)
 	return bmp280_chip_config(data);
 }
 
+static const int bme280_chip_ids[] = { BME280_CHIP_ID };
+
 const struct bmp280_chip_info bme280_chip_info = {
 	.id_reg = BMP280_REG_ID,
-	.chip_id = BME280_CHIP_ID,
+	.chip_id = bme280_chip_ids,
+	.num_chip_id = ARRAY_SIZE(bme280_chip_ids),
 	.regmap_config = &bmp280_regmap_config,
 	.start_up_time = 2000,
 	.channels = bmp280_channels,
@@ -1220,10 +1225,12 @@ static int bmp380_chip_config(struct bmp280_data *data)
 
 static const int bmp380_oversampling_avail[] = { 1, 2, 4, 8, 16, 32 };
 static const int bmp380_iir_filter_coeffs_avail[] = { 1, 2, 4, 8, 16, 32, 64, 128};
+static const int bmp380_chip_ids[] = { BMP380_CHIP_ID };
 
 const struct bmp280_chip_info bmp380_chip_info = {
 	.id_reg = BMP380_REG_ID,
-	.chip_id = BMP380_CHIP_ID,
+	.chip_id = bmp380_chip_ids,
+	.num_chip_id = ARRAY_SIZE(bmp380_chip_ids),
 	.regmap_config = &bmp380_regmap_config,
 	.start_up_time = 2000,
 	.channels = bmp380_channels,
@@ -1720,10 +1727,12 @@ static int bmp580_chip_config(struct bmp280_data *data)
 }
 
 static const int bmp580_oversampling_avail[] = { 1, 2, 4, 8, 16, 32, 64, 128 };
+static const int bmp580_chip_ids[] = { BMP580_CHIP_ID, BMP580_CHIP_ID_ALT };
 
 const struct bmp280_chip_info bmp580_chip_info = {
 	.id_reg = BMP580_REG_CHIP_ID,
-	.chip_id = BMP580_CHIP_ID,
+	.chip_id = bmp580_chip_ids,
+	.num_chip_id = ARRAY_SIZE(bmp580_chip_ids),
 	.regmap_config = &bmp580_regmap_config,
 	.start_up_time = 2000,
 	.channels = bmp380_channels,
@@ -1983,10 +1992,12 @@ static int bmp180_chip_config(struct bmp280_data *data)
 
 static const int bmp180_oversampling_temp_avail[] = { 1 };
 static const int bmp180_oversampling_press_avail[] = { 1, 2, 4, 8 };
+static const int bmp180_chip_ids[] = { BMP180_CHIP_ID };
 
 const struct bmp280_chip_info bmp180_chip_info = {
 	.id_reg = BMP280_REG_ID,
-	.chip_id = BMP180_CHIP_ID,
+	.chip_id = bmp180_chip_ids,
+	.num_chip_id = ARRAY_SIZE(bmp180_chip_ids),
 	.regmap_config = &bmp180_regmap_config,
 	.start_up_time = 2000,
 	.channels = bmp280_channels,
@@ -2077,7 +2088,7 @@ int bmp280_common_probe(struct device *dev,
 	struct bmp280_data *data;
 	struct gpio_desc *gpiod;
 	unsigned int chip_id;
-	int ret;
+	int ret, i;
 
 	indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
 	if (!indio_dev)
@@ -2142,10 +2153,30 @@ int bmp280_common_probe(struct device *dev,
 	ret = regmap_read(regmap, data->chip_info->id_reg, &chip_id);
 	if (ret < 0)
 		return ret;
-	if (chip_id != data->chip_info->chip_id) {
-		dev_err(dev, "bad chip id: expected %x got %x\n",
-			data->chip_info->chip_id, chip_id);
-		return -EINVAL;
+
+	ret = -EINVAL;
+	for (i = 0; i < data->chip_info->num_chip_id; i++) {
+		if (chip_id == data->chip_info->chip_id[i]) {
+			ret = 0;
+			break;
+		}
+	}
+
+	if (ret) {
+		// 0x<id>, so four chars per number plus one space + ENDL
+		size_t nbuf = 5*data->chip_info->num_chip_id*sizeof(char);
+		char *buf = kmalloc(nbuf, GFP_KERNEL);
+
+		if (!buf)
+			return ret;
+
+		for (i = 0; i < data->chip_info->num_chip_id; i++)
+			snprintf(&buf[i*5], nbuf, "0x%x ", data->chip_info->chip_id[i]);
+		buf[nbuf-1] = '\0';
+
+		dev_err(dev, "bad chip id: expected [ %s ] got 0x%x\n", buf, chip_id);
+		kfree(buf);
+		return ret;
 	}
 
 	if (data->chip_info->preinit) {
drivers/iio/pressure/bmp280.h +2 -1
index 5c0563ce7572..d68745254340 100644
@@ -418,7 +418,8 @@ struct bmp280_data {
 
 struct bmp280_chip_info {
 	unsigned int id_reg;
-	const unsigned int chip_id;
+	const unsigned int *chip_id;
+	int num_chip_id;
 
 	const struct regmap_config *regmap_config;
 
Signature · 1 line
2.41.0
#7 lore raw

PATCH 2/2 iio: pressure: bmp280: Add support for BMP390

In reply to Angel Iglesias

Adds BMP390 device id to the supported ids on bmp380 sensor family

drivers/iio/pressure/bmp280-core.c +1 -1
index 67941a67e513..f2a63513e7eb 100644
@@ -1225,7 +1225,7 @@ static int bmp380_chip_config(struct bmp280_data *data)
 
 static const int bmp380_oversampling_avail[] = { 1, 2, 4, 8, 16, 32 };
 static const int bmp380_iir_filter_coeffs_avail[] = { 1, 2, 4, 8, 16, 32, 64, 128};
-static const int bmp380_chip_ids[] = { BMP380_CHIP_ID };
+static const int bmp380_chip_ids[] = { BMP380_CHIP_ID, BMP390_CHIP_ID };
 
 const struct bmp280_chip_info bmp380_chip_info = {
 	.id_reg = BMP380_REG_ID,
drivers/iio/pressure/bmp280.h +1 -0
index d68745254340..bfb98e3a5596 100644
@@ -293,6 +293,7 @@
 #define BMP180_CHIP_ID			0x55
 #define BMP280_CHIP_ID			0x58
 #define BME280_CHIP_ID			0x60
+#define BMP390_CHIP_ID			0x60
 #define BMP280_SOFT_RESET_VAL		0xB6
 
 /* BMP280 register skipped special values */
Signature · 1 line
2.41.0
#2 lore raw

Re: [PATCH 1/2] iio: pressure: bmp280: Allow multiple chips id per family of devices

In reply to Angel Iglesias
Quoted 2 lines · Angel Iglesias

Improve device detection in certain chip families known to have various chip ids.

...

drivers/iio/pressure/bmp280-core.c int bmp280_common_probe(struct device *dev, · line 2157

Quoted 1 line
drivers/iio/pressure/bmp280-core.c +1 -0
+	ret = -EINVAL;

Why do you need this...

drivers/iio/pressure/bmp280-core.c int bmp280_common_probe(struct device *dev,

Quoted 4 lines
drivers/iio/pressure/bmp280-core.c +3 -0
+	for (i = 0; i < data->chip_info->num_chip_id; i++) {
+		if (chip_id == data->chip_info->chip_id[i]) {
 
+			ret = 0;

..and this...

drivers/iio/pressure/bmp280-core.c int bmp280_common_probe(struct device *dev,

Quoted 5 lines
drivers/iio/pressure/bmp280-core.c +4 -0
+			break;
+		}
+	}
 
+	if (ret) {

...and this?

You can simply do

	for (i = 0; i < data->chip_info->num_chip_id; i++) {
		if (chip_id == data->chip_info->chip_id[i])
			break;
	}
	if (i < data->chip_info->num_chip_id) {

...

drivers/iio/pressure/bmp280-core.c int bmp280_common_probe(struct device *dev, · line 2167

Quoted 2 lines
drivers/iio/pressure/bmp280-core.c +2 -0
+		// 0x<id>, so four chars per number plus one space + ENDL
+		size_t nbuf = 5*data->chip_info->num_chip_id*sizeof(char);

Besides lack of spaces...

drivers/iio/pressure/bmp280-core.c int bmp280_common_probe(struct device *dev, · line 2168

Quoted 1 line
drivers/iio/pressure/bmp280-core.c +1 -0
+		char *buf = kmalloc(nbuf, GFP_KERNEL);

...this at least should be kmalloc_array() and on top maybe something from overflow.h will be needed.

Quoted 11 lines
drivers/iio/pressure/bmp280-core.c +10 -0
+		if (!buf)
+			return ret;
+
+		for (i = 0; i < data->chip_info->num_chip_id; i++)
+			snprintf(&buf[i*5], nbuf, "0x%x ", data->chip_info->chip_id[i]);
+		buf[nbuf-1] = '\0';
+
+		dev_err(dev, "bad chip id: expected [ %s ] got 0x%x\n", buf, chip_id);
+		kfree(buf);
+		return ret;
 	}

...

drivers/iio/pressure/bmp280.h struct bmp280_data { · line 421

Quoted 1 line
drivers/iio/pressure/bmp280.h +0 -1
-	const unsigned int chip_id;

Yeah, this const makes a little sense...

drivers/iio/pressure/bmp280.h struct bmp280_data { · line 421

Quoted 1 line
drivers/iio/pressure/bmp280.h +1 -0
+	const unsigned int *chip_id;

...but not this :-)

What I'm wondering is why it's int and not u8 / u16 (as it seems only a byte value there).

drivers/iio/pressure/bmp280.h struct bmp280_data { · line 422

Quoted 1 line
drivers/iio/pressure/bmp280.h +1 -0
+	int num_chip_id;

unsigned.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#8 lore raw
In reply to Angel Iglesias
Quoted 1 line · Angel Iglesias

Adds BMP390 device id to the supported ids on bmp380 sensor family

...

Quoted 4 lines

#define BMP180_CHIP_ID 0x55
#define BMP280_CHIP_ID 0x58
#define BME280_CHIP_ID 0x60
+#define BMP390_CHIP_ID 0x60

Keep it a bit better ordered. At the first glance, move before BME.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#3 lore raw

Re: [PATCH 1/2] iio: pressure: bmp280: Allow multiple chips id per family of devices

In reply to Andy Shevchenko
Quoted 25 lines · Andy Shevchenko
Quoted 2 lines · Angel Iglesias

Improve device detection in certain chip families known to have various chip ids.

...

Quoted 1 line

+       ret = -EINVAL;

Why do you need this...

Quoted 4 lines

+       for (i = 0; i < data->chip_info->num_chip_id; i++) { +               if (chip_id == data->chip_info->chip_id[i]) {

+                       ret = 0;

..and this...

Quoted 5 lines

+                       break;
+               }
+       }

+       if (ret) {

...and this?

Quoted 8 lines

You can simply do

        for (i = 0; i < data->chip_info->num_chip_id; i++) { if (chip_id == data->chip_info->chip_id[i]) break;
        }
        if (i < data->chip_info->num_chip_id) {

Got it, much cleaner also.

Quoted 11 lines

...

Quoted 2 lines

+               // 0x<id>, so four chars per number plus one space + ENDL +               size_t nbuf = 5*data->chip_info->num_chip_id*sizeof(char);

Besides lack of spaces...

Quoted 1 line

+               char *buf = kmalloc(nbuf, GFP_KERNEL);

...this at least should be kmalloc_array() and on top maybe something from overflow.h will be needed.

Sure, I'll give a look. I didn't want to do string manipulations on a kernel driver but couldn't found a way to log the error meaningfully in one entry.

Quoted 16 lines
Quoted 13 lines

+               if (!buf)
+                       return ret;
+
+               for (i = 0; i < data->chip_info->num_chip_id; i++) +                       snprintf(&buf[i*5], nbuf, "0x%x ", data->chip_info-

Quoted 1 line

chip_id[i]);

+               buf[nbuf-1] = '\0';
+
+               dev_err(dev, "bad chip id: expected [ %s ] got 0x%x\n", buf, chip_id);
+               kfree(buf);
+               return ret;
        }

...

Quoted 7 lines
Quoted 1 line

-       const unsigned int chip_id;

Yeah, this const makes a little sense...

Quoted 1 line

+       const unsigned int *chip_id;

...but not this :-)

Isn't the same case as "const struct iio_chan_spec *channels" or "const int *oversampling_temp_avail". I thoght that this meant a pointer to a constant integer. On bmp280-core I declare the arrays with the modifiers static const.

Quoted 2 lines

What I'm wondering is why it's int and not u8 / u16 (as it seems only a byte value there).

Yeah, can be u8, as the reg width is 1 byte and this IDs are stored on one reg. I just carried over the int type from previous versions, but it's just wasting space :/

Quoted 5 lines
Quoted 2 lines

+       int num_chip_id;

unsigned.

Thanks for your time!

Kind regards,
Angel

#4 lore raw

Re: [PATCH 1/2] iio: pressure: bmp280: Allow multiple chips id per family of devices

Quoted 2 lines · Angel Iglesias
Quoted 1 line · Andy Shevchenko

On Thu, Aug 17, 2023 at 11:05:21PM +0200, Angel Iglesias wrote:

...

Quoted 11 lines
Quoted 7 lines
Quoted 1 line

-       const unsigned int chip_id;

Yeah, this const makes a little sense...

Quoted 1 line

+       const unsigned int *chip_id;

...but not this :-)

Isn't the same case as "const struct iio_chan_spec *channels" or "const int *oversampling_temp_avail". I thoght that this meant a pointer to a constant integer. On bmp280-core I declare the arrays with the modifiers static const.

Yes, and that is my point:
- old code makes a little sense
- new code makes a lot of sense

Quoted 6 lines
Quoted 2 lines

What I'm wondering is why it's int and not u8 / u16 (as it seems only a byte value there).

Yeah, can be u8, as the reg width is 1 byte and this IDs are stored on one reg. I just carried over the int type from previous versions, but it's just wasting space :/

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#5 lore raw

Re: [PATCH 1/2] iio: pressure: bmp280: Allow multiple chips id per family of devices

Quoted 14 lines · Andy Shevchenko
Quoted 2 lines · Angel Iglesias
Quoted 1 line · Andy Shevchenko

On Thu, Aug 17, 2023 at 11:05:21PM +0200, Angel Iglesias wrote:

...

Quoted 8 lines
Quoted 7 lines
Quoted 1 line

-       const unsigned int chip_id;

Yeah, this const makes a little sense...

Quoted 1 line

+       const unsigned int *chip_id;

...but not this :-)

Quoted 8 lines
Quoted 4 lines

Isn't the same case as "const struct iio_chan_spec *channels" or "const int *oversampling_temp_avail". I thoght that this meant a pointer to a constant integer. On bmp280-core I declare the arrays with the modifiers static const.

Yes, and that is my point:
- old code makes a little sense
- new code makes a lot of sense

Thanks for the clarification. I initially understood the opposite :S

Quoted 9 lines
Quoted 8 lines
Quoted 2 lines

What I'm wondering is why it's int and not u8 / u16 (as it seems only a byte value there).

Yeah, can be u8, as the reg width is 1 byte and this IDs are stored on one reg.
I just carried over the int type from previous versions, but it's just wasting
space :/

maintainer
#6 lore raw

Re: [PATCH 1/2] iio: pressure: bmp280: Allow multiple chips id per family of devices

In reply to Angel Iglesias

drivers/iio/pressure/bmp280-core.c int bmp280_common_probe(struct device *dev, · line 2166

Quoted 2 lines
drivers/iio/pressure/bmp280-core.c +2 -0
+	if (ret) {
+		// 0x<id>, so four chars per number plus one space + ENDL

/* */