Merge branch 'for-6.9/lenovo' into for-linus

[sfrench/cifs-2.6.git] / drivers / iio / pressure / bmp280.h

diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h
index 5c0563ce7572518bec64667b7c40f3f6e86d0cb4..4012387d79565631e9c8fdd0152f859c80eac485 100644 (file)
--- a/drivers/iio/pressure/bmp280.h
+++ b/drivers/iio/pressure/bmp280.h
@@ -292,6 +292,7 @@
 #define BMP580_CHIP_ID_ALT             0x51
 #define BMP180_CHIP_ID                 0x55
 #define BMP280_CHIP_ID                 0x58
+#define BMP390_CHIP_ID                 0x60
 #define BME280_CHIP_ID                 0x60
 #define BMP280_SOFT_RESET_VAL          0xB6
 
@@ -410,7 +411,7 @@ struct bmp280_data {
                __le16 bmp280_cal_buf[BMP280_CONTIGUOUS_CALIB_REGS / 2];
                __be16 bmp180_cal_buf[BMP180_REG_CALIB_COUNT / 2];
                u8 bmp380_cal_buf[BMP380_CALIB_REG_COUNT];
-               /* Miscellaneous, endianess-aware data buffers */
+               /* Miscellaneous, endianness-aware data buffers */
                __le16 le16;
                __be16 be16;
        } __aligned(IIO_DMA_MINALIGN);
@@ -418,7 +419,8 @@ struct bmp280_data {
 
 struct bmp280_chip_info {
        unsigned int id_reg;
-       const unsigned int chip_id;
+       const u8 *chip_id;
+       int num_chip_id;
 
        const struct regmap_config *regmap_config;