From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.178 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792949760; b=no8rIpWnxX4DAa2YRxMSkgDFvowppmfem5bD0CkjFmuOD/BJ3tiS533MoktkA47Haah8 4yPT/5+25/S3iew6zAsz+ZIbn1DctDtKSTDVNz0n+5dA8KcEqdH+AjSfdmQGvOJ8yTEC9 Agk3jrwsQxkYKT8BG4fEAolc07Vy1Mhvwq+aMnLJk8IUJXN8+attwuTxnfx7XI46Kr0mt NK6Bm18b9VWO84wZ/pSoNdYyctXANPtaPqKOU3z8BZCTTOFnzLUoBQFIu6rOdQtQGlpB5 tNBX9womZEsX5kCWCHLhXPL62an4jRg5FEG9iaOrR+yYxrxMdVRk91TtVdxXz60XNhA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792949760; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-Id:X-Mailer:MIME-Version:Content-Transfer-Encoding; bh=tKLQKvsimDDDuLYKKuKDJqLjquQrqqUC14jGSjgst9s=; b=lvA4KGz1pKulQyIF3kSojelgHCRo5NTDjrMBnJUWaWU5oubaua9skTHwlsIqAgZ36Hwp j7W4dn4a9pgHELfIH3IXwunyL9iGs6de1opYU/tn4ggCQH3QpaJPHNw1WPMJYi7mJtTF/ F7XBOjBYRf2W89C5+eDWR2SH201uc5AHq2hazb9oLCJbgG7UjkVc9UB3wxKdeT8x8eUR8 uFvF40UzGbqfs2CLvmYM7PUM3WdepPm4n+x1gCO7DMdb9H8DaUfXAYV/iQbmdIxmBnN08 danSPAh/PFXIPPIumd2ow7rT3R4HgkSJqqQTgfQm/ewY+Bqd7FrpgGS/XOppfcNmM6A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=rZqacP1h; arc=none smtp.remote-ip=74.125.82.178 Received: from mail-dy1-f178.google.com (mail-dy1-f178.google.com [74.125.82.178]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF1E6606A31A for ; Sun, 25 Oct 2026 17:35:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org EF1E6606A31A 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, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=rZqacP1h Received: by mail-dy1-f178.google.com with SMTP id 5a478bee46e88-35d0be18c71so3975077eec.1 for ; Sun, 25 Oct 2026 10:35:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792949759; x=1793554559; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=tKLQKvsimDDDuLYKKuKDJqLjquQrqqUC14jGSjgst9s=; b=rZqacP1h3pRLDurrpI2QEWtdqyQ9Sy1Au9XDAMC8IGsZOKtScAonRChhMdkqKYfbk/ oGlfp3NCJ3xR/dST7swJU7jKTzxViD1DZErxHDZISSmROxqPJEIhuklQsAA0OH8jfcAF SjJACs8jn1zxbI+sRlQQEnMuJcLwRzYy7Wbb85CIT/RnJaM0qMV1j6535RTyMZAvxC5O 8zIDqe3cUylBddaFY0VZQXmxphwT5DQnNuBsf+dcPvFuzU6xGJ6DaWNrG4HZYCGC0teY OkLHOGsrYQIImpMFymZ3H5CFleVc6FLa36NhIEOT8mzfuAZ1XwEsJO+LXXfy3Gf1y8MS 5nxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792949759; x=1793554559; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=tKLQKvsimDDDuLYKKuKDJqLjquQrqqUC14jGSjgst9s=; b=mrdTa8TgIE/NiaM/FqeGLH+jmPihy39opa4S0sC/zBFmQpwCOCsP/jE2BD59a9UJV3 f7mN9avBd2TGxiQv8EB+U96JC6HA8l8nd3T4QUH++GyVhtBj0OpCt12kikM2ZMvGZuG5 AlahVd0y0eTAuIzdEZhLYwD+5d3ppHiHoYC1lVqGZwBq0lnYHlwJBYSyl9Jrei6ghjhM S13ktE953AEm6l8UEU6PMCKNZYHwHSQ7KUfVogQcMU7uOViKU81Boqh3xOxwjHlIeLb4 Gi3LJysOrRmXKN/PpCw61RiRz9BzqjhsoOv7osnL2kX3CIPL+oA7EVjEU5Yv/R+XRdTJ bgGQ== X-Gm-Message-State: AFq9FYLwkuIPIAPd/LLFKYJuiPjAXPPTKnP2qVZDFrD3pInbY2dzt95h IEZa/C5rCUb6iuvK2o+UKFwSfDt0aY6sFEUaz7W7uhiIDM9FabreTm4= X-Gm-Gg: AYBFou326dsMVb3xdCrH2cJXRnDIUA8+pfxyHi6seM7x8rM4rIJV8rZlX/Bpf4Eqfwq tNgjCoBrI778MQ/Nnlshayr49xdNRSu21e3qLBn1eZENujdC0QHf3yIgLX+U9aZ/J1Yy0Lvahkn tv1zoaYEsftz1b2loTHjC98/oaFrPc+440/PFlmVnbYYbScdwxjZI/h2LVKAHHoEP3xsic5ed0S FLvqtYJBfcZJa9ErmYbf2/GNWC3b9ap6no4Ix2Qv81uL1owkhzpk/pMKMNVfTXw8PxjPWwsVkY0 a8ESvrCeJnKivWVJuJ7gmkLO5ydwdagWdn/9kA2hIkYOQKlnNmlVyEfuadupC6aZInoW6eUH06i OhpqBxqERCPW/10u1/6FYPmeEbGtnIRQpJX2Enq4wkUGYobeh8i7PuXDg2D7ZjJ5UlM97b0mkM7 KplkdZgUQTxnt4kmL6NDGy/Ldih58kXYshq4HF8JXIO6PR1Y4xDkG7nOYVVQ6IHt3AtNKr/82tv Jn3pxt53KQmm/ZGf29KTfuotRpvkfEFI64tV2UZoIygSSTc7zRz5TjXF8UI8D7c8k60p19RCAvp Vou+XxeVojK2zGf0O94= X-Received: by 2002:a05:7022:eb57:10b0:181:8948:f022 with SMTP id a92af1059eb24-1994fa65429mr7020163c88.21.1792949758947; Sun, 25 Oct 2026 10:35:58 -0700 (PDT) Received: from localhost.localdomain ([45.127.46.6]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-198a0e8d700sm20990930c88.10.2026.10.25.10.35.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Oct 2026 10:35:58 -0700 (PDT) From: Nikhil Gautam To: linux-iio@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jic23@kernel.org, dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, Nikhil Gautam Subject: [PATCH v3] iio: chemical: ccs811: Make sampling frequency configurable Date: Sun, 25 Oct 2026 23:05:45 +0530 Message-Id: <20261025173545.6892-1-nikhilgtr@gmail.com> X-Mailer: git-send-email 2.39.5 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Allow userspace to configure the CCS811 IAQ measurement rate through the IIO sampling_frequency attribute. Support the three IAQ measurement modes with sampling frequencies of 1 Hz, 0.1 Hz, and approximately 0.016667 Hz, corresponding to measurement intervals of 1, 10, and 60 seconds. Preserve unrelated bits in the MEAS_MODE register when updating the drive mode, and cache the selected mode after a successful register write. Expose the supported frequencies through sampling_frequency_available. Signed-off-by: Nikhil Gautam Changes in v3: - Reuse the sampling frequency array instead of duplicating frequency values. - Separate register updates from locking and wakeup handling. - Use a separate variable for the updated MEAS_MODE register value. - Simplify the sampling frequency getter. - Mark the completed drive-mode configuration TODO as done. Changes in v2: - Fix the Clang build error caused by guard() in the switch statement. --- drivers/iio/chemical/ccs811.c | 148 ++++++++++++++++++++++++++++++++-- 1 file changed, 142 insertions(+), 6 deletions(-) diff --git a/drivers/iio/chemical/ccs811.c b/drivers/iio/chemical/ccs811.c index d126ee12ffe5..c48ac37b32be 100644 --- a/drivers/iio/chemical/ccs811.c +++ b/drivers/iio/chemical/ccs811.c @@ -9,7 +9,7 @@ * IIO driver for AMS CCS811 (I2C address 0x5A/0x5B set by ADDR Low/High) * * TODO: - * 1. Make the drive mode selectable form userspace + * 1. DONE. Was: "Make the drive mode selectable form userspace" * 2. Add support for interrupts * 3. Adjust time to wait for data to be ready based on selected operation mode * 4. Read error register and put the information in logs @@ -54,6 +54,7 @@ #define CCS811_STATUS_FW_MODE_APPLICATION BIT(7) /* Measurement modes */ +#define CCS811_MODE_MASK GENMASK(6, 4) #define CCS811_MODE_IDLE 0x00 #define CCS811_MODE_IAQ_1SEC 0x10 #define CCS811_MODE_IAQ_10SEC 0x20 @@ -79,6 +80,7 @@ struct ccs811_data { struct iio_trigger *drdy_trig; struct gpio_desc *wakeup_gpio; bool drdy_trig_on; + u8 drive_mode; /* Ensures correct alignment of timestamp if present */ struct { s16 channels[2]; @@ -86,6 +88,12 @@ struct ccs811_data { } scan; }; +static const int ccs811_samp_freq[] = { + 1, 0, + 0, 100000, + 0, 16667, +}; + static const struct iio_chan_spec ccs811_channels[] = { { .type = IIO_CURRENT, @@ -103,6 +111,8 @@ static const struct iio_chan_spec ccs811_channels[] = { .modified = 1, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SAMP_FREQ), + .info_mask_shared_by_type_available = BIT(IIO_CHAN_INFO_SAMP_FREQ), .scan_index = 0, .scan_type = { .sign = 'u', @@ -163,16 +173,21 @@ static int ccs811_start_sensor_application(struct i2c_client *client) return 0; } -static int ccs811_setup(struct i2c_client *client) +static int ccs811_setup(struct ccs811_data *data) { int ret; - ret = ccs811_start_sensor_application(client); + ret = ccs811_start_sensor_application(data->client); + if (ret < 0) + return ret; + + ret = i2c_smbus_write_byte_data(data->client, CCS811_MEAS_MODE, + CCS811_MODE_IAQ_1SEC); if (ret < 0) return ret; - return i2c_smbus_write_byte_data(client, CCS811_MEAS_MODE, - CCS811_MODE_IAQ_1SEC); + data->drive_mode = CCS811_MODE_IAQ_1SEC; + return 0; } static void ccs811_set_wakeup(struct ccs811_data *data, bool enable) @@ -188,6 +203,52 @@ static void ccs811_set_wakeup(struct ccs811_data *data, bool enable) usleep_range(20, 30); } +static int ccs811_update_sampling_freq(struct ccs811_data *data, + int val, int val2) +{ + u8 drive_mode; + u8 mode; + int ret; + + if (val == ccs811_samp_freq[0] && val2 == ccs811_samp_freq[1]) + drive_mode = CCS811_MODE_IAQ_1SEC; + else if (val == ccs811_samp_freq[2] && val2 == ccs811_samp_freq[3]) + drive_mode = CCS811_MODE_IAQ_10SEC; + else if (val == ccs811_samp_freq[4] && val2 == ccs811_samp_freq[5]) + drive_mode = CCS811_MODE_IAQ_60SEC; + else + return -EINVAL; + + ret = i2c_smbus_read_byte_data(data->client, CCS811_MEAS_MODE); + if (ret < 0) + return ret; + + mode = (ret & ~CCS811_MODE_MASK) | drive_mode; + + ret = i2c_smbus_write_byte_data(data->client, CCS811_MEAS_MODE, + mode); + if (ret < 0) + return ret; + + data->drive_mode = drive_mode; + + return 0; +} + +static int ccs811_set_sampling_freq(struct ccs811_data *data, + int val, int val2) +{ + int ret; + + guard(mutex)(&data->lock); + + ccs811_set_wakeup(data, true); + ret = ccs811_update_sampling_freq(data, val, val2); + ccs811_set_wakeup(data, false); + + return ret; +} + static int ccs811_get_measurement(struct ccs811_data *data) { int ret, tries = 11; @@ -215,6 +276,29 @@ static int ccs811_get_measurement(struct ccs811_data *data) return ret; } +static int ccs811_get_sampling_freq(struct ccs811_data *data, + int *val, int *val2) +{ + guard(mutex)(&data->lock); + + switch (data->drive_mode) { + case CCS811_MODE_IAQ_1SEC: + *val = ccs811_samp_freq[0]; + *val2 = ccs811_samp_freq[1]; + return IIO_VAL_INT_PLUS_MICRO; + case CCS811_MODE_IAQ_10SEC: + *val = ccs811_samp_freq[2]; + *val2 = ccs811_samp_freq[3]; + return IIO_VAL_INT_PLUS_MICRO; + case CCS811_MODE_IAQ_60SEC: + *val = ccs811_samp_freq[4]; + *val2 = ccs811_samp_freq[5]; + return IIO_VAL_INT_PLUS_MICRO; + default: + return -EINVAL; + } +} + static int ccs811_read_info_raw(struct ccs811_data *data, struct iio_chan_spec const *chan, int *val, int mask) @@ -249,6 +333,28 @@ static int ccs811_read_info_raw(struct ccs811_data *data, } } +static int ccs811_write_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int val, int val2, long mask) +{ + struct ccs811_data *data = iio_priv(indio_dev); + int ret; + + switch (mask) { + case IIO_CHAN_INFO_SAMP_FREQ: + if (!iio_device_claim_direct(indio_dev)) + return -EBUSY; + + ret = ccs811_set_sampling_freq(data, val, val2); + + iio_device_release_direct(indio_dev); + return ret; + + default: + return -EINVAL; + } +} + static int ccs811_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val, int *val2, long mask) @@ -293,13 +399,43 @@ static int ccs811_read_raw(struct iio_dev *indio_dev, default: return -EINVAL; } + case IIO_CHAN_INFO_SAMP_FREQ: + return ccs811_get_sampling_freq(data, val, val2); default: return -EINVAL; } } +static int ccs811_read_avail(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + const int **vals, int *type, int *length, + long mask) +{ + if (mask != IIO_CHAN_INFO_SAMP_FREQ) + return -EINVAL; + + *vals = ccs811_samp_freq; + *type = IIO_VAL_INT_PLUS_MICRO; + *length = ARRAY_SIZE(ccs811_samp_freq); + + return IIO_AVAIL_LIST; +} + +static int ccs811_write_raw_get_fmt(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + long mask) +{ + if (mask == IIO_CHAN_INFO_SAMP_FREQ) + return IIO_VAL_INT_PLUS_MICRO; + + return -EINVAL; +} + static const struct iio_info ccs811_info = { .read_raw = ccs811_read_raw, + .write_raw = ccs811_write_raw, + .read_avail = ccs811_read_avail, + .write_raw_get_fmt = ccs811_write_raw_get_fmt, }; static int ccs811_set_trigger_state(struct iio_trigger *trig, @@ -460,7 +596,7 @@ static int ccs811_probe(struct i2c_client *client) return -ENODEV; } - ret = ccs811_setup(client); + ret = ccs811_setup(data); if (ret < 0) { ccs811_set_wakeup(data, false); return ret; -- 2.39.5