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

iio: pressure: bmp280: Fix waiting time for BMP3xx configuration 

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

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



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

[ Upstream commit 262a6634bcc4f0c1c53d13aa89882909f281a6aa ]

According to the datasheet, both pressure and temperature can go up to
oversampling x32. With this option, the maximum measurement time is not
80ms (this is for press x32 and temp x2), but it is 130ms nominal
(calculated from table 3.9.2) and since most of the maximum values
are around +15%, it is configured to 150ms.

Fixes: 8d329309 ("iio: pressure: bmp280: Add support for BMP380 sensor family")
Signed-off-by: default avatarVasileios Amoiridis <vassilisamir@gmail.com>
Link: https://patch.msgid.link/20240711211558.106327-3-vassilisamir@gmail.com


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

drivers/iio/pressure/bmp280-core.c

+4 −3
Original line number Diff line number Diff line
@@ -1203,10 +1203,11 @@ static int bmp380_chip_config(struct bmp280_data *data) 
		}

		/*

		 * Waits for measurement before checking configuration error

		 * flag. Selected longest measure time indicated in

		 * section 3.9.1 in the datasheet.

		 * flag. Selected longest measurement time, calculated from

		 * formula in datasheet section 3.9.2 with an offset of ~+15%

		 * as it seen as well in table 3.9.1.

		 */

		msleep(80);

		msleep(150);



		/* Check config error flag */

		ret = regmap_read(data->regmap, BMP380_REG_ERROR, &tmp);