| Message ID | 20240823181714.64545-5-vassilisamir@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | pressure: bmp280: Minor cleanup and interrupt support | expand |
On Fri, Aug 23, 2024 at 08:17:11PM +0200, Vasileios Amoiridis wrote: > This commit adds 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. > > This commit, adds sleep and forced mode support. Essentially, the sensor > sleeps all the time except for when a measurement is requested. When there > is a request for a measurement, the sensor is put into forced mode, starts > the measurement and after it is done we read the output and we put it again > in sleep mode. > > For really fast and more deterministic measurements, the triggered buffer > interface can be used, since the sensor is still used in normal mode for > that use case. > > This commit does not add though support for DEEP STANDBY, Low Power NORMAL > and CONTINUOUS modes, supported only by the BMP58x version. ... > +static const u8 bmp280_operation_mode[] = { BMP280_MODE_SLEEP, > + BMP280_MODE_FORCED, > + BMP280_MODE_NORMAL }; Better style is static const u8 bmp280_operation_mode[] = { BMP280_MODE_SLEEP, BMP280_MODE_FORCED, BMP280_MODE_NORMAL, }; Also note comma at the end. ... > +static int bmp280_wait_conv(struct bmp280_data *data) > +{ > + unsigned int reg; > + int ret, meas_time; > + > + meas_time = BMP280_MEAS_OFFSET; > + > + /* Check if we are using a BME280 device */ > + if (data->oversampling_humid) > + meas_time += (1 << data->oversampling_humid) * BMP280_MEAS_DUR + BIT(data->oversampling_humid) > + BMP280_PRESS_HUMID_MEAS_OFFSET; > + /* Pressure measurement time */ > + meas_time += (1 << data->oversampling_press) * BMP280_MEAS_DUR + Ditto. > + BMP280_PRESS_HUMID_MEAS_OFFSET; > + /* Temperature measurement time */ > + meas_time += (1 << data->oversampling_temp) * BMP280_MEAS_DUR; Ditto. > + usleep_range(meas_time, meas_time * 12 / 10); fsleep() ? > + 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 const u8 bmp380_operation_mode[] = { BMP380_MODE_SLEEP, > + BMP380_MODE_FORCED, > + BMP380_MODE_NORMAL }; As per above. ... > +static int bmp380_wait_conv(struct bmp280_data *data) > +{ As per above comments against bmp280_wait_conv(). > + ret = regmap_read(data->regmap, BMP380_REG_STATUS, ®); > + if (ret) { > + dev_err(data->dev, "failed to read status register\n"); > + return ret; > + } > + Choose one style (with or without blank line), as in the above you have no blank line in the similar situation. > + 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; > +} ... > + usleep_range(data->start_up_time, data->start_up_time + 500); fsleep() ? Comment? ... > +static const u8 bmp580_operation_mode[] = { BMP580_MODE_SLEEP, > + BMP580_MODE_FORCED, > + BMP580_MODE_NORMAL }; As per above. ... > + switch (mode) { > + case BMP280_SLEEP: > + break; > + case BMP280_FORCED: > + ret = regmap_set_bits(data->regmap, BMP580_REG_DSP_CONFIG, > + BMP580_DSP_IIR_FORCED_FLUSH); > + if (ret) { > + dev_err(data->dev, > + "Could not flush IIR filter constants.\n"); > + return ret; > + } > + break; > + case BMP280_NORMAL: > + break; Can be unified with _SLEEP case. > + default: > + return -EINVAL; > + } ... > +static int bmp580_wait_conv(struct bmp280_data *data) > +{ > + /* > + * Taken from datasheet, Section 2 "Specification, Table 3 "Electrical > + * characteristics Missing period. > + */ > + 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}; Please, start values on the next line after {. Also make }; to be on a separate line. > + int meas_time; > + > + meas_time = 4000 + time_conv_temp[data->oversampling_temp] + > + time_conv_press[data->oversampling_press]; 4 * USEC_PER_MSEC ? > + usleep_range(meas_time, meas_time * 12 / 10); Comment? fsleep() ? > + return 0; > +} ... > + usleep_range(2500, 3000); fsleep() ?
On Fri, Aug 23, 2024 at 10:25:01PM +0300, Andy Shevchenko wrote: > On Fri, Aug 23, 2024 at 08:17:11PM +0200, Vasileios Amoiridis wrote: > > This commit adds 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. > > > > This commit, adds sleep and forced mode support. Essentially, the sensor > > sleeps all the time except for when a measurement is requested. When there > > is a request for a measurement, the sensor is put into forced mode, starts > > the measurement and after it is done we read the output and we put it again > > in sleep mode. > > > > For really fast and more deterministic measurements, the triggered buffer > > interface can be used, since the sensor is still used in normal mode for > > that use case. > > > > This commit does not add though support for DEEP STANDBY, Low Power NORMAL > > and CONTINUOUS modes, supported only by the BMP58x version. > > ... > > > +static const u8 bmp280_operation_mode[] = { BMP280_MODE_SLEEP, > > + BMP280_MODE_FORCED, > > + BMP280_MODE_NORMAL }; > > Better style is > > static const u8 bmp280_operation_mode[] = { > BMP280_MODE_SLEEP, BMP280_MODE_FORCED, BMP280_MODE_NORMAL, > }; > > Also note comma at the end. > Looks much better indeed, thanks! > ... > > > +static int bmp280_wait_conv(struct bmp280_data *data) > > +{ > > + unsigned int reg; > > + int ret, meas_time; > > + > > + meas_time = BMP280_MEAS_OFFSET; > > + > > + /* Check if we are using a BME280 device */ > > + if (data->oversampling_humid) > > + meas_time += (1 << data->oversampling_humid) * BMP280_MEAS_DUR + > > BIT(data->oversampling_humid) ACK. > > > + BMP280_PRESS_HUMID_MEAS_OFFSET; > > > + /* Pressure measurement time */ > > + meas_time += (1 << data->oversampling_press) * BMP280_MEAS_DUR + > > Ditto. ACK. > > > + BMP280_PRESS_HUMID_MEAS_OFFSET; > > > + /* Temperature measurement time */ > > + meas_time += (1 << data->oversampling_temp) * BMP280_MEAS_DUR; > > Ditto. > ACK. > > + usleep_range(meas_time, meas_time * 12 / 10); > > fsleep() ? Could be used indeed. My concern is that fsleep uses a sleep range between x and 2x but I don't think it is a problem since these are oneshot captures. > > > + 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 const u8 bmp380_operation_mode[] = { BMP380_MODE_SLEEP, > > + BMP380_MODE_FORCED, > > + BMP380_MODE_NORMAL }; > > As per above. > ACK. > ... > > > +static int bmp380_wait_conv(struct bmp280_data *data) > > +{ > > As per above comments against bmp280_wait_conv(). > ACK. > > + ret = regmap_read(data->regmap, BMP380_REG_STATUS, ®); > > + if (ret) { > > + dev_err(data->dev, "failed to read status register\n"); > > + return ret; > > + } > > > + > > Choose one style (with or without blank line), as in the above you have no > blank line in the similar situation. > I didn't even notice it, you are right. > > + 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; > > +} > > ... > > > + usleep_range(data->start_up_time, data->start_up_time + 500); > > fsleep() ? Comment? > I could use fsleep(). I didn't add a comment because also before it was also like this. The code just used hardcoded (2000,2500) while I used the data->start_up_time. It is mentioned in the datasheet, I could add it. > ... > > > +static const u8 bmp580_operation_mode[] = { BMP580_MODE_SLEEP, > > + BMP580_MODE_FORCED, > > + BMP580_MODE_NORMAL }; > > As per above. > ACK. > ... > > > + switch (mode) { > > + case BMP280_SLEEP: > > + break; > > + case BMP280_FORCED: > > + ret = regmap_set_bits(data->regmap, BMP580_REG_DSP_CONFIG, > > + BMP580_DSP_IIR_FORCED_FLUSH); > > + if (ret) { > > + dev_err(data->dev, > > + "Could not flush IIR filter constants.\n"); > > + return ret; > > + } > > + break; > > + case BMP280_NORMAL: > > + break; > > Can be unified with _SLEEP case. > ACK. > > + default: > > + return -EINVAL; > > + } > > ... > > > +static int bmp580_wait_conv(struct bmp280_data *data) > > +{ > > + /* > > + * Taken from datasheet, Section 2 "Specification, Table 3 "Electrical > > + * characteristics > > Missing period. ACK. > > > + */ > > + 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}; > > Please, start values on the next line after {. Also make }; to be on a separate line. > ACK. > > + int meas_time; > > + > > + meas_time = 4000 + time_conv_temp[data->oversampling_temp] + > > + time_conv_press[data->oversampling_press]; > > 4 * USEC_PER_MSEC ? Since the previous values in the arrays are all in thousands, why should I make this different? > > > + usleep_range(meas_time, meas_time * 12 / 10); > > Comment? fsleep() ? > The usleep here is for waiting for the sensor to make the conversion, as the function name points out as well? Should I put it as a comment? In general, is it considered good practice to add comments above all sleep functions? I don't think it's a bad idea, I just didn't notice it somewhere. > > + return 0; > > +} > > ... > > > + usleep_range(2500, 3000); > > fsleep() ? > ACK. > -- > With Best Regards, > Andy Shevchenko > > Cheers, Vasilis
On Sat, Aug 24, 2024 at 01:29:24PM +0200, Vasileios Amoiridis wrote: > On Fri, Aug 23, 2024 at 10:25:01PM +0300, Andy Shevchenko wrote: > > On Fri, Aug 23, 2024 at 08:17:11PM +0200, Vasileios Amoiridis wrote: ... > > > + meas_time = 4000 + time_conv_temp[data->oversampling_temp] + > > > + time_conv_press[data->oversampling_press]; > > > > 4 * USEC_PER_MSEC ? > > Since the previous values in the arrays are all in thousands, why should > I make this different? When I read the code (and mind that we write code for humans), I don't have a clue about the order of the values in use. Also it's hard to get from the line the meaning of both sides of the formula. Using named definitions helps a lot in understanding this line without reading and analysing code in full. ... > > > + usleep_range(meas_time, meas_time * 12 / 10); > > > > Comment? fsleep() ? > > The usleep here is for waiting for the sensor to make the conversion, > as the function name points out as well? Should I put it as a comment? > > In general, is it considered good practice to add comments above all > sleep functions? Yes, it's even a requirement (not sure if it's documented anywhere) to comment over long enough delays. > I don't think it's a bad idea, I just didn't notice > it somewhere. > > > > + return 0; > > > +} ... > > > + usleep_range(2500, 3000); > > > > fsleep() ? > > > > ACK. Also a comment, since it's milliseconds range which might be considered long enough.
diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index 736a1f4fd5dc..e1336aeceec0 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -617,6 +617,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); @@ -646,6 +654,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); @@ -989,6 +1005,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; + int ret, meas_time; + + meas_time = BMP280_MEAS_OFFSET; + + /* Check if we are using a BME280 device */ + if (data->oversampling_humid) + meas_time += (1 << data->oversampling_humid) * BMP280_MEAS_DUR + + BMP280_PRESS_HUMID_MEAS_OFFSET; + + /* Pressure measurement time */ + meas_time += (1 << data->oversampling_press) * BMP280_MEAS_DUR + + BMP280_PRESS_HUMID_MEAS_OFFSET; + + /* Temperature measurement time */ + meas_time += (1 << data->oversampling_temp) * BMP280_MEAS_DUR; + + usleep_range(meas_time, meas_time * 12 / 10); + + 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) | @@ -999,7 +1078,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; @@ -1106,6 +1185,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, @@ -1227,6 +1308,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, @@ -1514,6 +1597,70 @@ 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; + + /* Offset measurement time */ + meas_time = BMP380_MEAS_OFFSET; + + /* Pressure measurement time */ + meas_time += (1 << data->oversampling_press) * BMP380_MEAS_DUR + + BMP380_PRESS_MEAS_OFFSET; + + /* Temperature measurement time */ + meas_time += (1 << data->oversampling_temp) * BMP380_MEAS_DUR + + BMP380_TEMP_MEAS_OFFSET; + + usleep_range(meas_time, meas_time * 12 / 10); + + 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; @@ -1574,17 +1721,15 @@ 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)); + + usleep_range(data->start_up_time, data->start_up_time + 500); + + ret = bmp380_set_mode(data, BMP280_NORMAL); if (ret) { dev_err(data->dev, "failed to set normal mode\n"); return ret; @@ -1610,6 +1755,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; } @@ -1703,6 +1859,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, @@ -2090,6 +2248,66 @@ 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) +{ + int ret; + + switch (mode) { + case BMP280_SLEEP: + break; + case BMP280_FORCED: + ret = regmap_set_bits(data->regmap, BMP580_REG_DSP_CONFIG, + BMP580_DSP_IIR_FORCED_FLUSH); + if (ret) { + dev_err(data->dev, + "Could not flush IIR filter constants.\n"); + return ret; + } + break; + case BMP280_NORMAL: + 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(data->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; + + meas_time = 4000 + time_conv_temp[data->oversampling_temp] + + time_conv_press[data->oversampling_press]; + + usleep_range(meas_time, meas_time * 12 / 10); + + return 0; +} + static int bmp580_chip_config(struct bmp280_data *data) { bool change = false, aux; @@ -2160,17 +2378,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 @@ -2266,6 +2473,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, @@ -2513,6 +2722,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; @@ -2583,6 +2805,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, }; @@ -2635,6 +2859,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; } @@ -2805,6 +3030,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); @@ -2830,6 +3059,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); + + usleep_range(2500, 3000); return regulator_bulk_disable(BMP280_NUM_SUPPLIES, data->supplies); } @@ -2844,7 +3076,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); };
This commit adds 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. This commit, adds sleep and forced mode support. Essentially, the sensor sleeps all the time except for when a measurement is requested. When there is a request for a measurement, the sensor is put into forced mode, starts the measurement and after it is done we read the output and we put it again in sleep mode. For really fast and more deterministic measurements, the triggered buffer interface can be used, since the sensor is still used in normal mode for that use case. This commit does not add though support for DEEP STANDBY, Low Power NORMAL and CONTINUOUS modes, supported only by the BMP58x version. Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com> --- drivers/iio/pressure/bmp280-core.c | 277 ++++++++++++++++++++++++++--- drivers/iio/pressure/bmp280.h | 21 +++ 2 files changed, 278 insertions(+), 20 deletions(-)