Re: [PATCH] iio: pressure: Fixes SPI support for BMP3xx devices

[Jonathan Cameron]

On Mon, 11 Mar 2024 01:54:32 +0100
Vasileios Amoiridis <vassilisamir@xxxxxxxxx> wrote:

> 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 regmap_bus to be used.
> 
> Fixes: a9dd9ba32311 ("iio: pressure: Fixes BMP38x and BMP390 SPI support")
> Signed-off-by: Vasileios Amoiridis <vassilisamir@xxxxxxxxx>
Other than switching to a bool as Andy suggested, this looks fine to me.

Jonathan

> ---
>  drivers/iio/pressure/bmp280-core.c | 1 +
>  drivers/iio/pressure/bmp280-spi.c  | 9 ++-------
>  drivers/iio/pressure/bmp280.h      | 1 +
>  3 files changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
> index fe8734468ed3..5ea9039caf75 100644
> --- a/drivers/iio/pressure/bmp280-core.c
> +++ b/drivers/iio/pressure/bmp280-core.c
> @@ -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 = 1,
>  	.start_up_time = 2000,
>  	.channels = bmp380_channels,
>  	.num_channels = 2,
> diff --git a/drivers/iio/pressure/bmp280-spi.c b/drivers/iio/pressure/bmp280-spi.c
> index a444d4b2978b..3a5fec5d47fd 100644
> --- a/drivers/iio/pressure/bmp280-spi.c
> +++ b/drivers/iio/pressure/bmp280-spi.c
> @@ -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,
> diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h
> index 4012387d7956..70bceaccf447 100644
> --- a/drivers/iio/pressure/bmp280.h
> +++ b/drivers/iio/pressure/bmp280.h
> @@ -423,6 +423,7 @@ struct bmp280_chip_info {
>  	int num_chip_id;
>  
>  	const struct regmap_config *regmap_config;
> +	int spi_read_extra_byte;
>  
>  	const struct iio_chan_spec *channels;
>  	int num_channels;