From: vamoirid <vassilisamir@gmail.com>
To: jic23@kernel.org, lars@metafoo.de, robh@kernel.org,
krzk+dt@kernel.org, conor+dt@kernel.org
Cc: vassilisamir@gmail.com, anshulusr@gmail.com,
gustavograzs@gmail.com, andriy.shevchenko@linux.intel.com,
linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v1 13/13] iio: chemical: bme680: Add support for preheat current
Date: Thu, 10 Oct 2024 23:00:30 +0200 [thread overview]
Message-ID: <20241010210030.33309-14-vassilisamir@gmail.com> (raw)
In-Reply-To: <20241010210030.33309-1-vassilisamir@gmail.com>
From: Vasileios Amoiridis <vassilisamir@gmail.com>
Add functionality to inject a specified amount of current to the heating
plate before the start of the gas measurement to allow the sensor to reach
faster to the requested temperature.
Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
---
drivers/iio/chemical/bme680.h | 1 +
drivers/iio/chemical/bme680_core.c | 38 ++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/drivers/iio/chemical/bme680.h b/drivers/iio/chemical/bme680.h
index e7eed2962baa..c658cb631b52 100644
--- a/drivers/iio/chemical/bme680.h
+++ b/drivers/iio/chemical/bme680.h
@@ -42,6 +42,7 @@
#define BME680_RHRANGE_MASK GENMASK(5, 4)
#define BME680_REG_RES_HEAT_VAL 0x00
#define BME680_RSERROR_MASK GENMASK(7, 4)
+#define BME680_REG_IDAC_HEAT_0 0x50
#define BME680_REG_RES_HEAT_0 0x5A
#define BME680_REG_GAS_WAIT_0 0x64
#define BME680_ADC_GAS_RES GENMASK(15, 6)
diff --git a/drivers/iio/chemical/bme680_core.c b/drivers/iio/chemical/bme680_core.c
index df6ae4355902..6cdf8b9dbf2b 100644
--- a/drivers/iio/chemical/bme680_core.c
+++ b/drivers/iio/chemical/bme680_core.c
@@ -126,6 +126,7 @@ struct bme680_data {
u8 oversampling_temp;
u8 oversampling_press;
u8 oversampling_humid;
+ u8 preheat_curr;
u16 heater_dur;
u16 heater_temp;
@@ -223,6 +224,12 @@ static const struct iio_chan_spec bme680_channels[] = {
},
},
IIO_CHAN_SOFT_TIMESTAMP(4),
+ {
+ .type = IIO_CURRENT,
+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+ .output = 1,
+ .scan_index = 5,
+ },
};
static int bme680_read_calib(struct bme680_data *data,
@@ -569,6 +576,12 @@ static u8 bme680_calc_heater_dur(u16 dur)
return durval;
}
+/* Taken from datasheet, section 5.3.3 */
+static u8 bme680_calc_heater_preheat_current(u8 curr)
+{
+ return 8 * curr - 1;
+}
+
static int bme680_set_mode(struct bme680_data *data, enum bme680_op_mode mode)
{
struct device *dev = regmap_get_device(data->regmap);
@@ -673,6 +686,19 @@ static int bme680_chip_config(struct bme680_data *data)
return 0;
}
+static int bme680_preheat_curr_config(struct bme680_data *data, u8 val)
+{
+ u8 heatr_curr;
+ int ret;
+
+ heatr_curr = bme680_calc_heater_preheat_current(val);
+ ret = regmap_write(data->regmap, BME680_REG_IDAC_HEAT_0, heatr_curr);
+ if (ret < 0)
+ dev_err(data->dev, "failed to write idac_heat_0 register\n");
+
+ return ret;
+}
+
static int bme680_gas_config(struct bme680_data *data)
{
struct device *dev = regmap_get_device(data->regmap);
@@ -701,6 +727,10 @@ static int bme680_gas_config(struct bme680_data *data)
return ret;
}
+ ret = bme680_preheat_curr_config(data, data->preheat_curr);
+ if (ret)
+ return ret;
+
/* Enable the gas sensor and select heater profile set-point 0 */
ret = regmap_update_bits(data->regmap, BME680_REG_CTRL_GAS_1,
BME680_RUN_GAS_MASK | BME680_NB_CONV_MASK,
@@ -967,6 +997,13 @@ static int __bme680_write_raw(struct iio_dev *indio_dev,
return bme680_chip_config(data);
}
+ case IIO_CHAN_INFO_RAW:
+ {
+ if (chan->type != IIO_CURRENT)
+ return -EINVAL;
+
+ return bme680_preheat_curr_config(data, (u8)val);
+ }
default:
return -EINVAL;
}
@@ -1199,6 +1236,7 @@ int bme680_core_probe(struct device *dev, struct regmap *regmap,
data->oversampling_temp = 8; /* 8X oversampling rate */
data->heater_temp = 320; /* degree Celsius */
data->heater_dur = 150; /* milliseconds */
+ data->preheat_curr = 0; /* milliamps */
regulator_bulk_set_supply_names(data->supplies, bme680_supply_names,
BME680_NUM_SUPPLIES);
--
2.43.0
next prev parent reply other threads:[~2024-10-10 21:00 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-10 21:00 [PATCH v1 00/13]: chemical: bme680: 2nd set of clean and add vamoirid
2024-10-10 21:00 ` [PATCH v1 01/13] iio: chemical: bme680: Fix indentation and unnecessary spaces vamoirid
2024-10-11 9:55 ` Andy Shevchenko
2024-10-11 18:45 ` Vasileios Aoiridis
2024-10-10 21:00 ` [PATCH v1 02/13] iio: chemical: bme680: avoid using camel case vamoirid
2024-10-11 10:00 ` Andy Shevchenko
2024-10-11 18:50 ` Vasileios Aoiridis
2024-10-12 20:34 ` Andy Shevchenko
2024-10-10 21:00 ` [PATCH v1 03/13] iio: chemical: bme680: fix startup time vamoirid
2024-10-11 10:00 ` Andy Shevchenko
2024-10-11 18:51 ` Vasileios Aoiridis
2024-10-12 11:45 ` Jonathan Cameron
2024-10-12 20:36 ` Andy Shevchenko
2024-10-10 21:00 ` [PATCH v1 04/13] iio: chemical: bme680: move to fsleep() vamoirid
2024-10-10 21:00 ` [PATCH v1 05/13] iio: chemical: bme680: refactorize set_mode() mode vamoirid
2024-10-11 10:02 ` Andy Shevchenko
2024-10-11 18:53 ` Vasileios Aoiridis
2024-10-12 11:48 ` Jonathan Cameron
2024-10-10 21:00 ` [PATCH v1 06/13] dt-bindings: iio: add binding for BME680 driver vamoirid
2024-10-11 3:11 ` Rob Herring (Arm)
2024-10-11 6:51 ` Krzysztof Kozlowski
2024-10-11 18:44 ` Vasileios Aoiridis
2024-10-12 11:49 ` Jonathan Cameron
2024-10-10 21:00 ` [PATCH v1 07/13] iio: chemical: bme680: add regulators vamoirid
2024-10-11 10:05 ` Andy Shevchenko
2024-10-11 18:55 ` Vasileios Aoiridis
2024-10-12 11:53 ` Jonathan Cameron
2024-10-10 21:00 ` [PATCH v1 08/13] iio: chemical: bme680: add power management vamoirid
2024-10-11 10:10 ` Andy Shevchenko
2024-10-11 19:02 ` Vasileios Aoiridis
2024-10-12 11:58 ` Jonathan Cameron
2024-10-12 20:40 ` Andy Shevchenko
2024-10-10 21:00 ` [PATCH v1 09/13] iio: chemical: bme680: Move ambient temperature to attributes vamoirid
2024-10-11 10:12 ` Andy Shevchenko
2024-10-11 19:03 ` Vasileios Aoiridis
2024-10-12 12:01 ` Jonathan Cameron
2024-10-14 20:14 ` Vasileios Amoiridis
2024-10-19 13:59 ` Jonathan Cameron
2024-10-19 17:51 ` Vasileios Amoiridis
2024-10-19 17:58 ` Vasileios Amoiridis
2024-10-10 21:00 ` [PATCH v1 10/13] iio: chemical: bme680: generalize read_*() functions vamoirid
2024-10-10 21:00 ` [PATCH v1 11/13] iio: chemical: bme680: Add SCALE and RAW channels vamoirid
2024-10-10 21:00 ` [PATCH v1 12/13] iio: chemical: bme680: Add triggered buffer support vamoirid
2024-10-11 10:37 ` Andy Shevchenko
2024-10-11 19:07 ` Vasileios Aoiridis
2024-10-12 12:04 ` Jonathan Cameron
2024-10-12 12:09 ` Jonathan Cameron
2024-10-10 21:00 ` vamoirid [this message]
2024-10-11 10:39 ` [PATCH v1 13/13] iio: chemical: bme680: Add support for preheat current Andy Shevchenko
2024-10-11 19:08 ` Vasileios Aoiridis
2024-10-12 20:47 ` Andy Shevchenko
2024-10-12 12:36 ` Jonathan Cameron
2024-10-11 10:42 ` [PATCH v1 00/13]: chemical: bme680: 2nd set of clean and add Andy Shevchenko
2024-10-11 18:39 ` Vasileios Aoiridis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241010210030.33309-14-vassilisamir@gmail.com \
--to=vassilisamir@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=anshulusr@gmail.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gustavograzs@gmail.com \
--cc=jic23@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).