From: Aren Moynihan <aren@peacevolution.org>
To: Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>
Cc: "Aren Moynihan" <aren@peacevolution.org>,
"Kaustabh Chakraborty" <kauschluss@disroot.org>,
"Barnabás Czémán" <trabarni@gmail.com>,
"Julien Stephan" <jstephan@baylibre.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, "Ondrej Jirman" <megi@xff.cz>,
"Dragan Simic" <dsimic@manjaro.org>,
phone-devel@vger.kernel.org
Subject: [PATCH v5 3/8] iio: light: stk3310: implement vdd and leda supplies
Date: Sat, 8 Feb 2025 16:13:21 -0500 [thread overview]
Message-ID: <20250208211325.992280-5-aren@peacevolution.org> (raw)
In-Reply-To: <20250208211325.992280-2-aren@peacevolution.org>
The vdd and leda supplies must be powered on for the chip to function
and can be powered off during system suspend.
This is originally based on a patch by Ondrej Jirman, but has been
rewritten since.
Link: https://codeberg.org/megi/linux/commit/a933aff8b7a0e6e3c9cf1d832dcba07022bbfa82
Signed-off-by: Aren Moynihan <aren@peacevolution.org>
---
Notes:
Changes in v5:
- explicitely include array_size.h
Changes in v4:
- fix variable declaration order in stk3310_resume to match the rest of
the driver
Changes in v3:
- use bulk regulators instead of two individual ones
- handle cleanup using devm callbacks instead of the remove function
Changes in v2:
- always enable / disable regulators and rely on a dummy regulator if
one isn't specified
- replace usleep_range with fsleep
- reorder includes so iio headers are last
- add missing error handling to resume
drivers/iio/light/stk3310.c | 76 ++++++++++++++++++++++++++++++++++++-
1 file changed, 74 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
index 73ea36fa3acec..9c38ff01fdf0f 100644
--- a/drivers/iio/light/stk3310.c
+++ b/drivers/iio/light/stk3310.c
@@ -7,12 +7,15 @@
* IIO driver for STK3310/STK3311. 7-bit I2C address: 0x48.
*/
+#include <linux/array_size.h>
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+
#include <linux/iio/events.h>
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
@@ -130,6 +133,7 @@ struct stk3310_data {
struct regmap_field *reg_int_ps;
struct regmap_field *reg_flag_psint;
struct regmap_field *reg_flag_nf;
+ struct regulator_bulk_data supplies[2];
};
static const struct iio_event_spec stk3310_events[] = {
@@ -618,6 +622,31 @@ static irqreturn_t stk3310_irq_event_handler(int irq, void *private)
return IRQ_HANDLED;
}
+static int stk3310_regulators_enable(struct stk3310_data *data)
+{
+ int ret;
+
+ ret = regulator_bulk_enable(ARRAY_SIZE(data->supplies), data->supplies);
+ if (ret)
+ return ret;
+
+ /* we need a short delay to allow the chip time to power on */
+ fsleep(1000);
+
+ return 0;
+}
+
+static void stk3310_regulators_disable(void *private)
+{
+ int ret;
+ struct stk3310_data *data = private;
+ struct device *dev = &data->client->dev;
+
+ ret = regulator_bulk_disable(ARRAY_SIZE(data->supplies), data->supplies);
+ if (ret)
+ dev_err(dev, "failed to disable regulators: %d\n", ret);
+}
+
static int stk3310_probe(struct i2c_client *client)
{
int ret;
@@ -642,6 +671,13 @@ static int stk3310_probe(struct i2c_client *client)
if (ret)
return ret;
+ data->supplies[0].supply = "vdd";
+ data->supplies[1].supply = "leda";
+ ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(data->supplies),
+ data->supplies);
+ if (ret)
+ return dev_err_probe(dev, ret, "get regulators failed\n");
+
ret = stk3310_regmap_init(data);
if (ret < 0)
return ret;
@@ -652,6 +688,15 @@ static int stk3310_probe(struct i2c_client *client)
indio_dev->channels = stk3310_channels;
indio_dev->num_channels = ARRAY_SIZE(stk3310_channels);
+ ret = stk3310_regulators_enable(data);
+ if (ret)
+ return dev_err_probe(dev, ret, "regulator enable failed\n");
+
+ ret = devm_add_action_or_reset(dev, stk3310_regulators_disable, data);
+ if (ret)
+ return dev_err_probe(dev, ret,
+ "failed to register regulator cleanup\n");
+
ret = stk3310_init(indio_dev);
if (ret < 0)
return ret;
@@ -681,19 +726,46 @@ static int stk3310_probe(struct i2c_client *client)
static int stk3310_suspend(struct device *dev)
{
+ int ret;
struct stk3310_data *data;
data = iio_priv(i2c_get_clientdata(to_i2c_client(dev)));
- return stk3310_set_state(data, STK3310_STATE_STANDBY);
+ ret = stk3310_set_state(data, STK3310_STATE_STANDBY);
+ if (ret)
+ return ret;
+
+ regcache_mark_dirty(data->regmap);
+
+ ret = regulator_bulk_disable(ARRAY_SIZE(data->supplies), data->supplies);
+ if (ret) {
+ dev_err(dev, "failed to disable regulators: %d\n", ret);
+ return ret;
+ }
+
+ return 0;
}
static int stk3310_resume(struct device *dev)
{
- u8 state = 0;
+ int ret;
struct stk3310_data *data;
+ u8 state = 0;
data = iio_priv(i2c_get_clientdata(to_i2c_client(dev)));
+
+ ret = stk3310_regulators_enable(data);
+ if (ret) {
+ dev_err(dev, "Failed to re-enable regulators: %d\n", ret);
+ return ret;
+ }
+
+ ret = regcache_sync(data->regmap);
+ if (ret) {
+ dev_err(dev, "Failed to restore registers: %d\n", ret);
+ return ret;
+ }
+
if (data->ps_enabled)
state |= STK3310_STATE_EN_PS;
if (data->als_enabled)
--
2.48.1
next prev parent reply other threads:[~2025-02-08 21:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-08 21:13 [PATCH v5 0/8] iio: light: stk3310: support powering off during suspend Aren Moynihan
2025-02-08 21:13 ` [PATCH v5 1/8] dt-bindings: iio: light: stk33xx: add vdd and leda regulators Aren Moynihan
2025-02-08 21:13 ` [PATCH v5 2/8] iio: light: stk3310: handle all remove logic with devm callbacks Aren Moynihan
2025-02-08 21:13 ` Aren Moynihan [this message]
2025-02-08 21:13 ` [PATCH v5 4/8] iio: light: stk3310: simplify and inline STK3310_REGFIELD macro Aren Moynihan
2025-02-08 21:13 ` [PATCH v5 5/8] iio: light: stk3310: refactor to always make dev a variable Aren Moynihan
2025-02-08 21:13 ` [PATCH v5 6/8] iio: light: stk3310: use dev_err_probe where possible Aren Moynihan
2025-02-09 14:47 ` Andy Shevchenko
2025-02-11 19:43 ` Jonathan Cameron
2025-02-12 10:43 ` Andy Shevchenko
2025-02-15 20:16 ` Aren
2025-02-08 21:13 ` [PATCH v5 7/8] iio: light: stk3310: log error if reading the chip id fails Aren Moynihan
2025-02-08 21:13 ` [PATCH v5 8/8] arm64: dts: allwinner: pinephone: add power supplies to stk3311 Aren Moynihan
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=20250208211325.992280-5-aren@peacevolution.org \
--to=aren@peacevolution.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dsimic@manjaro.org \
--cc=jernej.skrabec@gmail.com \
--cc=jic23@kernel.org \
--cc=jstephan@baylibre.com \
--cc=kauschluss@disroot.org \
--cc=krzk+dt@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=megi@xff.cz \
--cc=phone-devel@vger.kernel.org \
--cc=robh@kernel.org \
--cc=samuel@sholland.org \
--cc=trabarni@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=wens@csie.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