From nobody Wed Dec 17 07:37:31 2025 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FDD618FC71; Mon, 17 Jun 2024 23:05:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718665550; cv=none; b=D11iwWxxHzQK6/s2ITIUf6F9HdD3GO3wVWYlYLsbQVxU/uY0DpNvSSs67hKBxKdSJhcVUCl7oxM4vI5dqjqJyC3REO5d5juBSBStXfmDXVzjn+bUvPDZvYskEtqgw+RqSGQ3u5hIqF63DCjg40rhpp53GTXIBR6ohgdkRocVkv8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718665550; c=relaxed/simple; bh=ZcTcPrLGMv+DueP87m4uQCYd9TI80cILtNqqa9Es/mY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Hidft2gc3MRNLyInvQVfdYijqfF4ElArkmQWckMcJdDSuIaiF9rP6uq5tqiTfFDFp95AluDkmVLtHp3p2CE7Yqv78OroXCuLs3YszehDOnlhc5R4bhYiKM70sUjGzsaaaOFjmMopucADAP7UOlw9WNvwrNr641kAnPiAZ6U61cQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nMEqUXGp; arc=none smtp.client-ip=209.85.208.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nMEqUXGp" Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-57c714a1e24so5454702a12.2; Mon, 17 Jun 2024 16:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718665546; x=1719270346; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=59+6O1xNtRxHoWFVEMCKCkrdrR4ezzV+ZUJtp4Aw8C8=; b=nMEqUXGpzgX7h1ZTVsF2l3Za37nHC18kmGSbVavIQ3rinaC8IkEYV5SuT+14kXVoCu nuyVcS5lX4617UJF+T0HsynhNDlJNFwmRwewkkf2lMSFp7qbMbcX6uy1L4bOiBTbtp6u ZM99yQWFJXhzvgsTmqLxJzqN+yjVlCJ1Tf5xFVMFQhcZcJcaLc6U034F7MNdnLS1ls7R eFidJXIp+cVmVissXQ358V+jZncAmR5UHyOETSDOOUjJUZzLlhOUGpDzBQMIPc/06Kqj pJZJm2tctI6xCO3nUS+Z2ogu2+Ea0TYRF9Qehbfu9XH4Nia/sCEnJHTqPu4dMrLJrR/5 KRtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718665546; x=1719270346; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=59+6O1xNtRxHoWFVEMCKCkrdrR4ezzV+ZUJtp4Aw8C8=; b=SNTUY5hjAe9cV1MNy3uCN4synS2oL/7EbuWR5GxwY0xsJM4YMCVgZQd5r/PpLp4dHz otNPXfBATDbnNOV2Bdn/LYtAiCPqVZOD+lVBx1z3QH3D9ts1KorVGDIfQ1uOczJayfQY 8mpknb5dXw8MnWLbodGaK1jNToATR9iLfaFKYjy85OcmS2Jl3oPg7FCX8DeSxD//FAzd HeJxvftGOUZO+xwlHd8jfDNBAqflOOYqJSbQLQSN2OSNL4BWMdaQnDCM0EwKoZmrrKNp 7TlH/dRfzsAjG7JPnw33QRu8hbhHzXP78YW26AyGd6gCj5bNThlD0cSjlXaK9ICZb3eD oFgQ== X-Forwarded-Encrypted: i=1; AJvYcCWAVmPTjib8QbDxBuewWmlpBKZ6hB2cuB7O2F/YDaR8PTZWwnq4jsipgRLVT6C4Y2pucAxVSxblM1pwmwN5Se4rwpMRbJCpfcZlbVHcH26S4KUigv3dy4czaoXt+9o4G5+iEjBHv6cZ X-Gm-Message-State: AOJu0Yz7wGNeVMNrMik8l4AfvyHxuT/oQkgG7NRLcDbDcK4L9KOcmxjD ZGrfsQUqbMU0sVWyRzs1UUfzeyjwheTzzowOHdK3ObQq4fTObu55 X-Google-Smtp-Source: AGHT+IGoA5ln08YPEw/62HMwkjREzwXN8FvcFK0id17KHjwMfqDijYCYWLh4s/uJ0Wk+TxOtSL/E/A== X-Received: by 2002:a50:cc9a:0:b0:578:72d4:e3b0 with SMTP id 4fb4d7f45d1cf-57cbd8e7139mr7005089a12.36.1718665545510; Mon, 17 Jun 2024 16:05:45 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:b152:a6ad:d6c8:f0e8]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57cb72cdff1sm7085559a12.3.2024.06.17.16.05.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 16:05:44 -0700 (PDT) From: Vasileios Amoiridis To: jic23@kernel.org, lars@metafoo.de Cc: andriy.shevchenko@linux.intel.com, ang.iglesiasg@gmail.com, mazziesaccount@gmail.com, ak@it-klinger.de, petre.rodan@subdimension.ro, phil@raspberrypi.com, 579lpy@gmail.com, linus.walleij@linaro.org, semen.protsenko@linaro.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Vasileios Amoiridis Subject: [PATCH v8 1/3] iio: pressure: bmp280: Generalize read_*() functions Date: Tue, 18 Jun 2024 01:05:38 +0200 Message-Id: <20240617230540.32325-2-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240617230540.32325-1-vassilisamir@gmail.com> References: <20240617230540.32325-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Vasileios Amoiridis --- drivers/iio/pressure/bmp280-core.c | 167 +++++++++++++++++------------ drivers/iio/pressure/bmp280.h | 13 ++- 2 files changed, 107 insertions(+), 73 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp2= 80-core.c index 50d71ad83f37..27c00af060fa 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -445,10 +445,8 @@ static u32 bmp280_compensate_press(struct bmp280_data = *data, return (u32)p; } =20 -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; =20 @@ -456,16 +454,15 @@ static int bmp280_read_temp(struct bmp280_data *data, if (ret) return ret; =20 - comp_temp =3D bmp280_compensate_temp(data, adc_temp); + *comp_temp =3D bmp280_compensate_temp(data, adc_temp); =20 - *val =3D comp_temp * 10; - return IIO_VAL_INT; + return 0; } =20 -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; =20 ret =3D bmp280_get_t_fine(data, &t_fine); @@ -476,17 +473,13 @@ static int bmp280_read_press(struct bmp280_data *data, if (ret) return ret; =20 - comp_press =3D bmp280_compensate_press(data, adc_press, t_fine); - - *val =3D comp_press; - *val2 =3D 256000; + *comp_press =3D bmp280_compensate_press(data, adc_press, t_fine); =20 - return IIO_VAL_FRACTIONAL; + return 0; } =20 -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; =20 - comp_humidity =3D bme280_compensate_humidity(data, adc_humidity, t_fine); - - *val =3D comp_humidity * 1000 / 1024; + *comp_humidity =3D bme280_compensate_humidity(data, adc_humidity, t_fine); =20 - return IIO_VAL_INT; + return 0; } =20 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_d= ev, int *val, int *val2, long mask) { struct bmp280_data *data =3D iio_priv(indio_dev); + int chan_value; + int ret; =20 guard(mutex)(&data->lock); =20 @@ -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 =3D data->chip_info->read_humid(data, &chan_value); + if (ret) + return ret; + + *val =3D data->chip_info->humid_coeffs[0] * chan_value; + *val2 =3D 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 =3D data->chip_info->read_press(data, &chan_value); + if (ret) + return ret; + + *val =3D data->chip_info->press_coeffs[0] * chan_value; + *val2 =3D 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 =3D data->chip_info->read_temp(data, &chan_value); + if (ret) + return ret; + + *val =3D data->chip_info->temp_coeffs[0] * (s64)chan_value; + *val2 =3D 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) =20 static const int bmp280_oversampling_avail[] =3D { 1, 2, 4, 8, 16 }; static const u8 bmp280_chip_ids[] =3D { BMP280_CHIP_ID }; +static const int bmp280_temp_coeffs[] =3D { 10, 1 }; +static const int bmp280_press_coeffs[] =3D { 1, 256000 }; =20 const struct bmp280_chip_info bmp280_chip_info =3D { .id_reg =3D BMP280_REG_ID, @@ -850,6 +863,11 @@ const struct bmp280_chip_info bmp280_chip_info =3D { .num_oversampling_press_avail =3D ARRAY_SIZE(bmp280_oversampling_avail), .oversampling_press_default =3D BMP280_OSRS_PRESS_16X - 1, =20 + .temp_coeffs =3D bmp280_temp_coeffs, + .temp_coeffs_type =3D IIO_VAL_FRACTIONAL, + .press_coeffs =3D bmp280_press_coeffs, + .press_coeffs_type =3D IIO_VAL_FRACTIONAL, + .chip_config =3D bmp280_chip_config, .read_temp =3D bmp280_read_temp, .read_press =3D bmp280_read_press, @@ -877,6 +895,7 @@ static int bme280_chip_config(struct bmp280_data *data) } =20 static const u8 bme280_chip_ids[] =3D { BME280_CHIP_ID }; +static const int bme280_humid_coeffs[] =3D { 1000, 1024 }; =20 const struct bmp280_chip_info bme280_chip_info =3D { .id_reg =3D BMP280_REG_ID, @@ -899,6 +918,13 @@ const struct bmp280_chip_info bme280_chip_info =3D { .num_oversampling_humid_avail =3D ARRAY_SIZE(bmp280_oversampling_avail), .oversampling_humid_default =3D BME280_OSRS_HUMIDITY_16X - 1, =20 + .temp_coeffs =3D bmp280_temp_coeffs, + .temp_coeffs_type =3D IIO_VAL_FRACTIONAL, + .press_coeffs =3D bmp280_press_coeffs, + .press_coeffs_type =3D IIO_VAL_FRACTIONAL, + .humid_coeffs =3D bme280_humid_coeffs, + .humid_coeffs_type =3D IIO_VAL_FRACTIONAL, + .chip_config =3D bme280_chip_config, .read_temp =3D bmp280_read_temp, .read_press =3D bmp280_read_press, @@ -1091,9 +1117,8 @@ static u32 bmp380_compensate_press(struct bmp280_data= *data, return comp_press; } =20 -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; =20 @@ -1101,15 +1126,14 @@ static int bmp380_read_temp(struct bmp280_data *dat= a, int *val, int *val2) if (ret) return ret; =20 - comp_temp =3D bmp380_compensate_temp(data, adc_temp); + *comp_temp =3D bmp380_compensate_temp(data, adc_temp); =20 - *val =3D comp_temp * 10; - return IIO_VAL_INT; + return 0; } =20 -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; =20 ret =3D bmp380_get_t_fine(data, &t_fine); @@ -1120,12 +1144,9 @@ static int bmp380_read_press(struct bmp280_data *dat= a, int *val, int *val2) if (ret) return ret; =20 - comp_press =3D bmp380_compensate_press(data, adc_press, t_fine); - - *val =3D comp_press; - *val2 =3D 100000; + *comp_press =3D bmp380_compensate_press(data, adc_press, t_fine); =20 - return IIO_VAL_FRACTIONAL; + return 0; } =20 static int bmp380_read_calib(struct bmp280_data *data) @@ -1296,6 +1317,8 @@ static int bmp380_chip_config(struct bmp280_data *dat= a) static const int bmp380_oversampling_avail[] =3D { 1, 2, 4, 8, 16, 32 }; static const int bmp380_iir_filter_coeffs_avail[] =3D { 1, 2, 4, 8, 16, 32= , 64, 128}; static const u8 bmp380_chip_ids[] =3D { BMP380_CHIP_ID, BMP390_CHIP_ID }; +static const int bmp380_temp_coeffs[] =3D { 10, 1 }; +static const int bmp380_press_coeffs[] =3D { 1, 100000 }; =20 const struct bmp280_chip_info bmp380_chip_info =3D { .id_reg =3D BMP380_REG_ID, @@ -1323,6 +1346,11 @@ const struct bmp280_chip_info bmp380_chip_info =3D { .num_iir_filter_coeffs_avail =3D ARRAY_SIZE(bmp380_iir_filter_coeffs_avai= l), .iir_filter_coeff_default =3D 2, =20 + .temp_coeffs =3D bmp380_temp_coeffs, + .temp_coeffs_type =3D IIO_VAL_FRACTIONAL, + .press_coeffs =3D bmp380_press_coeffs, + .press_coeffs_type =3D IIO_VAL_FRACTIONAL, + .chip_config =3D bmp380_chip_config, .read_temp =3D bmp380_read_temp, .read_press =3D bmp380_read_press, @@ -1443,9 +1471,9 @@ static int bmp580_nvm_operation(struct bmp280_data *d= ata, bool is_write) * for what is expected on IIO ABI. */ =20 -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; =20 ret =3D regmap_bulk_read(data->regmap, BMP580_REG_TEMP_XLSB, data->buf, @@ -1455,25 +1483,19 @@ static int bmp580_read_temp(struct bmp280_data *dat= a, int *val, int *val2) return ret; } =20 - raw_temp =3D get_unaligned_le24(data->buf); - if (raw_temp =3D=3D BMP580_TEMP_SKIPPED) { + value_temp =3D get_unaligned_le24(data->buf); + if (value_temp =3D=3D BMP580_TEMP_SKIPPED) { dev_err(data->dev, "reading temperature skipped\n"); return -EIO; } + *raw_temp =3D sign_extend32(value_temp, 23); =20 - /* - * 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 =3D sign_extend32(raw_temp, 23); - *val =3D ((s64)raw_temp * 1000) / (1 << 16); - return IIO_VAL_INT; + return 0; } =20 -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; =20 ret =3D regmap_bulk_read(data->regmap, BMP580_REG_PRESS_XLSB, data->buf, @@ -1483,18 +1505,14 @@ static int bmp580_read_press(struct bmp280_data *da= ta, int *val, int *val2) return ret; } =20 - raw_press =3D get_unaligned_le24(data->buf); - if (raw_press =3D=3D BMP580_PRESS_SKIPPED) { + value_press =3D get_unaligned_le24(data->buf); + if (value_press =3D=3D 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 =3D raw_press; - *val2 =3D 64000; /* 2^6 * 1000 */ - return IIO_VAL_FRACTIONAL; + *raw_press =3D value_press; + + return 0; } =20 static const int bmp580_odr_table[][2] =3D { @@ -1830,6 +1848,8 @@ static int bmp580_chip_config(struct bmp280_data *dat= a) =20 static const int bmp580_oversampling_avail[] =3D { 1, 2, 4, 8, 16, 32, 64,= 128 }; static const u8 bmp580_chip_ids[] =3D { BMP580_CHIP_ID, BMP580_CHIP_ID_ALT= }; +static const int bmp580_temp_coeffs[] =3D { 1000, 16 }; +static const int bmp580_press_coeffs[] =3D { 1, 64000}; =20 const struct bmp280_chip_info bmp580_chip_info =3D { .id_reg =3D BMP580_REG_CHIP_ID, @@ -1856,6 +1876,11 @@ const struct bmp280_chip_info bmp580_chip_info =3D { .num_iir_filter_coeffs_avail =3D ARRAY_SIZE(bmp380_iir_filter_coeffs_avai= l), .iir_filter_coeff_default =3D 2, =20 + .temp_coeffs =3D bmp580_temp_coeffs, + .temp_coeffs_type =3D IIO_VAL_FRACTIONAL_LOG2, + .press_coeffs =3D bmp580_press_coeffs, + .press_coeffs_type =3D IIO_VAL_FRACTIONAL, + .chip_config =3D bmp580_chip_config, .read_temp =3D bmp580_read_temp, .read_press =3D bmp580_read_press, @@ -2011,9 +2036,8 @@ static s32 bmp180_compensate_temp(struct bmp280_data = *data, u32 adc_temp) return (bmp180_calc_t_fine(data, adc_temp) + 8) / 16; } =20 -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; =20 @@ -2021,10 +2045,9 @@ static int bmp180_read_temp(struct bmp280_data *data= , int *val, int *val2) if (ret) return ret; =20 - comp_temp =3D bmp180_compensate_temp(data, adc_temp); + *comp_temp =3D bmp180_compensate_temp(data, adc_temp); =20 - *val =3D comp_temp * 100; - return IIO_VAL_INT; + return 0; } =20 static int bmp180_read_press_adc(struct bmp280_data *data, u32 *adc_press) @@ -2087,9 +2110,9 @@ static u32 bmp180_compensate_press(struct bmp280_data= *data, u32 adc_press, return p + ((x1 + x2 + 3791) >> 4); } =20 -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; =20 @@ -2101,12 +2124,9 @@ static int bmp180_read_press(struct bmp280_data *dat= a, int *val, int *val2) if (ret) return ret; =20 - comp_press =3D bmp180_compensate_press(data, adc_press, t_fine); - - *val =3D comp_press; - *val2 =3D 1000; + *comp_press =3D bmp180_compensate_press(data, adc_press, t_fine); =20 - return IIO_VAL_FRACTIONAL; + return 0; } =20 static int bmp180_chip_config(struct bmp280_data *data) @@ -2117,6 +2137,8 @@ static int bmp180_chip_config(struct bmp280_data *dat= a) static const int bmp180_oversampling_temp_avail[] =3D { 1 }; static const int bmp180_oversampling_press_avail[] =3D { 1, 2, 4, 8 }; static const u8 bmp180_chip_ids[] =3D { BMP180_CHIP_ID }; +static const int bmp180_temp_coeffs[] =3D { 100, 1 }; +static const int bmp180_press_coeffs[] =3D { 1, 1000 }; =20 const struct bmp280_chip_info bmp180_chip_info =3D { .id_reg =3D BMP280_REG_ID, @@ -2137,6 +2159,11 @@ const struct bmp280_chip_info bmp180_chip_info =3D { ARRAY_SIZE(bmp180_oversampling_press_avail), .oversampling_press_default =3D BMP180_MEAS_PRESS_8X, =20 + .temp_coeffs =3D bmp180_temp_coeffs, + .temp_coeffs_type =3D IIO_VAL_FRACTIONAL, + .press_coeffs =3D bmp180_press_coeffs, + .press_coeffs_type =3D IIO_VAL_FRACTIONAL, + .chip_config =3D bmp180_chip_config, .read_temp =3D bmp180_read_temp, .read_press =3D bmp180_read_press, diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h index 7c30e4d523be..a3d2cd722760 100644 --- a/drivers/iio/pressure/bmp280.h +++ b/drivers/iio/pressure/bmp280.h @@ -446,10 +446,17 @@ struct bmp280_chip_info { int num_sampling_freq_avail; int sampling_freq_default; =20 + 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); }; --=20 2.25.1