* [PATCH v5 1/7] iio: pressure: bmp280: Use bulk read for humidity calibration data
2024-09-02 18:42 [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support Vasileios Amoiridis
@ 2024-09-02 18:42 ` Vasileios Amoiridis
2024-09-02 18:42 ` [PATCH v5 2/7] iio: pressure: bmp280: Add support for bmp280 soft reset Vasileios Amoiridis
` (6 subsequent siblings)
7 siblings, 0 replies; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-02 18:42 UTC (permalink / raw)
To: jic23, lars, robh, krzk+dt, conor+dt, andriy.shevchenko
Cc: vassilisamir, ang.iglesiasg, linus.walleij, biju.das.jz,
javier.carrasco.cruz, semen.protsenko, 579lpy, ak, linux-iio,
devicetree, linux-kernel, christophe.jaillet
Convert individual reads to a bulk read for the humidity calibration data.
Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
---
drivers/iio/pressure/bmp280-core.c | 63 +++++++++++-------------------
drivers/iio/pressure/bmp280.h | 6 +++
2 files changed, 28 insertions(+), 41 deletions(-)
diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index 8383d1a73cf9..3b221e16aa42 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -340,10 +340,19 @@ static int bmp280_read_calib(struct bmp280_data *data)
return 0;
}
+/*
+ * These enums are used for indexing into the array of humidity parameters
+ * for BME280. Due to some weird indexing, unaligned BE/LE accesses co-exist in
+ * order to prepare the FIELD_{GET/PREP}() fields. Table 16 in Section 4.2.2 of
+ * the datasheet.
+ */
+enum { H2 = 0, H3 = 2, H4 = 3, H5 = 4, H6 = 6 };
+
static int bme280_read_calib(struct bmp280_data *data)
{
struct bmp280_calib *calib = &data->calib.bmp280;
struct device *dev = data->dev;
+ s16 h4_upper, h4_lower, tmp_1, tmp_2, tmp_3;
unsigned int tmp;
int ret;
@@ -352,14 +361,6 @@ static int bme280_read_calib(struct bmp280_data *data)
if (ret)
return ret;
- /*
- * Read humidity calibration values.
- * Due to some odd register addressing we cannot just
- * do a big bulk read. Instead, we have to read each Hx
- * value separately and sometimes do some bit shifting...
- * Humidity data is only available on BME280.
- */
-
ret = regmap_read(data->regmap, BME280_REG_COMP_H1, &tmp);
if (ret) {
dev_err(dev, "failed to read H1 comp value\n");
@@ -368,43 +369,23 @@ static int bme280_read_calib(struct bmp280_data *data)
calib->H1 = tmp;
ret = regmap_bulk_read(data->regmap, BME280_REG_COMP_H2,
- &data->le16, sizeof(data->le16));
- if (ret) {
- dev_err(dev, "failed to read H2 comp value\n");
- return ret;
- }
- calib->H2 = sign_extend32(le16_to_cpu(data->le16), 15);
-
- ret = regmap_read(data->regmap, BME280_REG_COMP_H3, &tmp);
- if (ret) {
- dev_err(dev, "failed to read H3 comp value\n");
- return ret;
- }
- calib->H3 = tmp;
-
- ret = regmap_bulk_read(data->regmap, BME280_REG_COMP_H4,
- &data->be16, sizeof(data->be16));
+ data->bme280_humid_cal_buf,
+ sizeof(data->bme280_humid_cal_buf));
if (ret) {
- dev_err(dev, "failed to read H4 comp value\n");
+ dev_err(dev, "failed to read humidity calibration values\n");
return ret;
}
- calib->H4 = sign_extend32(((be16_to_cpu(data->be16) >> 4) & 0xff0) |
- (be16_to_cpu(data->be16) & 0xf), 11);
- ret = regmap_bulk_read(data->regmap, BME280_REG_COMP_H5,
- &data->le16, sizeof(data->le16));
- if (ret) {
- dev_err(dev, "failed to read H5 comp value\n");
- return ret;
- }
- calib->H5 = sign_extend32(FIELD_GET(BME280_COMP_H5_MASK, le16_to_cpu(data->le16)), 11);
-
- ret = regmap_read(data->regmap, BME280_REG_COMP_H6, &tmp);
- if (ret) {
- dev_err(dev, "failed to read H6 comp value\n");
- return ret;
- }
- calib->H6 = sign_extend32(tmp, 7);
+ calib->H2 = get_unaligned_le16(&data->bme280_humid_cal_buf[H2]);
+ calib->H3 = data->bme280_humid_cal_buf[H3];
+ tmp_1 = get_unaligned_be16(&data->bme280_humid_cal_buf[H4]);
+ tmp_2 = FIELD_GET(BME280_COMP_H4_GET_MASK_UP, tmp_1);
+ h4_upper = FIELD_PREP(BME280_COMP_H4_PREP_MASK_UP, tmp_2);
+ h4_lower = FIELD_GET(BME280_COMP_H4_MASK_LOW, tmp_1);
+ calib->H4 = sign_extend32(h4_upper | h4_lower, 11);
+ tmp_3 = get_unaligned_le16(&data->bme280_humid_cal_buf[H5]);
+ calib->H5 = sign_extend32(FIELD_GET(BME280_COMP_H5_MASK, tmp_3), 11);
+ calib->H6 = data->bme280_humid_cal_buf[H6];
return 0;
}
diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h
index a853b6d5bdfa..4e675401d61b 100644
--- a/drivers/iio/pressure/bmp280.h
+++ b/drivers/iio/pressure/bmp280.h
@@ -257,8 +257,13 @@
#define BME280_REG_COMP_H5 0xE5
#define BME280_REG_COMP_H6 0xE7
+#define BME280_COMP_H4_GET_MASK_UP GENMASK(15, 8)
+#define BME280_COMP_H4_PREP_MASK_UP GENMASK(11, 4)
+#define BME280_COMP_H4_MASK_LOW GENMASK(3, 0)
#define BME280_COMP_H5_MASK GENMASK(15, 4)
+#define BME280_CONTIGUOUS_CALIB_REGS 7
+
#define BME280_OSRS_HUMIDITY_MASK GENMASK(2, 0)
#define BME280_OSRS_HUMIDITY_SKIP 0
#define BME280_OSRS_HUMIDITY_1X 1
@@ -426,6 +431,7 @@ struct bmp280_data {
/* Calibration data buffers */
__le16 bmp280_cal_buf[BMP280_CONTIGUOUS_CALIB_REGS / 2];
__be16 bmp180_cal_buf[BMP180_REG_CALIB_COUNT / 2];
+ u8 bme280_humid_cal_buf[BME280_CONTIGUOUS_CALIB_REGS];
u8 bmp380_cal_buf[BMP380_CALIB_REG_COUNT];
/* Miscellaneous, endianness-aware data buffers */
__le16 le16;
base-commit: 0f718e10da81446df0909c9939dff2b77e3b4e95
prerequisite-patch-id: e4f81f31f4fbb2aa872c0c74ed4511893eee0c9a
--
2.25.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH v5 2/7] iio: pressure: bmp280: Add support for bmp280 soft reset
2024-09-02 18:42 [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support Vasileios Amoiridis
2024-09-02 18:42 ` [PATCH v5 1/7] iio: pressure: bmp280: Use bulk read for humidity calibration data Vasileios Amoiridis
@ 2024-09-02 18:42 ` Vasileios Amoiridis
2024-09-02 18:42 ` [PATCH v5 3/7] iio: pressure: bmp280: Remove config error check for IIR filter updates Vasileios Amoiridis
` (5 subsequent siblings)
7 siblings, 0 replies; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-02 18:42 UTC (permalink / raw)
To: jic23, lars, robh, krzk+dt, conor+dt, andriy.shevchenko
Cc: vassilisamir, ang.iglesiasg, linus.walleij, biju.das.jz,
javier.carrasco.cruz, semen.protsenko, 579lpy, ak, linux-iio,
devicetree, linux-kernel, christophe.jaillet
The BM(P/E)28x devices have an option for soft reset which is also
recommended by the Bosch Sensortech BME2 Sensor API to be used before the
initial configuration of the device.
Link: https://github.com/boschsensortec/BME280_SensorAPI/blob/bme280_v3.5.1/bme280.c#L429
Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
---
drivers/iio/pressure/bmp280-core.c | 29 +++++++++++++++++++++++++++++
drivers/iio/pressure/bmp280.h | 3 +++
2 files changed, 32 insertions(+)
diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index 3b221e16aa42..cd975fad2753 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -964,6 +964,33 @@ static const unsigned long bme280_avail_scan_masks[] = {
0
};
+static int bmp280_preinit(struct bmp280_data *data)
+{
+ struct device *dev = data->dev;
+ unsigned int reg;
+ int ret;
+
+ ret = regmap_write(data->regmap, BMP280_REG_RESET, BMP280_RST_SOFT_CMD);
+ if (ret)
+ return dev_err_probe(dev, ret, "Failed to reset device.\n");
+
+ /*
+ * According to the datasheet in Chapter 1: Specification, Table 2,
+ * after resetting, the device uses the complete power-on sequence so
+ * it needs to wait for the defined start-up time.
+ */
+ fsleep(data->start_up_time);
+
+ ret = regmap_read(data->regmap, BMP280_REG_STATUS, ®);
+ if (ret)
+ return dev_err_probe(dev, ret, "Failed to read status register.\n");
+
+ if (reg & BMP280_REG_STATUS_IM_UPDATE)
+ return dev_err_probe(dev, -EIO, "Failed to copy NVM contents.\n");
+
+ return 0;
+}
+
static int bmp280_chip_config(struct bmp280_data *data)
{
u8 osrs = FIELD_PREP(BMP280_OSRS_TEMP_MASK, data->oversampling_temp + 1) |
@@ -1081,6 +1108,7 @@ const struct bmp280_chip_info bmp280_chip_info = {
.read_temp = bmp280_read_temp,
.read_press = bmp280_read_press,
.read_calib = bmp280_read_calib,
+ .preinit = bmp280_preinit,
.trigger_handler = bmp280_trigger_handler,
};
@@ -1201,6 +1229,7 @@ const struct bmp280_chip_info bme280_chip_info = {
.read_press = bmp280_read_press,
.read_humid = bme280_read_humid,
.read_calib = bme280_read_calib,
+ .preinit = bmp280_preinit,
.trigger_handler = bme280_trigger_handler,
};
diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h
index 4e675401d61b..73516878d020 100644
--- a/drivers/iio/pressure/bmp280.h
+++ b/drivers/iio/pressure/bmp280.h
@@ -205,6 +205,9 @@
#define BMP280_REG_CONFIG 0xF5
#define BMP280_REG_CTRL_MEAS 0xF4
#define BMP280_REG_STATUS 0xF3
+#define BMP280_REG_STATUS_IM_UPDATE BIT(0)
+#define BMP280_REG_RESET 0xE0
+#define BMP280_RST_SOFT_CMD 0xB6
#define BMP280_REG_COMP_TEMP_START 0x88
#define BMP280_COMP_TEMP_REG_COUNT 6
--
2.25.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH v5 3/7] iio: pressure: bmp280: Remove config error check for IIR filter updates
2024-09-02 18:42 [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support Vasileios Amoiridis
2024-09-02 18:42 ` [PATCH v5 1/7] iio: pressure: bmp280: Use bulk read for humidity calibration data Vasileios Amoiridis
2024-09-02 18:42 ` [PATCH v5 2/7] iio: pressure: bmp280: Add support for bmp280 soft reset Vasileios Amoiridis
@ 2024-09-02 18:42 ` Vasileios Amoiridis
2024-09-02 18:42 ` [PATCH v5 4/7] iio: pressure: bmp280: Use sleep and forced mode for oneshot captures Vasileios Amoiridis
` (4 subsequent siblings)
7 siblings, 0 replies; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-02 18:42 UTC (permalink / raw)
To: jic23, lars, robh, krzk+dt, conor+dt, andriy.shevchenko
Cc: vassilisamir, ang.iglesiasg, linus.walleij, biju.das.jz,
javier.carrasco.cruz, semen.protsenko, 579lpy, ak, linux-iio,
devicetree, linux-kernel, christophe.jaillet
When there is a change in the configuration of the BMP3xx device, several
steps take place. These steps include:
1) Update the OSR settings and check if there was an update
2) Update the ODR settings and check if there was an update
3) Update the IIR settings and check if there was an update
4) Check if there was an update with the following procedure:
a) Set sensor to SLEEP mode and after to NORMAL mode to trigger
a new measurement.
b) Wait the maximum amount possible depending on the OSR settings
c) Check the configuration error register if there was an error
during the configuration of the sensor.
This check is necessary, because there could be a case where the OSR is
too high for the requested ODR so either the ODR needs to be slower or the
OSR needs to be less. This is something that is checked internally by the
sensor when it runs in NORMAL mode.
In the BMP58x devices the previous steps are done internally by the sensor.
The IIR filter settings do not depend on the OSR or ODR settings, and there
is no need to run a check in case they change.
Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
---
drivers/iio/pressure/bmp280-core.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index cd975fad2753..ba77c428042d 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -1559,14 +1559,12 @@ static int bmp380_chip_config(struct bmp280_data *data)
change = change || aux;
/* Set filter data */
- ret = regmap_update_bits_check(data->regmap, BMP380_REG_CONFIG, BMP380_FILTER_MASK,
- FIELD_PREP(BMP380_FILTER_MASK, data->iir_filter_coeff),
- &aux);
+ ret = regmap_update_bits(data->regmap, BMP380_REG_CONFIG, BMP380_FILTER_MASK,
+ FIELD_PREP(BMP380_FILTER_MASK, data->iir_filter_coeff));
if (ret) {
dev_err(data->dev, "failed to write config register\n");
return ret;
}
- change = change || aux;
if (change) {
/*
@@ -2156,15 +2154,13 @@ static int bmp580_chip_config(struct bmp280_data *data)
reg_val = FIELD_PREP(BMP580_DSP_IIR_PRESS_MASK, data->iir_filter_coeff) |
FIELD_PREP(BMP580_DSP_IIR_TEMP_MASK, data->iir_filter_coeff);
- ret = regmap_update_bits_check(data->regmap, BMP580_REG_DSP_IIR,
- BMP580_DSP_IIR_PRESS_MASK |
- BMP580_DSP_IIR_TEMP_MASK,
- reg_val, &aux);
+ ret = regmap_update_bits(data->regmap, BMP580_REG_DSP_IIR,
+ BMP580_DSP_IIR_PRESS_MASK | BMP580_DSP_IIR_TEMP_MASK,
+ reg_val);
if (ret) {
dev_err(data->dev, "failed to write config register\n");
return ret;
}
- change = change || aux;
/* Restore sensor to normal operation mode */
ret = regmap_write_bits(data->regmap, BMP580_REG_ODR_CONFIG,
--
2.25.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH v5 4/7] iio: pressure: bmp280: Use sleep and forced mode for oneshot captures
2024-09-02 18:42 [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support Vasileios Amoiridis
` (2 preceding siblings ...)
2024-09-02 18:42 ` [PATCH v5 3/7] iio: pressure: bmp280: Remove config error check for IIR filter updates Vasileios Amoiridis
@ 2024-09-02 18:42 ` Vasileios Amoiridis
2024-09-03 14:26 ` Andy Shevchenko
2024-09-02 18:42 ` [PATCH v5 5/7] dt-bindings: iio: pressure: bmp085: Add interrupts for BMP3xx and BMP5xx devices Vasileios Amoiridis
` (3 subsequent siblings)
7 siblings, 1 reply; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-02 18:42 UTC (permalink / raw)
To: jic23, lars, robh, krzk+dt, conor+dt, andriy.shevchenko
Cc: vassilisamir, ang.iglesiasg, linus.walleij, biju.das.jz,
javier.carrasco.cruz, semen.protsenko, 579lpy, ak, linux-iio,
devicetree, linux-kernel, christophe.jaillet
Add forced mode support in sensors BMP28x, BME28x, BMP3xx and BMP58x.
Sensors BMP18x and BMP085 are old and do not support this feature so
their operation is not affected at all.
Essentially, up to now, the rest of the sensors were used in normal mode
all the time. This means that they are continuously doing measurements
even though these measurements are not used. Even though the sensor does
provide PM support, to cover all the possible use cases, the sensor needs
to go into sleep mode and wake up whenever necessary.
The idea is that the sensor is by default in sleep mode, wakes up in
forced mode when a oneshot capture is requested, or in normal mode
when the buffer is enabled. The difference lays in the fact that in
forced mode, the sensor does only one conversion and goes back to sleep
while in normal mode, the sensor does continuous measurements with the
frequency that was set in the ODR registers.
The bmpX_chip_config() functions which are responsible for applying
the requested configuration to the sensor, are modified accordingly
in order to set the sensor by default in sleep mode.
DEEP STANDBY, Low Power NORMAL and CONTINUOUS modes, supported only by
the BMP58x version, are not added.
Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
---
drivers/iio/pressure/bmp280-core.c | 291 +++++++++++++++++++++++++++--
drivers/iio/pressure/bmp280.h | 21 +++
2 files changed, 292 insertions(+), 20 deletions(-)
diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index ba77c428042d..b8a55de78616 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -16,6 +16,11 @@
* https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bmp390-ds002.pdf
* https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bmp581-ds004.pdf
*
+ * Sensor API:
+ * https://github.com/boschsensortec/BME280_SensorAPI
+ * https://github.com/boschsensortec/BMP3_SensorAPI
+ * https://github.com/boschsensortec/BMP5_SensorAPI
+ *
* Notice:
* The link to the bmp180 datasheet points to an outdated version missing these changes:
* - Changed document referral from ANP015 to BST-MPS-AN004-00 on page 26
@@ -616,6 +621,14 @@ static int bmp280_read_raw_impl(struct iio_dev *indio_dev,
switch (mask) {
case IIO_CHAN_INFO_PROCESSED:
+ ret = data->chip_info->set_mode(data, BMP280_FORCED);
+ if (ret)
+ return ret;
+
+ ret = data->chip_info->wait_conv(data);
+ if (ret)
+ return ret;
+
switch (chan->type) {
case IIO_HUMIDITYRELATIVE:
ret = data->chip_info->read_humid(data, &chan_value);
@@ -645,6 +658,14 @@ static int bmp280_read_raw_impl(struct iio_dev *indio_dev,
return -EINVAL;
}
case IIO_CHAN_INFO_RAW:
+ ret = data->chip_info->set_mode(data, BMP280_FORCED);
+ if (ret)
+ return ret;
+
+ ret = data->chip_info->wait_conv(data);
+ if (ret)
+ return ret;
+
switch (chan->type) {
case IIO_HUMIDITYRELATIVE:
ret = data->chip_info->read_humid(data, &chan_value);
@@ -991,6 +1012,69 @@ static int bmp280_preinit(struct bmp280_data *data)
return 0;
}
+static const u8 bmp280_operation_mode[] = {
+ BMP280_MODE_SLEEP, BMP280_MODE_FORCED, BMP280_MODE_NORMAL,
+};
+
+static int bmp280_set_mode(struct bmp280_data *data, enum bmp280_op_mode mode)
+{
+ int ret;
+
+ switch (mode) {
+ case BMP280_SLEEP:
+ case BMP280_FORCED:
+ case BMP280_NORMAL:
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ ret = regmap_write_bits(data->regmap, BMP280_REG_CTRL_MEAS,
+ BMP280_MODE_MASK, bmp280_operation_mode[mode]);
+ if (ret) {
+ dev_err(data->dev, "failed to write ctrl_meas register.\n");
+ return ret;
+ }
+
+ data->op_mode = mode;
+
+ return 0;
+}
+
+static int bmp280_wait_conv(struct bmp280_data *data)
+{
+ unsigned int reg, meas_time_us;
+ int ret;
+
+ /* Check if we are using a BME280 device */
+ if (data->oversampling_humid)
+ meas_time_us += BMP280_PRESS_HUMID_MEAS_OFFSET +
+ (BIT(data->oversampling_humid) * BMP280_MEAS_DUR);
+
+ /* Pressure measurement time */
+ meas_time_us += BMP280_PRESS_HUMID_MEAS_OFFSET +
+ (BIT(data->oversampling_press) * BMP280_MEAS_DUR);
+
+ /* Temperature measurement time */
+ meas_time_us += BIT(data->oversampling_temp) * BMP280_MEAS_DUR;
+
+ /* Waiting time according to the BM(P/E)2 Sensor API */
+ fsleep(meas_time_us);
+
+ ret = regmap_read(data->regmap, BMP280_REG_STATUS, ®);
+ if (ret) {
+ dev_err(data->dev, "failed to read status register.\n");
+ return ret;
+ }
+
+ if (reg & BMP280_REG_STATUS_MEAS_BIT) {
+ dev_err(data->dev, "Measurement cycle didn't complete.\n");
+ return -EBUSY;
+ }
+
+ return 0;
+}
+
static int bmp280_chip_config(struct bmp280_data *data)
{
u8 osrs = FIELD_PREP(BMP280_OSRS_TEMP_MASK, data->oversampling_temp + 1) |
@@ -1001,7 +1085,7 @@ static int bmp280_chip_config(struct bmp280_data *data)
BMP280_OSRS_TEMP_MASK |
BMP280_OSRS_PRESS_MASK |
BMP280_MODE_MASK,
- osrs | BMP280_MODE_NORMAL);
+ osrs | BMP280_MODE_SLEEP);
if (ret) {
dev_err(data->dev, "failed to write ctrl_meas register\n");
return ret;
@@ -1108,6 +1192,8 @@ const struct bmp280_chip_info bmp280_chip_info = {
.read_temp = bmp280_read_temp,
.read_press = bmp280_read_press,
.read_calib = bmp280_read_calib,
+ .set_mode = bmp280_set_mode,
+ .wait_conv = bmp280_wait_conv,
.preinit = bmp280_preinit,
.trigger_handler = bmp280_trigger_handler,
@@ -1229,6 +1315,8 @@ const struct bmp280_chip_info bme280_chip_info = {
.read_press = bmp280_read_press,
.read_humid = bme280_read_humid,
.read_calib = bme280_read_calib,
+ .set_mode = bmp280_set_mode,
+ .wait_conv = bmp280_wait_conv,
.preinit = bmp280_preinit,
.trigger_handler = bme280_trigger_handler,
@@ -1516,6 +1604,71 @@ static int bmp380_preinit(struct bmp280_data *data)
return bmp380_cmd(data, BMP380_CMD_SOFT_RESET);
}
+static const u8 bmp380_operation_mode[] = {
+ BMP380_MODE_SLEEP, BMP380_MODE_FORCED, BMP380_MODE_NORMAL,
+};
+
+static int bmp380_set_mode(struct bmp280_data *data, enum bmp280_op_mode mode)
+{
+ int ret;
+
+ switch (mode) {
+ case BMP280_SLEEP:
+ case BMP280_FORCED:
+ case BMP280_NORMAL:
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ ret = regmap_write_bits(data->regmap, BMP380_REG_POWER_CONTROL,
+ BMP380_MODE_MASK,
+ FIELD_PREP(BMP380_MODE_MASK,
+ bmp380_operation_mode[mode]));
+ if (ret) {
+ dev_err(data->dev, "failed to write power control register.\n");
+ return ret;
+ }
+
+ data->op_mode = mode;
+
+ return 0;
+}
+
+static int bmp380_wait_conv(struct bmp280_data *data)
+{
+ unsigned int reg;
+ int ret, meas_time_us;
+
+ /* Offset measurement time */
+ meas_time_us = BMP380_MEAS_OFFSET;
+
+ /* Pressure measurement time */
+ meas_time_us += BMP380_PRESS_MEAS_OFFSET +
+ (BIT(data->oversampling_press) * BMP380_MEAS_DUR);
+
+ /* Temperature measurement time */
+ meas_time_us += BMP380_TEMP_MEAS_OFFSET +
+ (BIT(data->oversampling_temp) * BMP380_MEAS_DUR);
+
+ /* Measurement time defined in Datasheet Section 3.9.2 */
+ fsleep(meas_time_us);
+
+ ret = regmap_read(data->regmap, BMP380_REG_STATUS, ®);
+ if (ret) {
+ dev_err(data->dev, "failed to read status register.\n");
+ return ret;
+ }
+
+ if (!(reg & BMP380_STATUS_DRDY_PRESS_MASK) ||
+ !(reg & BMP380_STATUS_DRDY_TEMP_MASK)) {
+ dev_err(data->dev, "Measurement cycle didn't complete.\n");
+ return -EBUSY;
+ }
+
+ return 0;
+}
+
static int bmp380_chip_config(struct bmp280_data *data)
{
bool change = false, aux;
@@ -1576,17 +1729,19 @@ static int bmp380_chip_config(struct bmp280_data *data)
* Resets sensor measurement loop toggling between sleep and
* normal operating modes.
*/
- ret = regmap_write_bits(data->regmap, BMP380_REG_POWER_CONTROL,
- BMP380_MODE_MASK,
- FIELD_PREP(BMP380_MODE_MASK, BMP380_MODE_SLEEP));
+ ret = bmp380_set_mode(data, BMP280_SLEEP);
if (ret) {
dev_err(data->dev, "failed to set sleep mode\n");
return ret;
}
- usleep_range(2000, 2500);
- ret = regmap_write_bits(data->regmap, BMP380_REG_POWER_CONTROL,
- BMP380_MODE_MASK,
- FIELD_PREP(BMP380_MODE_MASK, BMP380_MODE_NORMAL));
+
+ /*
+ * According to the BMP3 Sensor API, the sensor needs 5000us
+ * in order to go to the sleep mode.
+ */
+ fsleep(5000);
+
+ ret = bmp380_set_mode(data, BMP280_NORMAL);
if (ret) {
dev_err(data->dev, "failed to set normal mode\n");
return ret;
@@ -1612,6 +1767,17 @@ static int bmp380_chip_config(struct bmp280_data *data)
}
}
+ /* Dummy read to empty data registers. */
+ ret = bmp380_read_press(data, &tmp);
+ if (ret)
+ return ret;
+
+ ret = bmp380_set_mode(data, BMP280_SLEEP);
+ if (ret) {
+ dev_err(data->dev, "failed to set sleep mode.\n");
+ return ret;
+ }
+
return 0;
}
@@ -1705,6 +1871,8 @@ const struct bmp280_chip_info bmp380_chip_info = {
.read_temp = bmp380_read_temp,
.read_press = bmp380_read_press,
.read_calib = bmp380_read_calib,
+ .set_mode = bmp380_set_mode,
+ .wait_conv = bmp380_wait_conv,
.preinit = bmp380_preinit,
.trigger_handler = bmp380_trigger_handler,
@@ -2092,6 +2260,70 @@ static int bmp580_preinit(struct bmp280_data *data)
return PTR_ERR_OR_ZERO(devm_nvmem_register(config.dev, &config));
}
+static const u8 bmp580_operation_mode[] = {
+ BMP580_MODE_SLEEP, BMP580_MODE_FORCED, BMP580_MODE_NORMAL,
+};
+
+static int bmp580_set_mode(struct bmp280_data *data, enum bmp280_op_mode mode)
+{
+ struct device *dev = data->dev;
+ int ret;
+
+ switch (mode) {
+ case BMP280_SLEEP:
+ case BMP280_NORMAL:
+ break;
+ case BMP280_FORCED:
+ ret = regmap_set_bits(data->regmap, BMP580_REG_DSP_CONFIG,
+ BMP580_DSP_IIR_FORCED_FLUSH);
+ if (ret) {
+ dev_err(dev, "Could not flush IIR filter constants.\n");
+ return ret;
+ }
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ ret = regmap_write_bits(data->regmap, BMP580_REG_ODR_CONFIG,
+ BMP580_MODE_MASK,
+ FIELD_PREP(BMP580_MODE_MASK,
+ bmp580_operation_mode[mode]));
+ if (ret) {
+ dev_err(dev, "failed to write power control register.\n");
+ return ret;
+ }
+
+ data->op_mode = mode;
+
+ return 0;
+}
+
+static int bmp580_wait_conv(struct bmp280_data *data)
+{
+ /*
+ * Taken from datasheet, Section 2 "Specification, Table 3 "Electrical
+ * characteristics.
+ */
+ static const int time_conv_press[] = {
+ 0, 1050, 1785, 3045, 5670, 10920, 21420, 42420,
+ 84420,
+ };
+ static const int time_conv_temp[] = {
+ 0, 1050, 1105, 1575, 2205, 3465, 6090, 11340,
+ 21840,
+ };
+ int meas_time_us;
+
+ meas_time_us = 4 * USEC_PER_MSEC + time_conv_temp[data->oversampling_temp]
+ + time_conv_press[data->oversampling_press];
+
+ /* Measurement time mentioned in Chapter 2, Table 4 of the datasheet. */
+ fsleep(meas_time_us);
+
+ return 0;
+}
+
static int bmp580_chip_config(struct bmp280_data *data)
{
bool change = false, aux;
@@ -2162,17 +2394,6 @@ static int bmp580_chip_config(struct bmp280_data *data)
return ret;
}
- /* Restore sensor to normal operation mode */
- ret = regmap_write_bits(data->regmap, BMP580_REG_ODR_CONFIG,
- BMP580_MODE_MASK,
- FIELD_PREP(BMP580_MODE_MASK, BMP580_MODE_NORMAL));
- if (ret) {
- dev_err(data->dev, "failed to set normal mode\n");
- return ret;
- }
- /* From datasheet's table 4: electrical characteristics */
- usleep_range(3000, 3500);
-
if (change) {
/*
* Check if ODR and OSR settings are valid or we are
@@ -2268,6 +2489,8 @@ const struct bmp280_chip_info bmp580_chip_info = {
.chip_config = bmp580_chip_config,
.read_temp = bmp580_read_temp,
.read_press = bmp580_read_press,
+ .set_mode = bmp580_set_mode,
+ .wait_conv = bmp580_wait_conv,
.preinit = bmp580_preinit,
.trigger_handler = bmp580_trigger_handler,
@@ -2515,6 +2738,19 @@ static int bmp180_read_press(struct bmp280_data *data, u32 *comp_press)
return 0;
}
+/* Keep compatibility with newer generations of the sensor */
+static int bmp180_set_mode(struct bmp280_data *data, enum bmp280_op_mode mode)
+{
+ return 0;
+}
+
+/* Keep compatibility with newer generations of the sensor */
+static int bmp180_wait_conv(struct bmp280_data *data)
+{
+ return 0;
+}
+
+/* Keep compatibility with newer generations of the sensor */
static int bmp180_chip_config(struct bmp280_data *data)
{
return 0;
@@ -2585,6 +2821,8 @@ const struct bmp280_chip_info bmp180_chip_info = {
.read_temp = bmp180_read_temp,
.read_press = bmp180_read_press,
.read_calib = bmp180_read_calib,
+ .set_mode = bmp180_set_mode,
+ .wait_conv = bmp180_wait_conv,
.trigger_handler = bmp180_trigger_handler,
};
@@ -2637,6 +2875,7 @@ static int bmp280_buffer_preenable(struct iio_dev *indio_dev)
struct bmp280_data *data = iio_priv(indio_dev);
pm_runtime_get_sync(data->dev);
+ data->chip_info->set_mode(data, BMP280_NORMAL);
return 0;
}
@@ -2807,6 +3046,10 @@ int bmp280_common_probe(struct device *dev,
return ret;
}
+ ret = data->chip_info->set_mode(data, BMP280_SLEEP);
+ if (ret)
+ return dev_err_probe(dev, ret, "Failed to set sleep mode\n");
+
/* Enable runtime PM */
pm_runtime_get_noresume(dev);
pm_runtime_set_active(dev);
@@ -2832,6 +3075,9 @@ static int bmp280_runtime_suspend(struct device *dev)
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct bmp280_data *data = iio_priv(indio_dev);
+ data->chip_info->set_mode(data, BMP280_SLEEP);
+
+ fsleep(data->start_up_time + 500);
return regulator_bulk_disable(BMP280_NUM_SUPPLIES, data->supplies);
}
@@ -2846,7 +3092,12 @@ static int bmp280_runtime_resume(struct device *dev)
return ret;
usleep_range(data->start_up_time, data->start_up_time + 100);
- return data->chip_info->chip_config(data);
+
+ ret = data->chip_info->chip_config(data);
+ if (ret)
+ return ret;
+
+ return data->chip_info->set_mode(data, data->op_mode);
}
EXPORT_RUNTIME_DEV_PM_OPS(bmp280_dev_pm_ops, bmp280_runtime_suspend,
diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h
index 73516878d020..c9840b8d58b0 100644
--- a/drivers/iio/pressure/bmp280.h
+++ b/drivers/iio/pressure/bmp280.h
@@ -170,6 +170,11 @@
#define BMP380_MODE_FORCED 1
#define BMP380_MODE_NORMAL 3
+#define BMP380_MEAS_OFFSET 234
+#define BMP380_MEAS_DUR 2020
+#define BMP380_TEMP_MEAS_OFFSET 163
+#define BMP380_PRESS_MEAS_OFFSET 392
+
#define BMP380_MIN_TEMP -4000
#define BMP380_MAX_TEMP 8500
#define BMP380_MIN_PRES 3000000
@@ -206,6 +211,7 @@
#define BMP280_REG_CTRL_MEAS 0xF4
#define BMP280_REG_STATUS 0xF3
#define BMP280_REG_STATUS_IM_UPDATE BIT(0)
+#define BMP280_REG_STATUS_MEAS_BIT BIT(3)
#define BMP280_REG_RESET 0xE0
#define BMP280_RST_SOFT_CMD 0xB6
@@ -246,6 +252,10 @@
#define BMP280_MODE_FORCED 1
#define BMP280_MODE_NORMAL 3
+#define BMP280_MEAS_OFFSET 1250
+#define BMP280_MEAS_DUR 2300
+#define BMP280_PRESS_HUMID_MEAS_OFFSET 575
+
/* BME280 specific registers */
#define BME280_REG_HUMIDITY_LSB 0xFE
#define BME280_REG_HUMIDITY_MSB 0xFD
@@ -384,6 +394,12 @@ struct bmp380_calib {
s8 P11;
};
+enum bmp280_op_mode {
+ BMP280_SLEEP,
+ BMP280_FORCED,
+ BMP280_NORMAL,
+};
+
struct bmp280_data {
struct device *dev;
struct mutex lock;
@@ -424,6 +440,9 @@ struct bmp280_data {
s64 ts __aligned(8);
} buffer;
+ /* Value to hold the current operation mode of the device */
+ enum bmp280_op_mode op_mode;
+
/*
* DMA (thus cache coherency maintenance) may require the
* transfer buffers to live in their own cache lines.
@@ -488,6 +507,8 @@ struct bmp280_chip_info {
int (*read_humid)(struct bmp280_data *data, u32 *adc_humidity);
int (*read_calib)(struct bmp280_data *data);
int (*preinit)(struct bmp280_data *data);
+ int (*set_mode)(struct bmp280_data *data, enum bmp280_op_mode mode);
+ int (*wait_conv)(struct bmp280_data *data);
irqreturn_t (*trigger_handler)(int irq, void *p);
};
--
2.25.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH v5 4/7] iio: pressure: bmp280: Use sleep and forced mode for oneshot captures
2024-09-02 18:42 ` [PATCH v5 4/7] iio: pressure: bmp280: Use sleep and forced mode for oneshot captures Vasileios Amoiridis
@ 2024-09-03 14:26 ` Andy Shevchenko
2024-09-04 10:24 ` Vasileios Amoiridis
0 siblings, 1 reply; 23+ messages in thread
From: Andy Shevchenko @ 2024-09-03 14:26 UTC (permalink / raw)
To: Vasileios Amoiridis
Cc: jic23, lars, robh, krzk+dt, conor+dt, ang.iglesiasg,
linus.walleij, biju.das.jz, javier.carrasco.cruz, semen.protsenko,
579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Mon, Sep 02, 2024 at 08:42:19PM +0200, Vasileios Amoiridis wrote:
> Add forced mode support in sensors BMP28x, BME28x, BMP3xx and BMP58x.
> Sensors BMP18x and BMP085 are old and do not support this feature so
> their operation is not affected at all.
>
> Essentially, up to now, the rest of the sensors were used in normal mode
> all the time. This means that they are continuously doing measurements
> even though these measurements are not used. Even though the sensor does
> provide PM support, to cover all the possible use cases, the sensor needs
> to go into sleep mode and wake up whenever necessary.
>
> The idea is that the sensor is by default in sleep mode, wakes up in
> forced mode when a oneshot capture is requested, or in normal mode
> when the buffer is enabled. The difference lays in the fact that in
> forced mode, the sensor does only one conversion and goes back to sleep
> while in normal mode, the sensor does continuous measurements with the
> frequency that was set in the ODR registers.
>
> The bmpX_chip_config() functions which are responsible for applying
> the requested configuration to the sensor, are modified accordingly
> in order to set the sensor by default in sleep mode.
>
> DEEP STANDBY, Low Power NORMAL and CONTINUOUS modes, supported only by
> the BMP58x version, are not added.
...
> +static int bmp280_wait_conv(struct bmp280_data *data)
> +{
> + unsigned int reg, meas_time_us;
> + int ret;
> +
> + /* Check if we are using a BME280 device */
> + if (data->oversampling_humid)
> + meas_time_us += BMP280_PRESS_HUMID_MEAS_OFFSET +
> + (BIT(data->oversampling_humid) * BMP280_MEAS_DUR);
The outer parentheses are not needed.
> + /* Pressure measurement time */
> + meas_time_us += BMP280_PRESS_HUMID_MEAS_OFFSET +
> + (BIT(data->oversampling_press) * BMP280_MEAS_DUR);
Ditto.
> + /* Temperature measurement time */
> + meas_time_us += BIT(data->oversampling_temp) * BMP280_MEAS_DUR;
> +
> + /* Waiting time according to the BM(P/E)2 Sensor API */
> + fsleep(meas_time_us);
> +
> + ret = regmap_read(data->regmap, BMP280_REG_STATUS, ®);
> + if (ret) {
> + dev_err(data->dev, "failed to read status register.\n");
> + return ret;
> + }
> +
> + if (reg & BMP280_REG_STATUS_MEAS_BIT) {
> + dev_err(data->dev, "Measurement cycle didn't complete.\n");
> + return -EBUSY;
> + }
> +
> + return 0;
> +}
...
> +static int bmp380_wait_conv(struct bmp280_data *data)
> +{
> + unsigned int reg;
> + int ret, meas_time_us;
> +
> + /* Offset measurement time */
> + meas_time_us = BMP380_MEAS_OFFSET;
> +
> + /* Pressure measurement time */
> + meas_time_us += BMP380_PRESS_MEAS_OFFSET +
> + (BIT(data->oversampling_press) * BMP380_MEAS_DUR);
Ditto.
> + /* Temperature measurement time */
> + meas_time_us += BMP380_TEMP_MEAS_OFFSET +
> + (BIT(data->oversampling_temp) * BMP380_MEAS_DUR);
Ditto.
> + /* Measurement time defined in Datasheet Section 3.9.2 */
> + fsleep(meas_time_us);
> +
> + ret = regmap_read(data->regmap, BMP380_REG_STATUS, ®);
> + if (ret) {
> + dev_err(data->dev, "failed to read status register.\n");
> + return ret;
> + }
> + if (!(reg & BMP380_STATUS_DRDY_PRESS_MASK) ||
> + !(reg & BMP380_STATUS_DRDY_TEMP_MASK)) {
> + dev_err(data->dev, "Measurement cycle didn't complete.\n");
> + return -EBUSY;
> + }
Alternatively
if (!((reg & BMP380_STATUS_DRDY_PRESS_MASK) &&
!(reg & BMP380_STATUS_DRDY_TEMP_MASK)) {
dev_err(data->dev, "Measurement cycle didn't complete.\n");
return -EBUSY;
}
> + return 0;
> +}
...
> +static int bmp580_wait_conv(struct bmp280_data *data)
> +{
> + /*
> + * Taken from datasheet, Section 2 "Specification, Table 3 "Electrical
> + * characteristics.
> + */
> + static const int time_conv_press[] = {
> + 0, 1050, 1785, 3045, 5670, 10920, 21420, 42420,
> + 84420,
> + };
> + static const int time_conv_temp[] = {
> + 0, 1050, 1105, 1575, 2205, 3465, 6090, 11340,
> + 21840,
> + };
> + int meas_time_us;
> + meas_time_us = 4 * USEC_PER_MSEC + time_conv_temp[data->oversampling_temp]
> + + time_conv_press[data->oversampling_press];
meas_time_us = 4 * USEC_PER_MSEC + time_conv_temp[data->oversampling_temp] +
time_conv_press[data->oversampling_press];
OR
meas_time_us = 4 * USEC_PER_MSEC +
time_conv_temp[data->oversampling_temp] +
time_conv_press[data->oversampling_press];
> + /* Measurement time mentioned in Chapter 2, Table 4 of the datasheet. */
Since there is a constant in use (4ms) it would be nice to explain it
separately, the rest kinda obvious from the variable names.
So it allows roughly understand the timeout value without even looking into
the datasheet.
> + fsleep(meas_time_us);
> +
> + return 0;
> +}
...
> + fsleep(data->start_up_time + 500);
Ditto.
Something like
/* 500us margin for ... */
(but write the real meaning of it).
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH v5 4/7] iio: pressure: bmp280: Use sleep and forced mode for oneshot captures
2024-09-03 14:26 ` Andy Shevchenko
@ 2024-09-04 10:24 ` Vasileios Amoiridis
2024-09-04 14:17 ` Andy Shevchenko
0 siblings, 1 reply; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-04 10:24 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Vasileios Amoiridis, jic23, lars, robh, krzk+dt, conor+dt,
ang.iglesiasg, linus.walleij, biju.das.jz, javier.carrasco.cruz,
semen.protsenko, 579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Tue, Sep 03, 2024 at 05:26:38PM +0300, Andy Shevchenko wrote:
> On Mon, Sep 02, 2024 at 08:42:19PM +0200, Vasileios Amoiridis wrote:
> > Add forced mode support in sensors BMP28x, BME28x, BMP3xx and BMP58x.
> > Sensors BMP18x and BMP085 are old and do not support this feature so
> > their operation is not affected at all.
> >
> > Essentially, up to now, the rest of the sensors were used in normal mode
> > all the time. This means that they are continuously doing measurements
> > even though these measurements are not used. Even though the sensor does
> > provide PM support, to cover all the possible use cases, the sensor needs
> > to go into sleep mode and wake up whenever necessary.
> >
> > The idea is that the sensor is by default in sleep mode, wakes up in
> > forced mode when a oneshot capture is requested, or in normal mode
> > when the buffer is enabled. The difference lays in the fact that in
> > forced mode, the sensor does only one conversion and goes back to sleep
> > while in normal mode, the sensor does continuous measurements with the
> > frequency that was set in the ODR registers.
> >
> > The bmpX_chip_config() functions which are responsible for applying
> > the requested configuration to the sensor, are modified accordingly
> > in order to set the sensor by default in sleep mode.
> >
> > DEEP STANDBY, Low Power NORMAL and CONTINUOUS modes, supported only by
> > the BMP58x version, are not added.
Hi Andy,
Thanks for finding again the time to review this!
>
> ...
>
> > +static int bmp280_wait_conv(struct bmp280_data *data)
> > +{
> > + unsigned int reg, meas_time_us;
> > + int ret;
> > +
> > + /* Check if we are using a BME280 device */
> > + if (data->oversampling_humid)
> > + meas_time_us += BMP280_PRESS_HUMID_MEAS_OFFSET +
> > + (BIT(data->oversampling_humid) * BMP280_MEAS_DUR);
>
> The outer parentheses are not needed.
>
True, will fix that.
> > + /* Pressure measurement time */
> > + meas_time_us += BMP280_PRESS_HUMID_MEAS_OFFSET +
> > + (BIT(data->oversampling_press) * BMP280_MEAS_DUR);
>
> Ditto.
ACK.
>
> > + /* Temperature measurement time */
> > + meas_time_us += BIT(data->oversampling_temp) * BMP280_MEAS_DUR;
> > +
> > + /* Waiting time according to the BM(P/E)2 Sensor API */
> > + fsleep(meas_time_us);
> > +
> > + ret = regmap_read(data->regmap, BMP280_REG_STATUS, ®);
> > + if (ret) {
> > + dev_err(data->dev, "failed to read status register.\n");
> > + return ret;
> > + }
> > +
> > + if (reg & BMP280_REG_STATUS_MEAS_BIT) {
> > + dev_err(data->dev, "Measurement cycle didn't complete.\n");
> > + return -EBUSY;
> > + }
> > +
> > + return 0;
> > +}
>
> ...
>
> > +static int bmp380_wait_conv(struct bmp280_data *data)
> > +{
> > + unsigned int reg;
> > + int ret, meas_time_us;
> > +
> > + /* Offset measurement time */
> > + meas_time_us = BMP380_MEAS_OFFSET;
> > +
> > + /* Pressure measurement time */
> > + meas_time_us += BMP380_PRESS_MEAS_OFFSET +
> > + (BIT(data->oversampling_press) * BMP380_MEAS_DUR);
>
> Ditto.
>
ACK.
> > + /* Temperature measurement time */
> > + meas_time_us += BMP380_TEMP_MEAS_OFFSET +
> > + (BIT(data->oversampling_temp) * BMP380_MEAS_DUR);
>
> Ditto.
>
ACK.
> > + /* Measurement time defined in Datasheet Section 3.9.2 */
> > + fsleep(meas_time_us);
> > +
> > + ret = regmap_read(data->regmap, BMP380_REG_STATUS, ®);
> > + if (ret) {
> > + dev_err(data->dev, "failed to read status register.\n");
> > + return ret;
> > + }
>
> > + if (!(reg & BMP380_STATUS_DRDY_PRESS_MASK) ||
> > + !(reg & BMP380_STATUS_DRDY_TEMP_MASK)) {
> > + dev_err(data->dev, "Measurement cycle didn't complete.\n");
> > + return -EBUSY;
> > + }
>
> Alternatively
>
> if (!((reg & BMP380_STATUS_DRDY_PRESS_MASK) &&
> !(reg & BMP380_STATUS_DRDY_TEMP_MASK)) {
> dev_err(data->dev, "Measurement cycle didn't complete.\n");
> return -EBUSY;
> }
>
Why would I use && instead of || ? I just need one of the 2 to be true
(one of the 2 measurements is not complete) and I can trigger the error
action.
> > + return 0;
> > +}
>
> ...
>
> > +static int bmp580_wait_conv(struct bmp280_data *data)
> > +{
> > + /*
> > + * Taken from datasheet, Section 2 "Specification, Table 3 "Electrical
> > + * characteristics.
> > + */
> > + static const int time_conv_press[] = {
> > + 0, 1050, 1785, 3045, 5670, 10920, 21420, 42420,
> > + 84420,
> > + };
> > + static const int time_conv_temp[] = {
> > + 0, 1050, 1105, 1575, 2205, 3465, 6090, 11340,
> > + 21840,
> > + };
> > + int meas_time_us;
>
> > + meas_time_us = 4 * USEC_PER_MSEC + time_conv_temp[data->oversampling_temp]
> > + + time_conv_press[data->oversampling_press];
>
> meas_time_us = 4 * USEC_PER_MSEC + time_conv_temp[data->oversampling_temp] +
> time_conv_press[data->oversampling_press];
>
> OR
>
> meas_time_us = 4 * USEC_PER_MSEC +
> time_conv_temp[data->oversampling_temp] +
> time_conv_press[data->oversampling_press];
>
>
ACK.
> > + /* Measurement time mentioned in Chapter 2, Table 4 of the datasheet. */
>
> Since there is a constant in use (4ms) it would be nice to explain it
> separately, the rest kinda obvious from the variable names.
> So it allows roughly understand the timeout value without even looking into
> the datasheet.
>
True, I can do that.
> > + fsleep(meas_time_us);
> > +
> > + return 0;
> > +}
>
> ...
>
> > + fsleep(data->start_up_time + 500);
>
> Ditto.
>
> Something like
>
> /* 500us margin for ... */
>
> (but write the real meaning of it).
>
ACK.
> --
> With Best Regards,
> Andy Shevchenko
>
>
Best regards,
Vasilis
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH v5 4/7] iio: pressure: bmp280: Use sleep and forced mode for oneshot captures
2024-09-04 10:24 ` Vasileios Amoiridis
@ 2024-09-04 14:17 ` Andy Shevchenko
2024-09-04 14:21 ` Andy Shevchenko
0 siblings, 1 reply; 23+ messages in thread
From: Andy Shevchenko @ 2024-09-04 14:17 UTC (permalink / raw)
To: Vasileios Amoiridis
Cc: jic23, lars, robh, krzk+dt, conor+dt, ang.iglesiasg,
linus.walleij, biju.das.jz, javier.carrasco.cruz, semen.protsenko,
579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Wed, Sep 04, 2024 at 12:24:27PM +0200, Vasileios Amoiridis wrote:
> On Tue, Sep 03, 2024 at 05:26:38PM +0300, Andy Shevchenko wrote:
> > On Mon, Sep 02, 2024 at 08:42:19PM +0200, Vasileios Amoiridis wrote:
...
> > > + if (!(reg & BMP380_STATUS_DRDY_PRESS_MASK) ||
> > > + !(reg & BMP380_STATUS_DRDY_TEMP_MASK)) {
> > > + dev_err(data->dev, "Measurement cycle didn't complete.\n");
> > > + return -EBUSY;
> > > + }
> >
> > Alternatively
> >
> > if (!((reg & BMP380_STATUS_DRDY_PRESS_MASK) &&
> > !(reg & BMP380_STATUS_DRDY_TEMP_MASK)) {
> > dev_err(data->dev, "Measurement cycle didn't complete.\n");
> > return -EBUSY;
> > }
>
> Why would I use && instead of || ? I just need one of the 2 to be true
> (one of the 2 measurements is not complete) and I can trigger the error
> action.
Oh, I messed up the logic inversion, but wouldn't it be simpler to read
"we return busy if neither press nor temp drdy bit set"?
if (!((reg & BMP380_STATUS_DRDY_PRESS_MASK) && (reg & BMP380_STATUS_DRDY_TEMP_MASK))) {
dev_err(data->dev, "Measurement cycle didn't complete.\n");
return -EBUSY;
}
(I left long line for the better understanding of my point, you may break it to
two if needed)
With that, you even may have
#define BMP380_STATUS_DRDY_PRESS_AND_TEMP_MASK ...
if (!(reg & BMP380_STATUS_DRDY_PRESS_AND_TEMP_MASK)) {
dev_err(data->dev, "Measurement cycle didn't complete.\n");
return -EBUSY;
}
which makes it all obvious.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH v5 4/7] iio: pressure: bmp280: Use sleep and forced mode for oneshot captures
2024-09-04 14:17 ` Andy Shevchenko
@ 2024-09-04 14:21 ` Andy Shevchenko
0 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2024-09-04 14:21 UTC (permalink / raw)
To: Vasileios Amoiridis
Cc: jic23, lars, robh, krzk+dt, conor+dt, ang.iglesiasg,
linus.walleij, biju.das.jz, javier.carrasco.cruz, semen.protsenko,
579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Wed, Sep 04, 2024 at 05:17:29PM +0300, Andy Shevchenko wrote:
> On Wed, Sep 04, 2024 at 12:24:27PM +0200, Vasileios Amoiridis wrote:
> > On Tue, Sep 03, 2024 at 05:26:38PM +0300, Andy Shevchenko wrote:
> > > On Mon, Sep 02, 2024 at 08:42:19PM +0200, Vasileios Amoiridis wrote:
...
> > > > + if (!(reg & BMP380_STATUS_DRDY_PRESS_MASK) ||
> > > > + !(reg & BMP380_STATUS_DRDY_TEMP_MASK)) {
> > > > + dev_err(data->dev, "Measurement cycle didn't complete.\n");
> > > > + return -EBUSY;
> > > > + }
> > >
> > > Alternatively
> > >
> > > if (!((reg & BMP380_STATUS_DRDY_PRESS_MASK) &&
> > > !(reg & BMP380_STATUS_DRDY_TEMP_MASK)) {
> > > dev_err(data->dev, "Measurement cycle didn't complete.\n");
> > > return -EBUSY;
> > > }
> >
> > Why would I use && instead of || ? I just need one of the 2 to be true
> > (one of the 2 measurements is not complete) and I can trigger the error
> > action.
>
> Oh, I messed up the logic inversion, but wouldn't it be simpler to read
> "we return busy if neither press nor temp drdy bit set"?
>
> if (!((reg & BMP380_STATUS_DRDY_PRESS_MASK) && (reg & BMP380_STATUS_DRDY_TEMP_MASK))) {
> dev_err(data->dev, "Measurement cycle didn't complete.\n");
> return -EBUSY;
> }
>
> (I left long line for the better understanding of my point, you may break it to
> two if needed)
Scratch below, it needs more thinking...
> With that, you even may have
>
> #define BMP380_STATUS_DRDY_PRESS_AND_TEMP_MASK ...
>
> if (!(reg & BMP380_STATUS_DRDY_PRESS_AND_TEMP_MASK)) {
Maybe ^, but I have no time to dive into this, you got the idea I believe.
> dev_err(data->dev, "Measurement cycle didn't complete.\n");
> return -EBUSY;
> }
>
> which makes it all obvious.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH v5 5/7] dt-bindings: iio: pressure: bmp085: Add interrupts for BMP3xx and BMP5xx devices
2024-09-02 18:42 [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support Vasileios Amoiridis
` (3 preceding siblings ...)
2024-09-02 18:42 ` [PATCH v5 4/7] iio: pressure: bmp280: Use sleep and forced mode for oneshot captures Vasileios Amoiridis
@ 2024-09-02 18:42 ` Vasileios Amoiridis
2024-09-03 6:34 ` Krzysztof Kozlowski
2024-09-02 18:42 ` [PATCH v5 6/7] iio: pressure: bmp280: Add data ready trigger support Vasileios Amoiridis
` (2 subsequent siblings)
7 siblings, 1 reply; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-02 18:42 UTC (permalink / raw)
To: jic23, lars, robh, krzk+dt, conor+dt, andriy.shevchenko
Cc: vassilisamir, ang.iglesiasg, linus.walleij, biju.das.jz,
javier.carrasco.cruz, semen.protsenko, 579lpy, ak, linux-iio,
devicetree, linux-kernel, christophe.jaillet
Add interrupt options for BMP3xx and BMP5xx devices as well.
Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
---
.../bindings/iio/pressure/bmp085.yaml | 22 ++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml b/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml
index 6fda887ee9d4..20b75865e02f 100644
--- a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml
+++ b/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml
@@ -48,14 +48,34 @@ properties:
interrupts:
description:
- interrupt mapping for IRQ (BMP085 only)
+ interrupt mapping for IRQ. Supported in BMP085, BMP3xx, BMP5xx
maxItems: 1
+ drive-open-drain:
+ description:
+ set if the interrupt pin should be configured as open drain.
+ If not set, defaults to push-pull configuration.
+ type: boolean
+
+
required:
- compatible
- vddd-supply
- vdda-supply
+allOf:
+ - if:
+ properties:
+ compatible:
+ not:
+ enum:
+ - bosch,bmp085
+ - bosch,bmp380
+ - bosch,bmp580
+ then:
+ properties:
+ interrupts: false
+
additionalProperties: false
examples:
--
2.25.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH v5 5/7] dt-bindings: iio: pressure: bmp085: Add interrupts for BMP3xx and BMP5xx devices
2024-09-02 18:42 ` [PATCH v5 5/7] dt-bindings: iio: pressure: bmp085: Add interrupts for BMP3xx and BMP5xx devices Vasileios Amoiridis
@ 2024-09-03 6:34 ` Krzysztof Kozlowski
2024-09-04 10:32 ` Vasileios Amoiridis
0 siblings, 1 reply; 23+ messages in thread
From: Krzysztof Kozlowski @ 2024-09-03 6:34 UTC (permalink / raw)
To: Vasileios Amoiridis
Cc: jic23, lars, robh, krzk+dt, conor+dt, andriy.shevchenko,
ang.iglesiasg, linus.walleij, biju.das.jz, javier.carrasco.cruz,
semen.protsenko, 579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Mon, Sep 02, 2024 at 08:42:20PM +0200, Vasileios Amoiridis wrote:
> Add interrupt options for BMP3xx and BMP5xx devices as well.
>
> Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
> ---
> .../bindings/iio/pressure/bmp085.yaml | 22 ++++++++++++++++++-
> 1 file changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml b/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml
> index 6fda887ee9d4..20b75865e02f 100644
> --- a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml
> +++ b/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml
> @@ -48,14 +48,34 @@ properties:
>
> interrupts:
> description:
> - interrupt mapping for IRQ (BMP085 only)
> + interrupt mapping for IRQ. Supported in BMP085, BMP3xx, BMP5xx
> maxItems: 1
>
> + drive-open-drain:
> + description:
> + set if the interrupt pin should be configured as open drain.
> + If not set, defaults to push-pull configuration.
> + type: boolean
> +
> +
Just one blank liine.
> required:
> - compatible
> - vddd-supply
> - vdda-supply
>
> +allOf:
> + - if:
> + properties:
> + compatible:
> + not:
> + enum:
> + - bosch,bmp085
> + - bosch,bmp380
> + - bosch,bmp580
Are you sure you tested this patch?
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v5 5/7] dt-bindings: iio: pressure: bmp085: Add interrupts for BMP3xx and BMP5xx devices
2024-09-03 6:34 ` Krzysztof Kozlowski
@ 2024-09-04 10:32 ` Vasileios Amoiridis
0 siblings, 0 replies; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-04 10:32 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Vasileios Amoiridis, jic23, lars, robh, krzk+dt, conor+dt,
andriy.shevchenko, ang.iglesiasg, linus.walleij, biju.das.jz,
javier.carrasco.cruz, semen.protsenko, 579lpy, ak, linux-iio,
devicetree, linux-kernel, christophe.jaillet
On Tue, Sep 03, 2024 at 08:34:22AM +0200, Krzysztof Kozlowski wrote:
> On Mon, Sep 02, 2024 at 08:42:20PM +0200, Vasileios Amoiridis wrote:
> > Add interrupt options for BMP3xx and BMP5xx devices as well.
> >
> > Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
> > ---
> > .../bindings/iio/pressure/bmp085.yaml | 22 ++++++++++++++++++-
> > 1 file changed, 21 insertions(+), 1 deletion(-)
> >
> > diff --git a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml b/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml
> > index 6fda887ee9d4..20b75865e02f 100644
> > --- a/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml
> > +++ b/Documentation/devicetree/bindings/iio/pressure/bmp085.yaml
> > @@ -48,14 +48,34 @@ properties:
> >
> > interrupts:
> > description:
> > - interrupt mapping for IRQ (BMP085 only)
> > + interrupt mapping for IRQ. Supported in BMP085, BMP3xx, BMP5xx
> > maxItems: 1
> >
> > + drive-open-drain:
> > + description:
> > + set if the interrupt pin should be configured as open drain.
> > + If not set, defaults to push-pull configuration.
> > + type: boolean
> > +
> > +
>
> Just one blank liine.
>
Hi Krzysztof,
Thanks for the review. I can change that.
> > required:
> > - compatible
> > - vddd-supply
> > - vdda-supply
> >
> > +allOf:
> > + - if:
> > + properties:
> > + compatible:
> > + not:
> > + enum:
> > + - bosch,bmp085
> > + - bosch,bmp380
> > + - bosch,bmp580
>
> Are you sure you tested this patch?
>
Well, before I run only make dt_binding_check but with the option
make dtbs_check I now found what you meant. I think I miss a
"contains" here. In any case, make dtbs_check showed some other
warnings as well which I will address in a follow-up series.
> Best regards,
> Krzysztof
>
Cheers,
Vasilis
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH v5 6/7] iio: pressure: bmp280: Add data ready trigger support
2024-09-02 18:42 [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support Vasileios Amoiridis
` (4 preceding siblings ...)
2024-09-02 18:42 ` [PATCH v5 5/7] dt-bindings: iio: pressure: bmp085: Add interrupts for BMP3xx and BMP5xx devices Vasileios Amoiridis
@ 2024-09-02 18:42 ` Vasileios Amoiridis
2024-09-03 14:36 ` Andy Shevchenko
2024-09-02 18:42 ` [PATCH v5 7/7] iio: pressure: bmp280: Move bmp085 interrupt to new configuration Vasileios Amoiridis
2024-09-03 14:36 ` [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support Andy Shevchenko
7 siblings, 1 reply; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-02 18:42 UTC (permalink / raw)
To: jic23, lars, robh, krzk+dt, conor+dt, andriy.shevchenko
Cc: vassilisamir, ang.iglesiasg, linus.walleij, biju.das.jz,
javier.carrasco.cruz, semen.protsenko, 579lpy, ak, linux-iio,
devicetree, linux-kernel, christophe.jaillet
The BMP3xx and BMP5xx sensors have an interrupt pin which can be used as
a trigger for when there are data ready in the sensor for pick up.
This use case is used along with NORMAL_MODE in the sensor, which allows
the sensor to do consecutive measurements depending on the ODR rate value.
The trigger pin can be configured to be open-drain or push-pull and either
rising or falling edge.
No support is added yet for interrupts for FIFO, WATERMARK and out of range
values.
Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
---
drivers/iio/pressure/bmp280-core.c | 226 ++++++++++++++++++++++++++++-
drivers/iio/pressure/bmp280.h | 21 +++
2 files changed, 245 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index b8a55de78616..74233778df35 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -42,12 +42,14 @@
#include <linux/module.h>
#include <linux/nvmem-provider.h>
#include <linux/pm_runtime.h>
+#include <linux/property.h>
#include <linux/random.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
#include <linux/iio/buffer.h>
#include <linux/iio/iio.h>
+#include <linux/iio/trigger.h>
#include <linux/iio/trigger_consumer.h>
#include <linux/iio/triggered_buffer.h>
@@ -1278,6 +1280,64 @@ static irqreturn_t bme280_trigger_handler(int irq, void *p)
return IRQ_HANDLED;
}
+static int __bmp280_trigger_probe(struct iio_dev *indio_dev,
+ const struct iio_trigger_ops *trigger_ops,
+ int (*int_config)(struct bmp280_data *data),
+ irq_handler_t irq_thread_handler)
+{
+ struct bmp280_data *data = iio_priv(indio_dev);
+ struct device *dev = data->dev;
+ struct fwnode_handle *fwnode;
+ u32 irq_type;
+ int ret, irq;
+
+ irq = fwnode_irq_get(dev_fwnode(dev), 0);
+ if (irq < 0)
+ return dev_err_probe(dev, irq, "No interrupt found.\n");
+
+ irq_type = irq_get_trigger_type(irq);
+ switch (irq_type) {
+ case IRQF_TRIGGER_RISING:
+ data->trig_active_high = true;
+ break;
+ case IRQF_TRIGGER_FALLING:
+ data->trig_active_high = false;
+ break;
+ default:
+ return dev_err_probe(dev, -EINVAL, "Invalid interrupt type specified.\n");
+ }
+
+ data->trig_open_drain =
+ fwnode_property_read_bool(fwnode, "int-open-drain");
+
+ ret = int_config(data);
+ if (ret)
+ return ret;
+
+ data->trig = devm_iio_trigger_alloc(data->dev, "%s-dev%d",
+ indio_dev->name,
+ iio_device_id(indio_dev));
+ if (!data->trig)
+ return -ENOMEM;
+
+ data->trig->ops = trigger_ops;
+ iio_trigger_set_drvdata(data->trig, data);
+
+ ret = devm_request_threaded_irq(data->dev, irq, NULL,
+ irq_thread_handler, IRQF_ONESHOT,
+ indio_dev->name, indio_dev);
+ if (ret)
+ return dev_err_probe(dev, ret, "request irq failed.\n");
+
+ ret = devm_iio_trigger_register(data->dev, data->trig);
+ if (ret)
+ return dev_err_probe(dev, ret, "iio trigger register failed.\n");
+
+ indio_dev->trig = iio_trigger_get(data->trig);
+
+ return 0;
+}
+
static const u8 bme280_chip_ids[] = { BME280_CHIP_ID };
static const int bme280_humid_coeffs[] = { 1000, 1024 };
@@ -1781,6 +1841,81 @@ static int bmp380_chip_config(struct bmp280_data *data)
return 0;
}
+static void bmp380_trigger_reenable(struct iio_trigger *trig)
+{
+ struct bmp280_data *data = iio_trigger_get_drvdata(trig);
+ unsigned int tmp;
+ int ret;
+
+ ret = regmap_read(data->regmap, BMP380_REG_INT_STATUS, &tmp);
+ if (ret)
+ dev_err(data->dev, "Failed to reset interrupt.\n");
+}
+
+static int bmp380_data_rdy_trigger_set_state(struct iio_trigger *trig,
+ bool state)
+{
+ struct bmp280_data *data = iio_trigger_get_drvdata(trig);
+ int ret;
+
+ guard(mutex)(&data->lock);
+
+ ret = regmap_update_bits(data->regmap, BMP380_REG_INT_CONTROL,
+ BMP380_INT_CTRL_DRDY_EN,
+ FIELD_PREP(BMP380_INT_CTRL_DRDY_EN, !!state));
+ if (ret)
+ dev_err(data->dev,
+ "Could not %s interrupt.\n", str_enable_disable(state));
+ return ret;
+}
+
+static const struct iio_trigger_ops bmp380_trigger_ops = {
+ .set_trigger_state = &bmp380_data_rdy_trigger_set_state,
+ .reenable = &bmp380_trigger_reenable,
+};
+
+static int bmp380_int_config(struct bmp280_data *data)
+{
+ int pin_drive_cfg = FIELD_PREP(BMP380_INT_CTRL_OPEN_DRAIN,
+ data->trig_open_drain);
+ int pin_level_cfg = FIELD_PREP(BMP380_INT_CTRL_LEVEL,
+ data->trig_active_high);
+ int ret, int_cfg = pin_drive_cfg | pin_level_cfg;
+
+ ret = regmap_update_bits(data->regmap, BMP380_REG_INT_CONTROL,
+ BMP380_INT_CTRL_SETTINGS_MASK, int_cfg);
+ if (ret)
+ dev_err(data->dev, "Could not set interrupt settings.\n");
+
+ return ret;
+}
+
+static irqreturn_t bmp380_irq_thread_handler(int irq, void *p)
+{
+ struct iio_dev *indio_dev = p;
+ struct bmp280_data *data = iio_priv(indio_dev);
+ unsigned int int_ctrl;
+ int ret;
+
+ scoped_guard(mutex, &data->lock) {
+ ret = regmap_read(data->regmap, BMP380_REG_INT_STATUS, &int_ctrl);
+ if (ret)
+ return IRQ_NONE;
+ }
+
+ if (FIELD_GET(BMP380_INT_STATUS_DRDY, int_ctrl))
+ iio_trigger_poll_nested(data->trig);
+
+ return IRQ_HANDLED;
+}
+
+static int bmp380_trigger_probe(struct iio_dev *indio_dev)
+{
+ return __bmp280_trigger_probe(indio_dev, &bmp380_trigger_ops,
+ bmp380_int_config,
+ bmp380_irq_thread_handler);
+}
+
static irqreturn_t bmp380_trigger_handler(int irq, void *p)
{
struct iio_poll_func *pf = p;
@@ -1875,6 +2010,7 @@ const struct bmp280_chip_info bmp380_chip_info = {
.wait_conv = bmp380_wait_conv,
.preinit = bmp380_preinit,
+ .trigger_probe = bmp380_trigger_probe,
.trigger_handler = bmp380_trigger_handler,
};
EXPORT_SYMBOL_NS(bmp380_chip_info, IIO_BMP280);
@@ -2417,6 +2553,88 @@ static int bmp580_chip_config(struct bmp280_data *data)
return 0;
}
+static void bmp580_trigger_reenable(struct iio_trigger *trig)
+{
+ struct bmp280_data *data = iio_trigger_get_drvdata(trig);
+ unsigned int tmp;
+ int ret;
+
+ ret = regmap_read(data->regmap, BMP580_REG_INT_STATUS, &tmp);
+ if (ret)
+ dev_err(data->dev, "Failed to reset interrupt.\n");
+}
+
+static int bmp580_data_rdy_trigger_set_state(struct iio_trigger *trig,
+ bool state)
+{
+ struct bmp280_data *data = iio_trigger_get_drvdata(trig);
+ int ret;
+
+ guard(mutex)(&data->lock);
+
+ ret = regmap_update_bits(data->regmap, BMP580_REG_INT_CONFIG,
+ BMP580_INT_CONFIG_INT_EN,
+ FIELD_PREP(BMP580_INT_CONFIG_INT_EN, !!state));
+ if (ret)
+ dev_err(data->dev,
+ "Could not %s interrupt.\n", str_enable_disable(state));
+ return ret;
+}
+
+static const struct iio_trigger_ops bmp580_trigger_ops = {
+ .set_trigger_state = &bmp580_data_rdy_trigger_set_state,
+ .reenable = &bmp580_trigger_reenable,
+};
+
+static int bmp580_int_config(struct bmp280_data *data)
+{
+ int pin_drive_cfg = FIELD_PREP(BMP580_INT_CONFIG_OPEN_DRAIN,
+ data->trig_open_drain);
+ int pin_level_cfg = FIELD_PREP(BMP580_INT_CONFIG_LEVEL,
+ data->trig_active_high);
+ int ret, int_cfg = pin_drive_cfg | pin_level_cfg;
+
+ ret = regmap_update_bits(data->regmap, BMP580_REG_INT_CONFIG,
+ BMP580_INT_CONFIG_MASK, int_cfg);
+ if (ret) {
+ dev_err(data->dev, "Could not set interrupt settings.\n");
+ return ret;
+ }
+
+ ret = regmap_set_bits(data->regmap, BMP580_REG_INT_SOURCE,
+ BMP580_INT_SOURCE_DRDY);
+ if (ret)
+ dev_err(data->dev, "Could not set interrupt source.\n");
+
+ return ret;
+}
+
+static irqreturn_t bmp580_irq_thread_handler(int irq, void *p)
+{
+ struct iio_dev *indio_dev = p;
+ struct bmp280_data *data = iio_priv(indio_dev);
+ unsigned int int_ctrl;
+ int ret;
+
+ scoped_guard(mutex, &data->lock) {
+ ret = regmap_read(data->regmap, BMP580_REG_INT_STATUS, &int_ctrl);
+ if (ret)
+ return IRQ_NONE;
+ }
+
+ if (FIELD_GET(BMP580_INT_STATUS_DRDY_MASK, int_ctrl))
+ iio_trigger_poll_nested(data->trig);
+
+ return IRQ_HANDLED;
+}
+
+static int bmp580_trigger_probe(struct iio_dev *indio_dev)
+{
+ return __bmp280_trigger_probe(indio_dev, &bmp580_trigger_ops,
+ bmp580_int_config,
+ bmp580_irq_thread_handler);
+}
+
static irqreturn_t bmp580_trigger_handler(int irq, void *p)
{
struct iio_poll_func *pf = p;
@@ -2493,6 +2711,7 @@ const struct bmp280_chip_info bmp580_chip_info = {
.wait_conv = bmp580_wait_conv,
.preinit = bmp580_preinit,
+ .trigger_probe = bmp580_trigger_probe,
.trigger_handler = bmp580_trigger_handler,
};
EXPORT_SYMBOL_NS(bmp580_chip_info, IIO_BMP280);
@@ -3040,8 +3259,11 @@ int bmp280_common_probe(struct device *dev,
* however as it happens, the BMP085 shares the chip ID of BMP180
* so we look for an IRQ if we have that.
*/
- if (irq > 0 && (chip_id == BMP180_CHIP_ID)) {
- ret = bmp085_fetch_eoc_irq(dev, name, irq, data);
+ if (irq > 0) {
+ if (chip_id == BMP180_CHIP_ID)
+ ret = bmp085_fetch_eoc_irq(dev, name, irq, data);
+ if (data->chip_info->trigger_probe)
+ ret = data->chip_info->trigger_probe(indio_dev);
if (ret)
return ret;
}
diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h
index c9840b8d58b0..0c32b6430677 100644
--- a/drivers/iio/pressure/bmp280.h
+++ b/drivers/iio/pressure/bmp280.h
@@ -55,8 +55,17 @@
#define BMP580_CMD_NVM_WRITE_SEQ_1 0xA0
#define BMP580_CMD_SOFT_RESET 0xB6
+#define BMP580_INT_STATUS_DRDY_MASK BIT(0)
#define BMP580_INT_STATUS_POR_MASK BIT(4)
+#define BMP580_INT_SOURCE_DRDY BIT(0)
+
+#define BMP580_INT_CONFIG_MASK GENMASK(3, 0)
+#define BMP580_INT_CONFIG_LATCH BIT(0)
+#define BMP580_INT_CONFIG_LEVEL BIT(1)
+#define BMP580_INT_CONFIG_OPEN_DRAIN BIT(2)
+#define BMP580_INT_CONFIG_INT_EN BIT(3)
+
#define BMP580_STATUS_CORE_RDY_MASK BIT(0)
#define BMP580_STATUS_NVM_RDY_MASK BIT(1)
#define BMP580_STATUS_NVM_ERR_MASK BIT(2)
@@ -175,6 +184,14 @@
#define BMP380_TEMP_MEAS_OFFSET 163
#define BMP380_PRESS_MEAS_OFFSET 392
+#define BMP380_INT_STATUS_DRDY BIT(3)
+
+#define BMP380_INT_CTRL_SETTINGS_MASK GENMASK(2, 0)
+#define BMP380_INT_CTRL_OPEN_DRAIN BIT(0)
+#define BMP380_INT_CTRL_LEVEL BIT(1)
+#define BMP380_INT_CTRL_LATCH BIT(2)
+#define BMP380_INT_CTRL_DRDY_EN BIT(6)
+
#define BMP380_MIN_TEMP -4000
#define BMP380_MAX_TEMP 8500
#define BMP380_MIN_PRES 3000000
@@ -406,6 +423,9 @@ struct bmp280_data {
struct regmap *regmap;
struct completion done;
bool use_eoc;
+ bool trig_open_drain;
+ bool trig_active_high;
+ struct iio_trigger *trig;
const struct bmp280_chip_info *chip_info;
union {
struct bmp180_calib bmp180;
@@ -510,6 +530,7 @@ struct bmp280_chip_info {
int (*set_mode)(struct bmp280_data *data, enum bmp280_op_mode mode);
int (*wait_conv)(struct bmp280_data *data);
+ int (*trigger_probe)(struct iio_dev *indio_dev);
irqreturn_t (*trigger_handler)(int irq, void *p);
};
--
2.25.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH v5 6/7] iio: pressure: bmp280: Add data ready trigger support
2024-09-02 18:42 ` [PATCH v5 6/7] iio: pressure: bmp280: Add data ready trigger support Vasileios Amoiridis
@ 2024-09-03 14:36 ` Andy Shevchenko
2024-09-04 10:28 ` Vasileios Amoiridis
0 siblings, 1 reply; 23+ messages in thread
From: Andy Shevchenko @ 2024-09-03 14:36 UTC (permalink / raw)
To: Vasileios Amoiridis
Cc: jic23, lars, robh, krzk+dt, conor+dt, ang.iglesiasg,
linus.walleij, biju.das.jz, javier.carrasco.cruz, semen.protsenko,
579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Mon, Sep 02, 2024 at 08:42:21PM +0200, Vasileios Amoiridis wrote:
> The BMP3xx and BMP5xx sensors have an interrupt pin which can be used as
> a trigger for when there are data ready in the sensor for pick up.
>
> This use case is used along with NORMAL_MODE in the sensor, which allows
> the sensor to do consecutive measurements depending on the ODR rate value.
>
> The trigger pin can be configured to be open-drain or push-pull and either
> rising or falling edge.
>
> No support is added yet for interrupts for FIFO, WATERMARK and out of range
> values.
...
> +static int __bmp280_trigger_probe(struct iio_dev *indio_dev,
> + const struct iio_trigger_ops *trigger_ops,
> + int (*int_config)(struct bmp280_data *data),
> + irq_handler_t irq_thread_handler)
Would it make sense (note, I do *not* know the correct answer!) to have
something like
struct foo {
const struct iio_trigger_ops *trigger_ops;
int (*int_config)(struct bmp280_data *data);
irq_handler_t irq_thread_handler;
};
and pass it around?
Also int_config sounds non-related to interrupt, however it's about interrupt
pin, right? perhaps name it differently here?
E.g.,
interrupt_pin_config
?
> +{
> + struct bmp280_data *data = iio_priv(indio_dev);
> + struct device *dev = data->dev;
> + struct fwnode_handle *fwnode;
> + u32 irq_type;
> + int ret, irq;
> +
> + irq = fwnode_irq_get(dev_fwnode(dev), 0);
> + if (irq < 0)
> + return dev_err_probe(dev, irq, "No interrupt found.\n");
> +
> + irq_type = irq_get_trigger_type(irq);
> + switch (irq_type) {
> + case IRQF_TRIGGER_RISING:
> + data->trig_active_high = true;
> + break;
> + case IRQF_TRIGGER_FALLING:
> + data->trig_active_high = false;
> + break;
> + default:
> + return dev_err_probe(dev, -EINVAL, "Invalid interrupt type specified.\n");
> + }
> +
> + data->trig_open_drain =
> + fwnode_property_read_bool(fwnode, "int-open-drain");
Where do you initialise fwnode?
> + ret = int_config(data);
> + if (ret)
> + return ret;
> +
> + data->trig = devm_iio_trigger_alloc(data->dev, "%s-dev%d",
> + indio_dev->name,
> + iio_device_id(indio_dev));
> + if (!data->trig)
> + return -ENOMEM;
> +
> + data->trig->ops = trigger_ops;
> + iio_trigger_set_drvdata(data->trig, data);
> +
> + ret = devm_request_threaded_irq(data->dev, irq, NULL,
> + irq_thread_handler, IRQF_ONESHOT,
> + indio_dev->name, indio_dev);
> + if (ret)
> + return dev_err_probe(dev, ret, "request irq failed.\n");
IRQ
> + ret = devm_iio_trigger_register(data->dev, data->trig);
> + if (ret)
> + return dev_err_probe(dev, ret, "iio trigger register failed.\n");
> +
> + indio_dev->trig = iio_trigger_get(data->trig);
> +
> + return 0;
> +}
...
> +static int bmp580_data_rdy_trigger_set_state(struct iio_trigger *trig,
> + bool state)
> +{
> + struct bmp280_data *data = iio_trigger_get_drvdata(trig);
> + int ret;
> +
> + guard(mutex)(&data->lock);
> +
> + ret = regmap_update_bits(data->regmap, BMP580_REG_INT_CONFIG,
> + BMP580_INT_CONFIG_INT_EN,
> + FIELD_PREP(BMP580_INT_CONFIG_INT_EN, !!state));
> + if (ret)
> + dev_err(data->dev,
> + "Could not %s interrupt.\n", str_enable_disable(state));
> + return ret;
Somewhere above (or in another patch) you used the style with 'return 0;' at
the end. Please, check the resulting code for the consistency and choose one
style for all.
> +}
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH v5 6/7] iio: pressure: bmp280: Add data ready trigger support
2024-09-03 14:36 ` Andy Shevchenko
@ 2024-09-04 10:28 ` Vasileios Amoiridis
2024-09-04 14:19 ` Andy Shevchenko
0 siblings, 1 reply; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-04 10:28 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Vasileios Amoiridis, jic23, lars, robh, krzk+dt, conor+dt,
ang.iglesiasg, linus.walleij, biju.das.jz, javier.carrasco.cruz,
semen.protsenko, 579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Tue, Sep 03, 2024 at 05:36:13PM +0300, Andy Shevchenko wrote:
> On Mon, Sep 02, 2024 at 08:42:21PM +0200, Vasileios Amoiridis wrote:
> > The BMP3xx and BMP5xx sensors have an interrupt pin which can be used as
> > a trigger for when there are data ready in the sensor for pick up.
> >
> > This use case is used along with NORMAL_MODE in the sensor, which allows
> > the sensor to do consecutive measurements depending on the ODR rate value.
> >
> > The trigger pin can be configured to be open-drain or push-pull and either
> > rising or falling edge.
> >
> > No support is added yet for interrupts for FIFO, WATERMARK and out of range
> > values.
>
> ...
>
> > +static int __bmp280_trigger_probe(struct iio_dev *indio_dev,
> > + const struct iio_trigger_ops *trigger_ops,
> > + int (*int_config)(struct bmp280_data *data),
> > + irq_handler_t irq_thread_handler)
>
> Would it make sense (note, I do *not* know the correct answer!) to have
> something like
>
> struct foo {
> const struct iio_trigger_ops *trigger_ops;
> int (*int_config)(struct bmp280_data *data);
> irq_handler_t irq_thread_handler;
> };
>
> and pass it around?
>
From my point of view it won't be more clear, it might complicate things,
I feel like this *looks* better.
> Also int_config sounds non-related to interrupt, however it's about interrupt
> pin, right? perhaps name it differently here?
>
> E.g.,
>
> interrupt_pin_config
>
> ?
>
This sounds good yes!
> > +{
> > + struct bmp280_data *data = iio_priv(indio_dev);
> > + struct device *dev = data->dev;
> > + struct fwnode_handle *fwnode;
> > + u32 irq_type;
> > + int ret, irq;
> > +
> > + irq = fwnode_irq_get(dev_fwnode(dev), 0);
> > + if (irq < 0)
> > + return dev_err_probe(dev, irq, "No interrupt found.\n");
> > +
> > + irq_type = irq_get_trigger_type(irq);
> > + switch (irq_type) {
> > + case IRQF_TRIGGER_RISING:
> > + data->trig_active_high = true;
> > + break;
> > + case IRQF_TRIGGER_FALLING:
> > + data->trig_active_high = false;
> > + break;
> > + default:
> > + return dev_err_probe(dev, -EINVAL, "Invalid interrupt type specified.\n");
> > + }
> > +
> > + data->trig_open_drain =
> > + fwnode_property_read_bool(fwnode, "int-open-drain");
>
>
> Where do you initialise fwnode?
>
Ok, I need to retest this with the device-tree.
> > + ret = int_config(data);
> > + if (ret)
> > + return ret;
> > +
> > + data->trig = devm_iio_trigger_alloc(data->dev, "%s-dev%d",
> > + indio_dev->name,
> > + iio_device_id(indio_dev));
> > + if (!data->trig)
> > + return -ENOMEM;
> > +
> > + data->trig->ops = trigger_ops;
> > + iio_trigger_set_drvdata(data->trig, data);
> > +
> > + ret = devm_request_threaded_irq(data->dev, irq, NULL,
> > + irq_thread_handler, IRQF_ONESHOT,
> > + indio_dev->name, indio_dev);
> > + if (ret)
> > + return dev_err_probe(dev, ret, "request irq failed.\n");
>
> IRQ
>
ACK.
> > + ret = devm_iio_trigger_register(data->dev, data->trig);
> > + if (ret)
> > + return dev_err_probe(dev, ret, "iio trigger register failed.\n");
> > +
> > + indio_dev->trig = iio_trigger_get(data->trig);
> > +
> > + return 0;
> > +}
>
> ...
>
> > +static int bmp580_data_rdy_trigger_set_state(struct iio_trigger *trig,
> > + bool state)
> > +{
> > + struct bmp280_data *data = iio_trigger_get_drvdata(trig);
> > + int ret;
> > +
> > + guard(mutex)(&data->lock);
> > +
> > + ret = regmap_update_bits(data->regmap, BMP580_REG_INT_CONFIG,
> > + BMP580_INT_CONFIG_INT_EN,
> > + FIELD_PREP(BMP580_INT_CONFIG_INT_EN, !!state));
> > + if (ret)
> > + dev_err(data->dev,
> > + "Could not %s interrupt.\n", str_enable_disable(state));
> > + return ret;
>
> Somewhere above (or in another patch) you used the style with 'return 0;' at
> the end. Please, check the resulting code for the consistency and choose one
> style for all.
>
ACK.
> > +}
>
> --
> With Best Regards,
> Andy Shevchenko
>
>
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH v5 6/7] iio: pressure: bmp280: Add data ready trigger support
2024-09-04 10:28 ` Vasileios Amoiridis
@ 2024-09-04 14:19 ` Andy Shevchenko
0 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2024-09-04 14:19 UTC (permalink / raw)
To: Vasileios Amoiridis
Cc: jic23, lars, robh, krzk+dt, conor+dt, ang.iglesiasg,
linus.walleij, biju.das.jz, javier.carrasco.cruz, semen.protsenko,
579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Wed, Sep 04, 2024 at 12:28:12PM +0200, Vasileios Amoiridis wrote:
> On Tue, Sep 03, 2024 at 05:36:13PM +0300, Andy Shevchenko wrote:
> > On Mon, Sep 02, 2024 at 08:42:21PM +0200, Vasileios Amoiridis wrote:
...
> > > + data->trig_open_drain =
> > > + fwnode_property_read_bool(fwnode, "int-open-drain");
> >
> > Where do you initialise fwnode?
>
> Ok, I need to retest this with the device-tree.
But don't you compile with `make W=1`? It must warn in such cases.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH v5 7/7] iio: pressure: bmp280: Move bmp085 interrupt to new configuration
2024-09-02 18:42 [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support Vasileios Amoiridis
` (5 preceding siblings ...)
2024-09-02 18:42 ` [PATCH v5 6/7] iio: pressure: bmp280: Add data ready trigger support Vasileios Amoiridis
@ 2024-09-02 18:42 ` Vasileios Amoiridis
2024-09-03 14:39 ` Andy Shevchenko
2024-09-03 14:36 ` [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support Andy Shevchenko
7 siblings, 1 reply; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-02 18:42 UTC (permalink / raw)
To: jic23, lars, robh, krzk+dt, conor+dt, andriy.shevchenko
Cc: vassilisamir, ang.iglesiasg, linus.walleij, biju.das.jz,
javier.carrasco.cruz, semen.protsenko, 579lpy, ak, linux-iio,
devicetree, linux-kernel, christophe.jaillet
This commit intends to add the old BMP085 sensor to the new IRQ interface
of the driver for consistence. No functional changes intended.
The BMP085 sensor is equivalent with the BMP180 with the only difference of
BMP085 having an extra interrupt pin to inform about an End of Conversion.
Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
---
drivers/iio/pressure/bmp280-core.c | 63 +++++++++++++++++++++++-------
drivers/iio/pressure/bmp280-i2c.c | 4 +-
drivers/iio/pressure/bmp280-spi.c | 4 +-
drivers/iio/pressure/bmp280.h | 1 +
4 files changed, 54 insertions(+), 18 deletions(-)
diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index 74233778df35..2cfe29f7681b 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -3056,13 +3056,16 @@ static irqreturn_t bmp085_eoc_irq(int irq, void *d)
return IRQ_HANDLED;
}
-static int bmp085_fetch_eoc_irq(struct device *dev,
- const char *name,
- int irq,
- struct bmp280_data *data)
+static int bmp085_trigger_probe(struct iio_dev *indio_dev)
{
+ struct bmp280_data *data = iio_priv(indio_dev);
+ struct device *dev = data->dev;
unsigned long irq_trig;
- int ret;
+ int ret, irq;
+
+ irq = fwnode_irq_get(dev_fwnode(dev), 0);
+ if (irq < 0)
+ return dev_err_probe(dev, irq, "No interrupt found.\n");
irq_trig = irqd_get_trigger_type(irq_get_irq_data(irq));
if (irq_trig != IRQF_TRIGGER_RISING) {
@@ -3072,13 +3075,8 @@ static int bmp085_fetch_eoc_irq(struct device *dev,
init_completion(&data->done);
- ret = devm_request_threaded_irq(dev,
- irq,
- bmp085_eoc_irq,
- NULL,
- irq_trig,
- name,
- data);
+ ret = devm_request_irq(dev, irq, bmp085_eoc_irq, irq_trig,
+ indio_dev->name, data);
if (ret) {
/* Bail out without IRQ but keep the driver in place */
dev_err(dev, "unable to request DRDY IRQ\n");
@@ -3086,9 +3084,48 @@ static int bmp085_fetch_eoc_irq(struct device *dev,
}
data->use_eoc = true;
+
return 0;
}
+/* Identical to bmp180_chip_info + bmp085_trigger_probe */
+const struct bmp280_chip_info bmp085_chip_info = {
+ .id_reg = BMP280_REG_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,
+ .num_channels = ARRAY_SIZE(bmp280_channels),
+ .avail_scan_masks = bmp280_avail_scan_masks,
+
+ .oversampling_temp_avail = bmp180_oversampling_temp_avail,
+ .num_oversampling_temp_avail =
+ ARRAY_SIZE(bmp180_oversampling_temp_avail),
+ .oversampling_temp_default = 0,
+
+ .oversampling_press_avail = bmp180_oversampling_press_avail,
+ .num_oversampling_press_avail =
+ ARRAY_SIZE(bmp180_oversampling_press_avail),
+ .oversampling_press_default = BMP180_MEAS_PRESS_8X,
+
+ .temp_coeffs = bmp180_temp_coeffs,
+ .temp_coeffs_type = IIO_VAL_FRACTIONAL,
+ .press_coeffs = bmp180_press_coeffs,
+ .press_coeffs_type = IIO_VAL_FRACTIONAL,
+
+ .chip_config = bmp180_chip_config,
+ .read_temp = bmp180_read_temp,
+ .read_press = bmp180_read_press,
+ .read_calib = bmp180_read_calib,
+ .set_mode = bmp180_set_mode,
+ .wait_conv = bmp180_wait_conv,
+
+ .trigger_probe = bmp085_trigger_probe,
+ .trigger_handler = bmp180_trigger_handler,
+};
+EXPORT_SYMBOL_NS(bmp085_chip_info, IIO_BMP280);
+
static int bmp280_buffer_preenable(struct iio_dev *indio_dev)
{
struct bmp280_data *data = iio_priv(indio_dev);
@@ -3260,8 +3297,6 @@ int bmp280_common_probe(struct device *dev,
* so we look for an IRQ if we have that.
*/
if (irq > 0) {
- if (chip_id == BMP180_CHIP_ID)
- ret = bmp085_fetch_eoc_irq(dev, name, irq, data);
if (data->chip_info->trigger_probe)
ret = data->chip_info->trigger_probe(indio_dev);
if (ret)
diff --git a/drivers/iio/pressure/bmp280-i2c.c b/drivers/iio/pressure/bmp280-i2c.c
index 5c3a63b4327c..2f7b25984c7b 100644
--- a/drivers/iio/pressure/bmp280-i2c.c
+++ b/drivers/iio/pressure/bmp280-i2c.c
@@ -27,7 +27,7 @@ static int bmp280_i2c_probe(struct i2c_client *client)
}
static const struct of_device_id bmp280_of_i2c_match[] = {
- { .compatible = "bosch,bmp085", .data = &bmp180_chip_info },
+ { .compatible = "bosch,bmp085", .data = &bmp085_chip_info },
{ .compatible = "bosch,bmp180", .data = &bmp180_chip_info },
{ .compatible = "bosch,bmp280", .data = &bmp280_chip_info },
{ .compatible = "bosch,bme280", .data = &bme280_chip_info },
@@ -38,7 +38,7 @@ static const struct of_device_id bmp280_of_i2c_match[] = {
MODULE_DEVICE_TABLE(of, bmp280_of_i2c_match);
static const struct i2c_device_id bmp280_i2c_id[] = {
- {"bmp085", (kernel_ulong_t)&bmp180_chip_info },
+ {"bmp085", (kernel_ulong_t)&bmp085_chip_info },
{"bmp180", (kernel_ulong_t)&bmp180_chip_info },
{"bmp280", (kernel_ulong_t)&bmp280_chip_info },
{"bme280", (kernel_ulong_t)&bme280_chip_info },
diff --git a/drivers/iio/pressure/bmp280-spi.c b/drivers/iio/pressure/bmp280-spi.c
index d18549d9bb64..49aa8c2cd85b 100644
--- a/drivers/iio/pressure/bmp280-spi.c
+++ b/drivers/iio/pressure/bmp280-spi.c
@@ -114,7 +114,7 @@ static int bmp280_spi_probe(struct spi_device *spi)
}
static const struct of_device_id bmp280_of_spi_match[] = {
- { .compatible = "bosch,bmp085", .data = &bmp180_chip_info },
+ { .compatible = "bosch,bmp085", .data = &bmp085_chip_info },
{ .compatible = "bosch,bmp180", .data = &bmp180_chip_info },
{ .compatible = "bosch,bmp181", .data = &bmp180_chip_info },
{ .compatible = "bosch,bmp280", .data = &bmp280_chip_info },
@@ -126,7 +126,7 @@ static const struct of_device_id bmp280_of_spi_match[] = {
MODULE_DEVICE_TABLE(of, bmp280_of_spi_match);
static const struct spi_device_id bmp280_spi_id[] = {
- { "bmp085", (kernel_ulong_t)&bmp180_chip_info },
+ { "bmp085", (kernel_ulong_t)&bmp085_chip_info },
{ "bmp180", (kernel_ulong_t)&bmp180_chip_info },
{ "bmp181", (kernel_ulong_t)&bmp180_chip_info },
{ "bmp280", (kernel_ulong_t)&bmp280_chip_info },
diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h
index 0c32b6430677..e0e47bf22472 100644
--- a/drivers/iio/pressure/bmp280.h
+++ b/drivers/iio/pressure/bmp280.h
@@ -535,6 +535,7 @@ struct bmp280_chip_info {
};
/* Chip infos for each variant */
+extern const struct bmp280_chip_info bmp085_chip_info;
extern const struct bmp280_chip_info bmp180_chip_info;
extern const struct bmp280_chip_info bmp280_chip_info;
extern const struct bmp280_chip_info bme280_chip_info;
--
2.25.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH v5 7/7] iio: pressure: bmp280: Move bmp085 interrupt to new configuration
2024-09-02 18:42 ` [PATCH v5 7/7] iio: pressure: bmp280: Move bmp085 interrupt to new configuration Vasileios Amoiridis
@ 2024-09-03 14:39 ` Andy Shevchenko
2024-09-04 10:29 ` Vasileios Amoiridis
0 siblings, 1 reply; 23+ messages in thread
From: Andy Shevchenko @ 2024-09-03 14:39 UTC (permalink / raw)
To: Vasileios Amoiridis
Cc: jic23, lars, robh, krzk+dt, conor+dt, ang.iglesiasg,
linus.walleij, biju.das.jz, javier.carrasco.cruz, semen.protsenko,
579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Mon, Sep 02, 2024 at 08:42:22PM +0200, Vasileios Amoiridis wrote:
> This commit intends to add the old BMP085 sensor to the new IRQ interface
> of the driver for consistence. No functional changes intended.
>
> The BMP085 sensor is equivalent with the BMP180 with the only difference of
> BMP085 having an extra interrupt pin to inform about an End of Conversion.
This one also LGTM,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
...
> - int ret;
> + int ret, irq;
I'm not fan of such a churn, meaning a new variable just on the new line to
make diff less noisy, but it's not a big deal at all.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v5 7/7] iio: pressure: bmp280: Move bmp085 interrupt to new configuration
2024-09-03 14:39 ` Andy Shevchenko
@ 2024-09-04 10:29 ` Vasileios Amoiridis
0 siblings, 0 replies; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-04 10:29 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Vasileios Amoiridis, jic23, lars, robh, krzk+dt, conor+dt,
ang.iglesiasg, linus.walleij, biju.das.jz, javier.carrasco.cruz,
semen.protsenko, 579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Tue, Sep 03, 2024 at 05:39:47PM +0300, Andy Shevchenko wrote:
> On Mon, Sep 02, 2024 at 08:42:22PM +0200, Vasileios Amoiridis wrote:
> > This commit intends to add the old BMP085 sensor to the new IRQ interface
> > of the driver for consistence. No functional changes intended.
> >
> > The BMP085 sensor is equivalent with the BMP180 with the only difference of
> > BMP085 having an extra interrupt pin to inform about an End of Conversion.
>
> This one also LGTM,
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
Thanks a lot for this!
> ...
>
> > - int ret;
> > + int ret, irq;
>
> I'm not fan of such a churn, meaning a new variable just on the new line to
> make diff less noisy, but it's not a big deal at all.
>
I understand why, but at some point someone else would have come and make
a new commit probably with "organise/cleanup variable assignments"...
> --
> With Best Regards,
> Andy Shevchenko
>
>
Cheers,
Vasilis
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support
2024-09-02 18:42 [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support Vasileios Amoiridis
` (6 preceding siblings ...)
2024-09-02 18:42 ` [PATCH v5 7/7] iio: pressure: bmp280: Move bmp085 interrupt to new configuration Vasileios Amoiridis
@ 2024-09-03 14:36 ` Andy Shevchenko
2024-09-04 10:29 ` Vasileios Amoiridis
7 siblings, 1 reply; 23+ messages in thread
From: Andy Shevchenko @ 2024-09-03 14:36 UTC (permalink / raw)
To: Vasileios Amoiridis
Cc: jic23, lars, robh, krzk+dt, conor+dt, ang.iglesiasg,
linus.walleij, biju.das.jz, javier.carrasco.cruz, semen.protsenko,
579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Mon, Sep 02, 2024 at 08:42:15PM +0200, Vasileios Amoiridis wrote:
> Depends on this: https://lore.kernel.org/linux-iio/20240823172017.9028-1-vassilisamir@gmail.com
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
for the patches 1,2, and 3.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support
2024-09-03 14:36 ` [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support Andy Shevchenko
@ 2024-09-04 10:29 ` Vasileios Amoiridis
2024-09-07 16:35 ` Jonathan Cameron
0 siblings, 1 reply; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-04 10:29 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Vasileios Amoiridis, jic23, lars, robh, krzk+dt, conor+dt,
ang.iglesiasg, linus.walleij, biju.das.jz, javier.carrasco.cruz,
semen.protsenko, 579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Tue, Sep 03, 2024 at 05:36:57PM +0300, Andy Shevchenko wrote:
> On Mon, Sep 02, 2024 at 08:42:15PM +0200, Vasileios Amoiridis wrote:
> > Depends on this: https://lore.kernel.org/linux-iio/20240823172017.9028-1-vassilisamir@gmail.com
>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> for the patches 1,2, and 3.
>
> --
> With Best Regards,
> Andy Shevchenko
>
>
Thank you very much for the reviews Andy.
Cheers,
Vasilis
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support
2024-09-04 10:29 ` Vasileios Amoiridis
@ 2024-09-07 16:35 ` Jonathan Cameron
2024-09-10 22:09 ` Vasileios Amoiridis
0 siblings, 1 reply; 23+ messages in thread
From: Jonathan Cameron @ 2024-09-07 16:35 UTC (permalink / raw)
To: Vasileios Amoiridis
Cc: Andy Shevchenko, lars, robh, krzk+dt, conor+dt, ang.iglesiasg,
linus.walleij, biju.das.jz, javier.carrasco.cruz, semen.protsenko,
579lpy, ak, linux-iio, devicetree, linux-kernel,
christophe.jaillet
On Wed, 4 Sep 2024 12:29:55 +0200
Vasileios Amoiridis <vassilisamir@gmail.com> wrote:
> On Tue, Sep 03, 2024 at 05:36:57PM +0300, Andy Shevchenko wrote:
> > On Mon, Sep 02, 2024 at 08:42:15PM +0200, Vasileios Amoiridis wrote:
> > > Depends on this: https://lore.kernel.org/linux-iio/20240823172017.9028-1-vassilisamir@gmail.com
> >
> > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> >
> > for the patches 1,2, and 3.
> >
> > --
> > With Best Regards,
> > Andy Shevchenko
> >
> >
>
> Thank you very much for the reviews Andy.
Too many patches floating around at the moment (not yours!) so I'm going
to reduce that number where I can just to make it easier to keep track
of what needs more focus.
So picked up patches 1-3 on the togreg branch of iio.git and pushed
out as testing. Note these are probably 6.13 material now.
Jonathan
>
> Cheers,
> Vasilis
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v5 0/7] pressure: bmp280: Minor cleanup and interrupt support
2024-09-07 16:35 ` Jonathan Cameron
@ 2024-09-10 22:09 ` Vasileios Amoiridis
0 siblings, 0 replies; 23+ messages in thread
From: Vasileios Amoiridis @ 2024-09-10 22:09 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Vasileios Amoiridis, Andy Shevchenko, lars, robh, krzk+dt,
conor+dt, ang.iglesiasg, linus.walleij, biju.das.jz,
javier.carrasco.cruz, semen.protsenko, 579lpy, ak, linux-iio,
devicetree, linux-kernel, christophe.jaillet
On Sat, Sep 07, 2024 at 05:35:37PM +0100, Jonathan Cameron wrote:
> On Wed, 4 Sep 2024 12:29:55 +0200
> Vasileios Amoiridis <vassilisamir@gmail.com> wrote:
>
> > On Tue, Sep 03, 2024 at 05:36:57PM +0300, Andy Shevchenko wrote:
> > > On Mon, Sep 02, 2024 at 08:42:15PM +0200, Vasileios Amoiridis wrote:
> > > > Depends on this: https://lore.kernel.org/linux-iio/20240823172017.9028-1-vassilisamir@gmail.com
> > >
> > > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > >
> > > for the patches 1,2, and 3.
> > >
> > > --
> > > With Best Regards,
> > > Andy Shevchenko
> > >
> > >
> >
> > Thank you very much for the reviews Andy.
>
> Too many patches floating around at the moment (not yours!) so I'm going
> to reduce that number where I can just to make it easier to keep track
> of what needs more focus.
>
> So picked up patches 1-3 on the togreg branch of iio.git and pushed
> out as testing. Note these are probably 6.13 material now.
>
> Jonathan
>
> >
> > Cheers,
> > Vasilis
>
Hi Jonathan,
Thank you very much for the continuous effort!
Cheers,
Vasilis
^ permalink raw reply [flat|nested] 23+ messages in thread