Commit 5ca29ea4 authored by Vasileios Amoiridis's avatar Vasileios Amoiridis Committed by Jonathan Cameron
Browse files

iio: pressure: Fixes SPI support for BMP3xx devices 



Bosch does not use unique BMPxxx_CHIP_ID for the different versions
of the device which leads to misidentification of devices if their
ID is used. Use a new value in the chip_info structure instead of
the BMPxxx_CHIP_ID, in order to choose the correct regmap_bus to
be used.

Fixes: a9dd9ba3 ("iio: pressure: Fixes BMP38x and BMP390 SPI support")
Signed-off-by: default avatarVasileios Amoiridis <vassilisamir@gmail.com>
Link: https://lore.kernel.org/r/20240316110743.1998400-3-vassilisamir@gmail.com


Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 546a4f4b

drivers/iio/pressure/bmp280-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1233,6 +1233,7 @@ const struct bmp280_chip_info bmp380_chip_info = { 
	.chip_id = bmp380_chip_ids,

	.num_chip_id = ARRAY_SIZE(bmp380_chip_ids),

	.regmap_config = &bmp380_regmap_config,

	.spi_read_extra_byte = true,

	.start_up_time = 2000,

	.channels = bmp380_channels,

	.num_channels = 2,

drivers/iio/pressure/bmp280-spi.c

+2 −7
Original line number Diff line number Diff line
@@ -96,15 +96,10 @@ static int bmp280_spi_probe(struct spi_device *spi) 


	chip_info = spi_get_device_match_data(spi);



	switch (chip_info->chip_id[0]) {

	case BMP380_CHIP_ID:

	case BMP390_CHIP_ID:

	if (chip_info->spi_read_extra_byte)

		bmp_regmap_bus = &bmp380_regmap_bus;

		break;

	default:

	else

		bmp_regmap_bus = &bmp280_regmap_bus;

		break;

	}



	regmap = devm_regmap_init(&spi->dev,

				  bmp_regmap_bus,

drivers/iio/pressure/bmp280.h

+1 −0
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ struct bmp280_chip_info { 
	int num_chip_id;



	const struct regmap_config *regmap_config;

	bool spi_read_extra_byte;



	const struct iio_chan_spec *channels;

	int num_channels;