iio: pressure: bmp280: Minor cleanup and triggered
v9 cover iio: pressure: bmp280: Minor cleanup and triggered
Changes in v9:
Patch 1/3:
- In bmp580_temp_coeffs, instead of *1000/2^16, now we have *125/2^13 to avoid overflows, as it was proposed.
- Type casting to (s64) to temperature read in the read_raw_impl function was removed as well as it is no longer needed.
Patch 3/3:
- Renamed "buffer_handler" to "trigger_handler" to keep consistency with the rest of the drivers.
- Added new iio_channel_spec for bmp580 in order to use IIO_LE and real_bits = 24.
v8: https://lore.kernel.org/linux-iio/[email protected]/
Vasileios Amoiridis (3):
iio: pressure: bmp280: Generalize read_*() functions
iio: pressure: bmp280: Add SCALE, RAW values in channels and
refactorize them
iio: pressure: bmp280: Add triggered buffer support
drivers/iio/pressure/Kconfig | 2 + drivers/iio/pressure/bmp280-core.c | 643 +++++++++++++++++++++++++---- drivers/iio/pressure/bmp280-spi.c | 8 +- drivers/iio/pressure/bmp280.h | 34 +- 4 files changed, 589 insertions(+), 98 deletions(-)
base-commit: 3341d69268accb5294b569ec37e55212a8a28ac5
Signature · 1 line
2.25.1
PATCH v9 1/3 iio: pressure: bmp280: Generalize read_*() functions
Add the coefficients for the IIO standard units and the IIO value inside the chip_info structure.
Move the calculations for the IIO unit compatibility from inside the read_{temp,press,humid}() functions and move them to the general read_raw() function.
In this way, all the data for the calculation of the value are located in the chip_info structure of the respective sensor.
--- drivers/iio/pressure/bmp280-core.c | 168 +++++++++++++++++------------ drivers/iio/pressure/bmp280.h | 13 ++- 2 files changed, 108 insertions(+), 73 deletions(-)
drivers/iio/pressure/bmp280-core.c +98 -70
@@ -445,10 +445,8 @@ static u32 bmp280_compensate_press(struct bmp280_data *data,return (u32 )p; } -static int bmp280_read_temp (struct bmp280_data *data, -int *val,int *val2) +static int bmp280_read_temp (struct bmp280_data *data,s32 *comp_temp) { -s32 comp_temp;u32 adc_temp;int ret;
@@ -456,16 +454,15 @@ static int bmp280_read_temp(struct bmp280_data *data,if (ret)return ret; - comp_temp =bmp280_compensate_temp (data, adc_temp); + *comp_temp =bmp280_compensate_temp (data, adc_temp); - *val = comp_temp *10 ; -return IIO_VAL_INT ; +return 0 ; } -static int bmp280_read_press (struct bmp280_data *data, -int *val,int *val2) +static int bmp280_read_press (struct bmp280_data *data,u32 *comp_press) { -u32 comp_press, adc_press, t_fine; +u32 adc_press; +s32 t_fine;int ret; ret =bmp280_get_t_fine (data, &t_fine);
@@ -476,17 +473,13 @@ static int bmp280_read_press(struct bmp280_data *data,if (ret)return ret; - comp_press =bmp280_compensate_press (data, adc_press, t_fine); - - *val = comp_press; - *val2 =256000 ; + *comp_press =bmp280_compensate_press (data, adc_press, t_fine); -return IIO_VAL_FRACTIONAL ; +return 0 ; } -static int bme280_read_humid (struct bmp280_data *data,int *val,int *val2) +static int bme280_read_humid (struct bmp280_data *data,u32 *comp_humidity) { -u32 comp_humidity;u16 adc_humidity;s32 t_fine;int ret;
@@ -499,11 +492,9 @@ static int bme280_read_humid(struct bmp280_data *data, int *val, int *val2)if (ret)return ret; - comp_humidity =bme280_compensate_humidity (data, adc_humidity, t_fine); - - *val = comp_humidity *1000 /1024 ; + *comp_humidity =bme280_compensate_humidity (data, adc_humidity, t_fine); -return IIO_VAL_INT ; +return 0 ; } static int bmp280_read_raw_impl(struct iio_dev *indio_dev,
@@ -511,6 +502,8 @@ static int bmp280_read_raw_impl(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct bmp280_data *data = iio_priv(indio_dev); +int chan_value; +int ret;guard (mutex)(&data->lock);
@@ -518,11 +511,29 @@ static int bmp280_read_raw_impl(struct iio_dev *indio_dev,case IIO_CHAN_INFO_PROCESSED :switch (chan->type) {case IIO_HUMIDITYRELATIVE : -return data->chip_info->read_humid (data, val, val2); + ret = data->chip_info->read_humid (data, &chan_value); +if (ret) +return ret; + + *val = data->chip_info->humid_coeffs[0 ] * chan_value; + *val2 = data->chip_info->humid_coeffs[1 ]; +return data->chip_info->humid_coeffs_type;case IIO_PRESSURE : -return data->chip_info->read_press (data, val, val2); + ret = data->chip_info->read_press (data, &chan_value); +if (ret) +return ret; + + *val = data->chip_info->press_coeffs[0 ] * chan_value; + *val2 = data->chip_info->press_coeffs[1 ]; +return data->chip_info->press_coeffs_type;case IIO_TEMP : -return data->chip_info->read_temp (data, val, val2); + ret = data->chip_info->read_temp (data, &chan_value); +if (ret) +return ret; + + *val = data->chip_info->temp_coeffs[0 ] * chan_value; + *val2 = data->chip_info->temp_coeffs[1 ]; +return data->chip_info->temp_coeffs_type;default :return -EINVAL ; }
@@ -822,6 +833,8 @@ static int bmp280_chip_config(struct bmp280_data *data)static const int bmp280_oversampling_avail[] = {1 ,2 ,4 ,8 ,16 };static const u8 bmp280_chip_ids[] = {BMP280_CHIP_ID }; +static const int bmp280_temp_coeffs[] = {10 ,1 }; +static const int bmp280_press_coeffs[] = {1 ,256000 };const struct bmp280_chip_info bmp280_chip_info = { .id_reg =BMP280_REG_ID ,
@@ -850,6 +863,11 @@ const struct bmp280_chip_info bmp280_chip_info = { .num_oversampling_press_avail = ARRAY_SIZE(bmp280_oversampling_avail), .oversampling_press_default = BMP280_OSRS_PRESS_16X - 1, + .temp_coeffs = bmp280_temp_coeffs, + .temp_coeffs_type = IIO_VAL_FRACTIONAL, + .press_coeffs = bmp280_press_coeffs, + .press_coeffs_type = IIO_VAL_FRACTIONAL, + .chip_config = bmp280_chip_config, .read_temp = bmp280_read_temp, .read_press = bmp280_read_press,
@@ -877,6 +895,7 @@ static int bme280_chip_config(struct bmp280_data *data) }static const u8 bme280_chip_ids[] = {BME280_CHIP_ID }; +static const int bme280_humid_coeffs[] = {1000 ,1024 };const struct bmp280_chip_info bme280_chip_info = { .id_reg =BMP280_REG_ID ,
@@ -899,6 +918,13 @@ const struct bmp280_chip_info bme280_chip_info = { .num_oversampling_humid_avail = ARRAY_SIZE(bmp280_oversampling_avail), .oversampling_humid_default = BME280_OSRS_HUMIDITY_16X - 1, + .temp_coeffs = bmp280_temp_coeffs, + .temp_coeffs_type = IIO_VAL_FRACTIONAL, + .press_coeffs = bmp280_press_coeffs, + .press_coeffs_type = IIO_VAL_FRACTIONAL, + .humid_coeffs = bme280_humid_coeffs, + .humid_coeffs_type = IIO_VAL_FRACTIONAL, + .chip_config = bme280_chip_config, .read_temp = bmp280_read_temp, .read_press = bmp280_read_press,
@@ -1091,9 +1117,8 @@ static u32 bmp380_compensate_press(struct bmp280_data *data,return comp_press; } -static int bmp380_read_temp (struct bmp280_data *data,int *val,int *val2) +static int bmp380_read_temp (struct bmp280_data *data,s32 *comp_temp) { -s32 comp_temp;u32 adc_temp;int ret;
@@ -1101,15 +1126,14 @@ static int bmp380_read_temp(struct bmp280_data *data, int *val, int *val2)if (ret)return ret; - comp_temp =bmp380_compensate_temp (data, adc_temp); + *comp_temp =bmp380_compensate_temp (data, adc_temp); - *val = comp_temp *10 ; -return IIO_VAL_INT ; +return 0 ; } -static int bmp380_read_press (struct bmp280_data *data,int *val,int *val2) +static int bmp380_read_press (struct bmp280_data *data,u32 *comp_press) { -u32 adc_press, comp_press, t_fine; +u32 adc_press, t_fine;int ret; ret =bmp380_get_t_fine (data, &t_fine);
@@ -1120,12 +1144,9 @@ static int bmp380_read_press(struct bmp280_data *data, int *val, int *val2)if (ret)return ret; - comp_press =bmp380_compensate_press (data, adc_press, t_fine); - - *val = comp_press; - *val2 =100000 ; + *comp_press =bmp380_compensate_press (data, adc_press, t_fine); -return IIO_VAL_FRACTIONAL ; +return 0 ; }static int bmp380_read_calib (struct bmp280_data *data)
@@ -1296,6 +1317,8 @@ static int bmp380_chip_config(struct bmp280_data *data)static const int bmp380_oversampling_avail[] = {1 ,2 ,4 ,8 ,16 ,32 };static const int bmp380_iir_filter_coeffs_avail[] = {1 ,2 ,4 ,8 ,16 ,32 ,64 ,128 };static const u8 bmp380_chip_ids[] = {BMP380_CHIP_ID ,BMP390_CHIP_ID }; +static const int bmp380_temp_coeffs[] = {10 ,1 }; +static const int bmp380_press_coeffs[] = {1 ,100000 };const struct bmp280_chip_info bmp380_chip_info = { .id_reg =BMP380_REG_ID ,
@@ -1323,6 +1346,11 @@ const struct bmp280_chip_info bmp380_chip_info = { .num_iir_filter_coeffs_avail = ARRAY_SIZE(bmp380_iir_filter_coeffs_avail), .iir_filter_coeff_default = 2, + .temp_coeffs = bmp380_temp_coeffs, + .temp_coeffs_type = IIO_VAL_FRACTIONAL, + .press_coeffs = bmp380_press_coeffs, + .press_coeffs_type = IIO_VAL_FRACTIONAL, + .chip_config = bmp380_chip_config, .read_temp = bmp380_read_temp, .read_press = bmp380_read_press,
@@ -1443,9 +1471,9 @@ static int bmp580_nvm_operation(struct bmp280_data *data, bool is_write)* for what is expected on IIO ABI. */ -static int bmp580_read_temp (struct bmp280_data *data,int *val,int *val2) +static int bmp580_read_temp (struct bmp280_data *data,s32 *raw_temp) { -s32 raw_temp; +s32 value_temp;int ret; ret = regmap_bulk_read(data->regmap, BMP580_REG_TEMP_XLSB, data->buf,
@@ -1455,25 +1483,19 @@ static int bmp580_read_temp(struct bmp280_data *data, int *val, int *val2)return ret; } - raw_temp =get_unaligned_le24 (data->buf); -if (raw_temp ==BMP580_TEMP_SKIPPED ) { + value_temp =get_unaligned_le24 (data->buf); +if (value_temp ==BMP580_TEMP_SKIPPED ) {dev_err (data->dev,"reading temperature skipped\n" );return -EIO ; } + *raw_temp =sign_extend32 (value_temp,23 ); -/* -* Temperature is returned in Celsius degrees in fractional -* form down 2^16. We rescale by x1000 to return millidegrees -* Celsius to respect IIO ABI. -*/ - raw_temp =sign_extend32 (raw_temp,23 ); - *val = ((s64 )raw_temp *1000 ) / (1 <<16 ); -return IIO_VAL_INT ; +return 0 ; } -static int bmp580_read_press (struct bmp280_data *data,int *val,int *val2) +static int bmp580_read_press (struct bmp280_data *data,u32 *raw_press) { -u32 raw_press; +u32 value_press;int ret; ret = regmap_bulk_read(data->regmap, BMP580_REG_PRESS_XLSB, data->buf,
@@ -1483,18 +1505,14 @@ static int bmp580_read_press(struct bmp280_data *data, int *val, int *val2)return ret; } - raw_press =get_unaligned_le24 (data->buf); -if (raw_press ==BMP580_PRESS_SKIPPED ) { + value_press =get_unaligned_le24 (data->buf); +if (value_press ==BMP580_PRESS_SKIPPED ) {dev_err (data->dev,"reading pressure skipped\n" );return -EIO ; } -/* -* Pressure is returned in Pascals in fractional form down 2^16. -* We rescale /1000 to convert to kilopascal to respect IIO ABI. -*/ - *val = raw_press; - *val2 =64000 ;/* 2^6 * 1000 */ -return IIO_VAL_FRACTIONAL ; + *raw_press = value_press; + +return 0 ; }static const int bmp580_odr_table[][2 ] = {
@@ -1830,6 +1848,9 @@ static int bmp580_chip_config(struct bmp280_data *data)static const int bmp580_oversampling_avail[] = {1 ,2 ,4 ,8 ,16 ,32 ,64 ,128 };static const u8 bmp580_chip_ids[] = {BMP580_CHIP_ID ,BMP580_CHIP_ID_ALT }; +/* Instead of { 1000, 16 } we do this, to avoid overflow issues */ +static const int bmp580_temp_coeffs[] = {125 ,13 }; +static const int bmp580_press_coeffs[] = {1 ,64000 };const struct bmp280_chip_info bmp580_chip_info = { .id_reg =BMP580_REG_CHIP_ID ,
@@ -1856,6 +1877,11 @@ const struct bmp280_chip_info bmp580_chip_info = { .num_iir_filter_coeffs_avail = ARRAY_SIZE(bmp380_iir_filter_coeffs_avail), .iir_filter_coeff_default = 2, + .temp_coeffs = bmp580_temp_coeffs, + .temp_coeffs_type = IIO_VAL_FRACTIONAL_LOG2, + .press_coeffs = bmp580_press_coeffs, + .press_coeffs_type = IIO_VAL_FRACTIONAL, + .chip_config = bmp580_chip_config, .read_temp = bmp580_read_temp, .read_press = bmp580_read_press,
@@ -2011,9 +2037,8 @@ static s32 bmp180_compensate_temp(struct bmp280_data *data, u32 adc_temp)return (bmp180_calc_t_fine (data, adc_temp) +8 ) /16 ; } -static int bmp180_read_temp (struct bmp280_data *data,int *val,int *val2) +static int bmp180_read_temp (struct bmp280_data *data,s32 *comp_temp) { -s32 comp_temp;u32 adc_temp;int ret;
@@ -2021,10 +2046,9 @@ static int bmp180_read_temp(struct bmp280_data *data, int *val, int *val2)if (ret)return ret; - comp_temp =bmp180_compensate_temp (data, adc_temp); + *comp_temp =bmp180_compensate_temp (data, adc_temp); - *val = comp_temp *100 ; -return IIO_VAL_INT ; +return 0 ; }static int bmp180_read_press_adc (struct bmp280_data *data,u32 *adc_press)
@@ -2087,9 +2111,9 @@ static u32 bmp180_compensate_press(struct bmp280_data *data, u32 adc_press,return p + ((x1 + x2 +3791 ) >>4 ); } -static int bmp180_read_press (struct bmp280_data *data,int *val,int *val2) +static int bmp180_read_press (struct bmp280_data *data,u32 *comp_press) { -u32 comp_press, adc_press; +u32 adc_press;s32 t_fine;int ret;
@@ -2101,12 +2125,9 @@ static int bmp180_read_press(struct bmp280_data *data, int *val, int *val2)if (ret)return ret; - comp_press =bmp180_compensate_press (data, adc_press, t_fine); - - *val = comp_press; - *val2 =1000 ; + *comp_press =bmp180_compensate_press (data, adc_press, t_fine); -return IIO_VAL_FRACTIONAL ; +return 0 ; }static int bmp180_chip_config (struct bmp280_data *data)
@@ -2117,6 +2138,8 @@ static int bmp180_chip_config(struct bmp280_data *data)static const int bmp180_oversampling_temp_avail[] = {1 };static const int bmp180_oversampling_press_avail[] = {1 ,2 ,4 ,8 };static const u8 bmp180_chip_ids[] = {BMP180_CHIP_ID }; +static const int bmp180_temp_coeffs[] = {100 ,1 }; +static const int bmp180_press_coeffs[] = {1 ,1000 };const struct bmp280_chip_info bmp180_chip_info = { .id_reg =BMP280_REG_ID ,
@@ -2137,6 +2160,11 @@ const struct bmp280_chip_info bmp180_chip_info = {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,
drivers/iio/pressure/bmp280.h +10 -3
@@ -446,10 +446,17 @@ struct bmp280_chip_info {int num_sampling_freq_avail;int sampling_freq_default; +const int *temp_coeffs; +const int temp_coeffs_type; +const int *press_coeffs; +const int press_coeffs_type; +const int *humid_coeffs; +const int humid_coeffs_type; +int (*chip_config)(struct bmp280_data *data); -int (*read_temp)(struct bmp280_data *data,int *val,int *val2); -int (*read_press)(struct bmp280_data *data,int *val,int *val2); -int (*read_humid)(struct bmp280_data *data,int *val,int *val2); +int (*read_temp)(struct bmp280_data *data,s32 *adc_temp); +int (*read_press)(struct bmp280_data *data,u32 *adc_press); +int (*read_humid)(struct bmp280_data *data,u32 *adc_humidity);int (*read_calib)(struct bmp280_data *data);int (*preinit)(struct bmp280_data *data); };
Signature · 1 line
2.25.1
Re: [PATCH v9 1/3] iio: pressure: bmp280: Generalize read_*() functions
Quoted 310 lines · Vasileios Amoiridis
Add the coefficients for the IIO standard units and the IIO value inside the
chip_infostructure.Move the calculations for the IIO unit compatibility from inside the read_{temp,press,humid}() functions and move them to the general
read_raw()function.In this way, all the data for the calculation of the value are located in the
chip_infostructure of the respective sensor.Signed-off-by Vasileios Amoiridis <[email protected]>--- drivers/iio/pressure/bmp280-core.c | 168 +++++++++++++++++------------ drivers/iio/pressure/bmp280.h | 13 ++- 2 files changed, 108 insertions(+), 73 deletions(-)drivers/iio/pressure/bmp280-core.c +76
-58@@ -445,10 +445,8 @@ static u32 bmp280_compensate_press(struct bmp280_data *data,return (u32 )p; } -static int bmp280_read_temp (struct bmp280_data *data, -int *val,int *val2) +static int bmp280_read_temp (struct bmp280_data *data,s32 *comp_temp) { -s32 comp_temp;u32 adc_temp;int ret;@@ -456,16 +454,15 @@ static int bmp280_read_temp(struct bmp280_data *data,if (ret)return ret; - comp_temp =bmp280_compensate_temp (data, adc_temp); + *comp_temp =bmp280_compensate_temp (data, adc_temp); - *val = comp_temp *10 ; -return IIO_VAL_INT ; +return 0 ; } -static int bmp280_read_press (struct bmp280_data *data, -int *val,int *val2) +static int bmp280_read_press (struct bmp280_data *data,u32 *comp_press) { -u32 comp_press, adc_press, t_fine; +u32 adc_press; +s32 t_fine;int ret; ret =bmp280_get_t_fine (data, &t_fine);@@ -476,17 +473,13 @@ static int bmp280_read_press(struct bmp280_data *data,if (ret)return ret; - comp_press =bmp280_compensate_press (data, adc_press, t_fine); - - *val = comp_press; - *val2 =256000 ; + *comp_press =bmp280_compensate_press (data, adc_press, t_fine); -return IIO_VAL_FRACTIONAL ; +return 0 ; } -static int bme280_read_humid (struct bmp280_data *data,int *val,int *val2) +static int bme280_read_humid (struct bmp280_data *data,u32 *comp_humidity) { -u32 comp_humidity;u16 adc_humidity;s32 t_fine;int ret;@@ -499,11 +492,9 @@ static int bme280_read_humid(struct bmp280_data *data, int *val, int *val2)if (ret)return ret; - comp_humidity =bme280_compensate_humidity (data, adc_humidity, t_fine); - - *val = comp_humidity *1000 /1024 ; + *comp_humidity =bme280_compensate_humidity (data, adc_humidity, t_fine); -return IIO_VAL_INT ; +return 0 ; } static int bmp280_read_raw_impl(struct iio_dev *indio_dev,@@ -511,6 +502,8 @@ static int bmp280_read_raw_impl(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct bmp280_data *data = iio_priv(indio_dev); +int chan_value; +int ret;guard (mutex)(&data->lock);@@ -518,11 +511,29 @@ static int bmp280_read_raw_impl(struct iio_dev *indio_dev,case IIO_CHAN_INFO_PROCESSED :switch (chan->type) {case IIO_HUMIDITYRELATIVE : -return data->chip_info->read_humid (data, val, val2); + ret = data->chip_info->read_humid (data, &chan_value); +if (ret) +return ret; + + *val = data->chip_info->humid_coeffs[0 ] * chan_value; + *val2 = data->chip_info->humid_coeffs[1 ]; +return data->chip_info->humid_coeffs_type;case IIO_PRESSURE : -return data->chip_info->read_press (data, val, val2); + ret = data->chip_info->read_press (data, &chan_value); +if (ret) +return ret; + + *val = data->chip_info->press_coeffs[0 ] * chan_value; + *val2 = data->chip_info->press_coeffs[1 ]; +return data->chip_info->press_coeffs_type;case IIO_TEMP : -return data->chip_info->read_temp (data, val, val2); + ret = data->chip_info->read_temp (data, &chan_value); +if (ret) +return ret; + + *val = data->chip_info->temp_coeffs[0 ] * chan_value; + *val2 = data->chip_info->temp_coeffs[1 ]; +return data->chip_info->temp_coeffs_type;default :return -EINVAL ; }@@ -822,6 +833,8 @@ static int bmp280_chip_config(struct bmp280_data *data)static const int bmp280_oversampling_avail[] = {1 ,2 ,4 ,8 ,16 };static const u8 bmp280_chip_ids[] = {BMP280_CHIP_ID }; +static const int bmp280_temp_coeffs[] = {10 ,1 }; +static const int bmp280_press_coeffs[] = {1 ,256000 };const struct bmp280_chip_info bmp280_chip_info = { .id_reg =BMP280_REG_ID ,@@ -850,6 +863,11 @@ const struct bmp280_chip_info bmp280_chip_info = { .num_oversampling_press_avail = ARRAY_SIZE(bmp280_oversampling_avail), .oversampling_press_default = BMP280_OSRS_PRESS_16X - 1, + .temp_coeffs = bmp280_temp_coeffs, + .temp_coeffs_type = IIO_VAL_FRACTIONAL, + .press_coeffs = bmp280_press_coeffs, + .press_coeffs_type = IIO_VAL_FRACTIONAL, + .chip_config = bmp280_chip_config, .read_temp = bmp280_read_temp, .read_press = bmp280_read_press,@@ -877,6 +895,7 @@ static int bme280_chip_config(struct bmp280_data *data) }static const u8 bme280_chip_ids[] = {BME280_CHIP_ID }; +static const int bme280_humid_coeffs[] = {1000 ,1024 };const struct bmp280_chip_info bme280_chip_info = { .id_reg =BMP280_REG_ID ,@@ -899,6 +918,13 @@ const struct bmp280_chip_info bme280_chip_info = { .num_oversampling_humid_avail = ARRAY_SIZE(bmp280_oversampling_avail), .oversampling_humid_default = BME280_OSRS_HUMIDITY_16X - 1, + .temp_coeffs = bmp280_temp_coeffs, + .temp_coeffs_type = IIO_VAL_FRACTIONAL, + .press_coeffs = bmp280_press_coeffs, + .press_coeffs_type = IIO_VAL_FRACTIONAL, + .humid_coeffs = bme280_humid_coeffs, + .humid_coeffs_type = IIO_VAL_FRACTIONAL, + .chip_config = bme280_chip_config, .read_temp = bmp280_read_temp, .read_press = bmp280_read_press,@@ -1091,9 +1117,8 @@ static u32 bmp380_compensate_press(struct bmp280_data *data,return comp_press; } -static int bmp380_read_temp (struct bmp280_data *data,int *val,int *val2) +static int bmp380_read_temp (struct bmp280_data *data,s32 *comp_temp) { -s32 comp_temp;u32 adc_temp;int ret;@@ -1101,15 +1126,14 @@ static int bmp380_read_temp(struct bmp280_data *data, int *val, int *val2)if (ret)return ret; - comp_temp =bmp380_compensate_temp (data, adc_temp); + *comp_temp =bmp380_compensate_temp (data, adc_temp); - *val = comp_temp *10 ; -return IIO_VAL_INT ; +return 0 ; } -static int bmp380_read_press (struct bmp280_data *data,int *val,int *val2) +static int bmp380_read_press (struct bmp280_data *data,u32 *comp_press) { -u32 adc_press, comp_press, t_fine; +u32 adc_press, t_fine;int ret; ret =bmp380_get_t_fine (data, &t_fine);@@ -1120,12 +1144,9 @@ static int bmp380_read_press(struct bmp280_data *data, int *val, int *val2)if (ret)return ret; - comp_press =bmp380_compensate_press (data, adc_press, t_fine); - - *val = comp_press; - *val2 =100000 ; + *comp_press =bmp380_compensate_press (data, adc_press, t_fine); -return IIO_VAL_FRACTIONAL ; +return 0 ; }static int bmp380_read_calib (struct bmp280_data *data)@@ -1296,6 +1317,8 @@ static int bmp380_chip_config(struct bmp280_data *data)static const int bmp380_oversampling_avail[] = {1 ,2 ,4 ,8 ,16 ,32 };static const int bmp380_iir_filter_coeffs_avail[] = {1 ,2 ,4 ,8 ,16 ,32 ,64 ,128 };static const u8 bmp380_chip_ids[] = {BMP380_CHIP_ID ,BMP390_CHIP_ID }; +static const int bmp380_temp_coeffs[] = {10 ,1 }; +static const int bmp380_press_coeffs[] = {1 ,100000 };const struct bmp280_chip_info bmp380_chip_info = { .id_reg =BMP380_REG_ID ,@@ -1323,6 +1346,11 @@ const struct bmp280_chip_info bmp380_chip_info = { .num_iir_filter_coeffs_avail = ARRAY_SIZE(bmp380_iir_filter_coeffs_avail), .iir_filter_coeff_default = 2, + .temp_coeffs = bmp380_temp_coeffs, + .temp_coeffs_type = IIO_VAL_FRACTIONAL, + .press_coeffs = bmp380_press_coeffs, + .press_coeffs_type = IIO_VAL_FRACTIONAL, + .chip_config = bmp380_chip_config, .read_temp = bmp380_read_temp, .read_press = bmp380_read_press,@@ -1443,9 +1471,9 @@ static int bmp580_nvm_operation(struct bmp280_data *data, bool is_write)* for what is expected on IIO ABI. */ -static int bmp580_read_temp (struct bmp280_data *data,int *val,int *val2) +static int bmp580_read_temp (struct bmp280_data *data,s32 *raw_temp) { -s32 raw_temp; +s32 value_temp;int ret; ret = regmap_bulk_read(data->regmap, BMP580_REG_TEMP_XLSB, data->buf,@@ -1455,25 +1483,19 @@ static int bmp580_read_temp(struct bmp280_data *data, int *val, int *val2)return ret; } - raw_temp =get_unaligned_le24 (data->buf); -if (raw_temp ==BMP580_TEMP_SKIPPED ) { + value_temp =get_unaligned_le24 (data->buf); +if (value_temp ==BMP580_TEMP_SKIPPED ) {dev_err (data->dev,"reading temperature skipped\n" );return -EIO ; } + *raw_temp =sign_extend32 (value_temp,23 ); -/* -* Temperature is returned in Celsius degrees in fractional -* form down 2^16. We rescale by x1000 to return millidegrees -* Celsius to respect IIO ABI. -*/ - raw_temp =sign_extend32 (raw_temp,23 ); - *val = ((s64 )raw_temp *1000 ) / (1 <<16 ); -return IIO_VAL_INT ; +return 0 ; } -static int bmp580_read_press (struct bmp280_data *data,int *val,int *val2) +static int bmp580_read_press (struct bmp280_data *data,u32 *raw_press) { -u32 raw_press; +u32 value_press;int ret; ret = regmap_bulk_read(data->regmap, BMP580_REG_PRESS_XLSB, data->buf,@@ -1483,18 +1505,14 @@ static int bmp580_read_press(struct bmp280_data *data, int *val, int *val2)return ret; } - raw_press =get_unaligned_le24 (data->buf); -if (raw_press ==BMP580_PRESS_SKIPPED ) { + value_press =get_unaligned_le24 (data->buf); +if (value_press ==BMP580_PRESS_SKIPPED ) {dev_err (data->dev,"reading pressure skipped\n" );return -EIO ; } -/* -* Pressure is returned in Pascals in fractional form down 2^16. -* We rescale /1000 to convert to kilopascal to respect IIO ABI. -*/ - *val = raw_press; - *val2 =64000 ;/* 2^6 * 1000 */ -return IIO_VAL_FRACTIONAL ; + *raw_press = value_press; + +return 0 ; }static const int bmp580_odr_table[][2 ] = {
drivers/iio/pressure/bmp280-core.c static int bmp580_chip_config(struct bmp280_data *data) · line 1852
Quoted 5 lines
drivers/iio/pressure/bmp280-core.c +2
-0@@ -1830,6 +1848,9 @@ static int bmp580_chip_config(struct bmp280_data *data)static const int bmp580_oversampling_avail[] = {1 ,2 ,4 ,8 ,16 ,32 ,64 ,128 };static const u8 bmp580_chip_ids[] = {BMP580_CHIP_ID ,BMP580_CHIP_ID_ALT }; +/* Instead of { 1000, 16 } we do this, to avoid overflow issues */ +static const int bmp580_temp_coeffs[] = {125 ,13 };
I'm not really sure what we gain here from using 125/13 instead of 250/14...but I don't think it hurts either.
I don't have a way to test this with the latest kernel release currently, but lgtm.
Quoted 116 lines
drivers/iio/pressure/bmp280-core.c +20
-12+static const int bmp580_press_coeffs[] = {1 ,64000 };const struct bmp280_chip_info bmp580_chip_info = { .id_reg =BMP580_REG_CHIP_ID ,@@ -1856,6 +1877,11 @@ const struct bmp280_chip_info bmp580_chip_info = { .num_iir_filter_coeffs_avail = ARRAY_SIZE(bmp380_iir_filter_coeffs_avail), .iir_filter_coeff_default = 2, + .temp_coeffs = bmp580_temp_coeffs, + .temp_coeffs_type = IIO_VAL_FRACTIONAL_LOG2, + .press_coeffs = bmp580_press_coeffs, + .press_coeffs_type = IIO_VAL_FRACTIONAL, + .chip_config = bmp580_chip_config, .read_temp = bmp580_read_temp, .read_press = bmp580_read_press,@@ -2011,9 +2037,8 @@ static s32 bmp180_compensate_temp(struct bmp280_data *data, u32 adc_temp)return (bmp180_calc_t_fine (data, adc_temp) +8 ) /16 ; } -static int bmp180_read_temp (struct bmp280_data *data,int *val,int *val2) +static int bmp180_read_temp (struct bmp280_data *data,s32 *comp_temp) { -s32 comp_temp;u32 adc_temp;int ret;@@ -2021,10 +2046,9 @@ static int bmp180_read_temp(struct bmp280_data *data, int *val, int *val2)if (ret)return ret; - comp_temp =bmp180_compensate_temp (data, adc_temp); + *comp_temp =bmp180_compensate_temp (data, adc_temp); - *val = comp_temp *100 ; -return IIO_VAL_INT ; +return 0 ; }static int bmp180_read_press_adc (struct bmp280_data *data,u32 *adc_press)@@ -2087,9 +2111,9 @@ static u32 bmp180_compensate_press(struct bmp280_data *data, u32 adc_press,return p + ((x1 + x2 +3791 ) >>4 ); } -static int bmp180_read_press (struct bmp280_data *data,int *val,int *val2) +static int bmp180_read_press (struct bmp280_data *data,u32 *comp_press) { -u32 comp_press, adc_press; +u32 adc_press;s32 t_fine;int ret;@@ -2101,12 +2125,9 @@ static int bmp180_read_press(struct bmp280_data *data, int *val, int *val2)if (ret)return ret; - comp_press =bmp180_compensate_press (data, adc_press, t_fine); - - *val = comp_press; - *val2 =1000 ; + *comp_press =bmp180_compensate_press (data, adc_press, t_fine); -return IIO_VAL_FRACTIONAL ; +return 0 ; }static int bmp180_chip_config (struct bmp280_data *data)@@ -2117,6 +2138,8 @@ static int bmp180_chip_config(struct bmp280_data *data)static const int bmp180_oversampling_temp_avail[] = {1 };static const int bmp180_oversampling_press_avail[] = {1 ,2 ,4 ,8 };static const u8 bmp180_chip_ids[] = {BMP180_CHIP_ID }; +static const int bmp180_temp_coeffs[] = {100 ,1 }; +static const int bmp180_press_coeffs[] = {1 ,1000 };const struct bmp280_chip_info bmp180_chip_info = { .id_reg =BMP280_REG_ID ,@@ -2137,6 +2160,11 @@ const struct bmp280_chip_info bmp180_chip_info = {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,drivers/iio/pressure/bmp280.h +10
-3@@ -446,10 +446,17 @@ struct bmp280_chip_info {int num_sampling_freq_avail;int sampling_freq_default; +const int *temp_coeffs; +const int temp_coeffs_type; +const int *press_coeffs; +const int press_coeffs_type; +const int *humid_coeffs; +const int humid_coeffs_type; +int (*chip_config)(struct bmp280_data *data); -int (*read_temp)(struct bmp280_data *data,int *val,int *val2); -int (*read_press)(struct bmp280_data *data,int *val,int *val2); -int (*read_humid)(struct bmp280_data *data,int *val,int *val2); +int (*read_temp)(struct bmp280_data *data,s32 *adc_temp); +int (*read_press)(struct bmp280_data *data,u32 *adc_press); +int (*read_humid)(struct bmp280_data *data,u32 *adc_humidity);int (*read_calib)(struct bmp280_data *data);int (*preinit)(struct bmp280_data *data); };Signature · 1 line
2.25.1
Jonathan Cameron
maintainerRe: [PATCH v9 1/3] iio: pressure: bmp280: Generalize read_*() functions
Quoted 13 lines
drivers/iio/pressure/bmp280-core.c static int bmp580_chip_config(struct bmp280_data *data) · line 1852
Quoted 9 lines
static const int bmp580_odr_table[][2] = {
drivers/iio/pressure/bmp280-core.c +2
-0@@ -1830,6 +1848,9 @@ static int bmp580_chip_config(struct bmp280_data *data)static const int bmp580_oversampling_avail[] = {1 ,2 ,4 ,8 ,16 ,32 ,64 ,128 };static const u8 bmp580_chip_ids[] = {BMP580_CHIP_ID ,BMP580_CHIP_ID_ALT }; +/* Instead of { 1000, 16 } we do this, to avoid overflow issues */ +static const int bmp580_temp_coeffs[] = {125 ,13 };I'm not really sure what we gain here from using 125/13 instead of 250/14...but I don't think it hurts either.
Quoted 4 lines
I don't have a way to test this with the latest kernel release currently, but lgtm.
Acked-by Adam Rizkalla <[email protected]>
Series applied. Thanks
Jonathan
Re: [PATCH v9 1/3] iio: pressure: bmp280: Generalize read_*() functions
Quoted 13 lines · Jonathan Cameron
Quoted 13 lines
drivers/iio/pressure/bmp280-core.c static int bmp580_chip_config(struct bmp280_data *data) · line 1852
Quoted 9 lines
static const int bmp580_odr_table[][2] = {
drivers/iio/pressure/bmp280-core.c +2
-0@@ -1830,6 +1848,9 @@ static int bmp580_chip_config(struct bmp280_data *data)static const int bmp580_oversampling_avail[] = {1 ,2 ,4 ,8 ,16 ,32 ,64 ,128 };static const u8 bmp580_chip_ids[] = {BMP580_CHIP_ID ,BMP580_CHIP_ID_ALT }; +/* Instead of { 1000, 16 } we do this, to avoid overflow issues */ +static const int bmp580_temp_coeffs[] = {125 ,13 };I'm not really sure what we gain here from using 125/13 instead of 250/14...but I don't think it hurts either.
Quoted 7 lines
Quoted 4 lines
I don't have a way to test this with the latest kernel release currently, but lgtm.
Acked-by Adam Rizkalla <[email protected]>Series applied. Thanks
Jonathan
Hi Jonathan,
Thank you very much!
Cheers,
Vasilis
PATCH v9 2/3 iio: pressure: bmp280: Add SCALE, RAW values in channels and refactorize them
In reply to Vasileios AmoiridisAdd extra IIO_CHAN_INFO_SCALE and IIO_CHAN_INFO_RAW channels in order to be able to calculate the processed value with standard userspace IIO tools. Can be used for triggered buffers as well.
Even though it is not a good design choice to have SCALE, RAW and PROCESSED together, the PROCESSED channel is kept for ABI compatibility.
While at it, separate BMPxxx and BMExxx device channels since BME supports also humidity measurements.
--- drivers/iio/pressure/bmp280-core.c | 96 ++++++++++++++++++++++++++---- 1 file changed, 83 insertions(+), 13 deletions(-)
drivers/iio/pressure/bmp280-core.c +83 -13
@@ -137,17 +137,45 @@ enum {static const struct iio_chan_spec bmp280_channels[] = { { .type =IIO_PRESSURE , +/* PROCESSED maintained for ABI backwards compatibility */ .info_mask_separate =BIT (IIO_CHAN_INFO_PROCESSED ) | +BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) |BIT (IIO_CHAN_INFO_OVERSAMPLING_RATIO ), }, { .type =IIO_TEMP , +/* PROCESSED maintained for ABI backwards compatibility */ .info_mask_separate =BIT (IIO_CHAN_INFO_PROCESSED ) | +BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) | +BIT (IIO_CHAN_INFO_OVERSAMPLING_RATIO ), + }, +}; + +static const struct iio_chan_spec bme280_channels[] = { + { + .type =IIO_PRESSURE , +/* PROCESSED maintained for ABI backwards compatibility */ + .info_mask_separate =BIT (IIO_CHAN_INFO_PROCESSED ) | +BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) | +BIT (IIO_CHAN_INFO_OVERSAMPLING_RATIO ), + }, + { + .type =IIO_TEMP , +/* PROCESSED maintained for ABI backwards compatibility */ + .info_mask_separate =BIT (IIO_CHAN_INFO_PROCESSED ) | +BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) |BIT (IIO_CHAN_INFO_OVERSAMPLING_RATIO ), }, { .type =IIO_HUMIDITYRELATIVE , +/* PROCESSED maintained for ABI backwards compatibility */ .info_mask_separate =BIT (IIO_CHAN_INFO_PROCESSED ) | +BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) |BIT (IIO_CHAN_INFO_OVERSAMPLING_RATIO ), }, };
@@ -155,21 +183,20 @@ static const struct iio_chan_spec bmp280_channels[] = {static const struct iio_chan_spec bmp380_channels[] = { { .type =IIO_PRESSURE , +/* PROCESSED maintained for ABI backwards compatibility */ .info_mask_separate =BIT (IIO_CHAN_INFO_PROCESSED ) | +BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) |BIT (IIO_CHAN_INFO_OVERSAMPLING_RATIO ), .info_mask_shared_by_all =BIT (IIO_CHAN_INFO_SAMP_FREQ ) |BIT (IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY ), }, { .type =IIO_TEMP , +/* PROCESSED maintained for ABI backwards compatibility */ .info_mask_separate =BIT (IIO_CHAN_INFO_PROCESSED ) | -BIT (IIO_CHAN_INFO_OVERSAMPLING_RATIO ), - .info_mask_shared_by_all =BIT (IIO_CHAN_INFO_SAMP_FREQ ) | -BIT (IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY ), - }, - { - .type =IIO_HUMIDITYRELATIVE , - .info_mask_separate =BIT (IIO_CHAN_INFO_PROCESSED ) | +BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) |BIT (IIO_CHAN_INFO_OVERSAMPLING_RATIO ), .info_mask_shared_by_all =BIT (IIO_CHAN_INFO_SAMP_FREQ ) |BIT (IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY ),
@@ -537,6 +564,49 @@ static int bmp280_read_raw_impl(struct iio_dev *indio_dev,default :return -EINVAL ; } +case IIO_CHAN_INFO_RAW : +switch (chan->type) { +case IIO_HUMIDITYRELATIVE : + ret = data->chip_info->read_humid (data, &chan_value); +if (ret) +return ret; + + *val = chan_value; +return IIO_VAL_INT ; +case IIO_PRESSURE : + ret = data->chip_info->read_press (data, &chan_value); +if (ret) +return ret; + + *val = chan_value; +return IIO_VAL_INT ; +case IIO_TEMP : + ret = data->chip_info->read_temp (data, &chan_value); +if (ret) +return ret; + + *val = chan_value; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +case IIO_CHAN_INFO_SCALE : +switch (chan->type) { +case IIO_HUMIDITYRELATIVE : + *val = data->chip_info->humid_coeffs[0 ]; + *val2 = data->chip_info->humid_coeffs[1 ]; +return data->chip_info->humid_coeffs_type; +case IIO_PRESSURE : + *val = data->chip_info->press_coeffs[0 ]; + *val2 = data->chip_info->press_coeffs[1 ]; +return data->chip_info->press_coeffs_type; +case IIO_TEMP : + *val = data->chip_info->temp_coeffs[0 ]; + *val2 = data->chip_info->temp_coeffs[1 ]; +return data->chip_info->temp_coeffs_type; +default : +return -EINVAL ; + }case IIO_CHAN_INFO_OVERSAMPLING_RATIO :switch (chan->type) {case IIO_HUMIDITYRELATIVE :
@@ -843,7 +913,7 @@ const struct bmp280_chip_info bmp280_chip_info = { .regmap_config = &bmp280_regmap_config, .start_up_time = 2000, .channels = bmp280_channels, - .num_channels = 2, + .num_channels = ARRAY_SIZE(bmp280_channels), .oversampling_temp_avail = bmp280_oversampling_avail, .num_oversampling_temp_avail = ARRAY_SIZE(bmp280_oversampling_avail),
@@ -903,8 +973,8 @@ const struct bmp280_chip_info bme280_chip_info = { .num_chip_id = ARRAY_SIZE(bme280_chip_ids), .regmap_config = &bmp280_regmap_config, .start_up_time = 2000, - .channels = bmp280_channels, - .num_channels = 3, + .channels = bme280_channels, + .num_channels = ARRAY_SIZE(bme280_channels), .oversampling_temp_avail = bmp280_oversampling_avail, .num_oversampling_temp_avail = ARRAY_SIZE(bmp280_oversampling_avail),
@@ -1328,7 +1398,7 @@ const struct bmp280_chip_info bmp380_chip_info = { .spi_read_extra_byte = true, .start_up_time = 2000, .channels = bmp380_channels, - .num_channels = 2, + .num_channels = ARRAY_SIZE(bmp380_channels), .oversampling_temp_avail = bmp380_oversampling_avail, .num_oversampling_temp_avail = ARRAY_SIZE(bmp380_oversampling_avail),
@@ -1859,7 +1929,7 @@ const struct bmp280_chip_info bmp580_chip_info = { .regmap_config = &bmp580_regmap_config, .start_up_time = 2000, .channels = bmp380_channels, - .num_channels = 2, + .num_channels = ARRAY_SIZE(bmp380_channels), .oversampling_temp_avail = bmp580_oversampling_avail, .num_oversampling_temp_avail = ARRAY_SIZE(bmp580_oversampling_avail),
@@ -2148,7 +2218,7 @@ const struct bmp280_chip_info bmp180_chip_info = { .regmap_config = &bmp180_regmap_config, .start_up_time = 2000, .channels = bmp280_channels, - .num_channels = 2, + .num_channels = ARRAY_SIZE(bmp280_channels), .oversampling_temp_avail = bmp180_oversampling_temp_avail, .num_oversampling_temp_avail =
Signature · 1 line
2.25.1
PATCH v9 3/3 iio: pressure: bmp280: Add triggered buffer support
In reply to Vasileios AmoiridisBMP2xx, BME280, BMP3xx, and BMP5xx use continuous buffers for their temperature, pressure and humidity readings. This facilitates the use of burst/bulk reads in order to acquire data faster. The approach is different from the one used in oneshot captures.
BMP085 & BMP1xx devices use a completely different measurement process that is well defined and is used in their buffer_handler().
--- drivers/iio/pressure/Kconfig | 2 + drivers/iio/pressure/bmp280-core.c | 393 ++++++++++++++++++++++++++++- drivers/iio/pressure/bmp280-spi.c | 8 +- drivers/iio/pressure/bmp280.h | 21 +- 4 files changed, 405 insertions(+), 19 deletions(-)
drivers/iio/pressure/Kconfig +2 -0
@@ -31,6 +31,8 @@ config BMP280 select REGMAP select BMP280_I2C if (I2C) select BMP280_SPI if (SPI_MASTER) + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER help Say yes here to build support for Bosch Sensortec BMP180, BMP280, BMP380 and BMP580 pressure and temperature sensors. Also supports the BME280 with
drivers/iio/pressure/bmp280-core.c +381 -12
613 lines not on this page · raw message
drivers/iio/pressure/bmp280-spi.c +2 -6
@@ -40,14 +40,10 @@ static int bmp380_regmap_spi_read(void *context, const void *reg, size_t reg_size, void *val, size_t val_size) { struct spi_device *spi = to_spi_device(context); -u8 rx_buf[4 ]; +u8 rx_buf[BME280_BURST_READ_BYTES +1 ];ssize_t status; -/* -* Maximum number of consecutive bytes read for a temperature or -* pressure measurement is 3. -*/ -if (val_size >3 ) +if (val_size >BME280_BURST_READ_BYTES )return -EINVAL ;/*
drivers/iio/pressure/bmp280.h +20 -1
@@ -304,6 +304,16 @@#define BMP280_PRESS_SKIPPED 0x80000#define BMP280_HUMIDITY_SKIPPED 0x8000 +/* Number of bytes for each value */ +#define BMP280_NUM_PRESS_BYTES 3 +#define BMP280_NUM_TEMP_BYTES 3 +#define BME280_NUM_HUMIDITY_BYTES 2 +#define BMP280_BURST_READ_BYTES (BMP280_NUM_PRESS_BYTES + \ + BMP280_NUM_TEMP_BYTES) +#define BME280_BURST_READ_BYTES (BMP280_NUM_PRESS_BYTES + \ + BMP280_NUM_TEMP_BYTES + \ + BME280_NUM_HUMIDITY_BYTES) +/* Core exported structs */ static const char *const bmp280_supply_names[] = {
@@ -397,13 +407,19 @@ struct bmp280_data {*/ int sampling_freq; +/* +* Data to push to userspace triggered buffer. Up to 3 channels and +* s64 timestamp, aligned. +*/ +s32 sensor_data[6 ]__aligned(8) ; +/* * DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ union {/* Sensor data buffer */ -u8 buf[3 ]; +u8 buf[BME280_BURST_READ_BYTES ];/* Calibration data buffers */ __le16 bmp280_cal_buf[BMP280_CONTIGUOUS_CALIB_REGS /2 ];__be16 bmp180_cal_buf[BMP180_REG_CALIB_COUNT /2 ];
@@ -425,6 +441,7 @@ struct bmp280_chip_info {const struct iio_chan_spec *channels;int num_channels;unsigned int start_up_time; +const unsigned long *avail_scan_masks;const int *oversampling_temp_avail;int num_oversampling_temp_avail;
@@ -459,6 +476,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); + +irqreturn_t (*trigger_handler)(int irq,void *p); };/* Chip infos for each variant */
Signature · 1 line
2.25.1
Jonathan Cameron
maintainerQuoted 8 lines · On Fri, 28 Jun 2024 19:17:23 +0200 Vasileios Amoiridis…
Changes in v9:
Patch 1/3:
- Inbmp580_temp_coeffs, instead of *1000/2^16, now we have *125/2^13 to avoid overflows, as it was proposed.
- Type casting to (s64) to temperature read in theread_raw_implfunction was removed as well as it is no longer needed.
Quoted 7 lines
Patch 3/3:
- Renamed "buffer_handler" to "trigger_handler" to keep consistency with the rest of the drivers.
- Added newiio_channel_specfor bmp580 in order to useIIO_LEandreal_bits= 24.
This seems fine to me now, but I'd like a final 'we didn't break anything' from Adam before i pick it up. Once bitten, twice shy and all that ;)
J
Quoted 15 lines
Vasileios Amoiridis (3):
iio: pressure: bmp280: Generalize read_*() functions
iio: pressure: bmp280: Add SCALE, RAW values in channels and
refactorize them
iio: pressure: bmp280: Add triggered buffer supportdrivers/iio/pressure/Kconfig | 2 + drivers/iio/pressure/bmp280-core.c | 643 +++++++++++++++++++++++++---- drivers/iio/pressure/bmp280-spi.c | 8 +- drivers/iio/pressure/bmp280.h | 34 +- 4 files changed, 589 insertions(+), 98 deletions(-)base-commit:
3341d69268accb5294b569ec37e55212a8a28ac5
Quoted 17 lines · Jonathan Cameron
Quoted 14 lines · On Fri, 28 Jun 2024 19:17:23 +0200 Vasileios Amoiridis…
Changes in v9:
Patch 1/3:
- Inbmp580_temp_coeffs, instead of *1000/2^16, now we have *125/2^13 to avoid overflows, as it was proposed.
- Type casting to (s64) to temperature read in theread_raw_implfunction was removed as well as it is no longer needed.Patch 3/3:
- Renamed "buffer_handler" to "trigger_handler" to keep consistency with the rest of the drivers.
- Added newiio_channel_specfor bmp580 in order to useIIO_LEandreal_bits= 24.
Quoted 7 lines
Quoted 1 line
This seems fine to me now, but I'd like a final 'we didn't break anything' from Adam before i pick it up. Once bitten, twice shy and all that ;)
J
Hi Jonathan,
Perfect! Let's see what Adam has to say as well.
Thanks for the very helpful reviews :)
Cheers,
Vasilis
Quoted 17 lines
Quoted 16 lines
Vasileios Amoiridis (3):
iio: pressure: bmp280: Generalize read_*() functions
iio: pressure: bmp280: Add SCALE, RAW values in channels and
refactorize them
iio: pressure: bmp280: Add triggered buffer supportdrivers/iio/pressure/Kconfig | 2 + drivers/iio/pressure/bmp280-core.c | 643 +++++++++++++++++++++++++---- drivers/iio/pressure/bmp280-spi.c | 8 +- drivers/iio/pressure/bmp280.h | 34 +- 4 files changed, 589 insertions(+), 98 deletions(-)base-commit:
3341d69268accb5294b569ec37e55212a8a28ac5
Jonathan Cameron
maintainerQuoted 23 lines · On Sun, 30 Jun 2024 22:27:54 +0200 Vasileios Amoiridis…
Quoted 22 lines · Jonathan Cameron
Quoted 8 lines · On Fri, 28 Jun 2024 19:17:23 +0200 Vasileios Amoiridis…
Changes in v9:
Patch 1/3:
- Inbmp580_temp_coeffs, instead of *1000/2^16, now we have *125/2^13 to avoid overflows, as it was proposed.
- Type casting to (s64) to temperature read in theread_raw_implfunction was removed as well as it is no longer needed.Quoted 7 lines
Patch 3/3:
- Renamed "buffer_handler" to "trigger_handler" to keep consistency with the rest of the drivers.
- Added newiio_channel_specfor bmp580 in order to useIIO_LEandreal_bits= 24.This seems fine to me now, but I'd like a final 'we didn't break anything' from Adam before i pick it up. Once bitten, twice shy and all that ;)
Quoted 8 lines
Quoted 2 lines
J
Hi Jonathan,
Perfect! Let's see what Adam has to say as well.
Thanks for the very helpful reviews :)
Adam, if you could take a look that would be great. There is no huge rush given the merge window opens tomorrow, so this is 6.12 material but none the less good to tick it off!
Jonathan
Quoted 20 lines
Cheers,
VasilisQuoted 17 lines
Quoted 16 lines
Vasileios Amoiridis (3):
iio: pressure: bmp280: Generalize read_*() functions
iio: pressure: bmp280: Add SCALE, RAW values in channels and
refactorize them
iio: pressure: bmp280: Add triggered buffer supportdrivers/iio/pressure/Kconfig | 2 + drivers/iio/pressure/bmp280-core.c | 643 +++++++++++++++++++++++++---- drivers/iio/pressure/bmp280-spi.c | 8 +- drivers/iio/pressure/bmp280.h | 34 +- 4 files changed, 589 insertions(+), 98 deletions(-)base-commit:
3341d69268accb5294b569ec37e55212a8a28ac5