From: Aren Moynihan <aren@peacevolution.org>
To: Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>
Cc: "Aren Moynihan" <aren@peacevolution.org>,
"Andy Shevchenko" <andy.shevchenko@gmail.com>,
"Ondrej Jirman" <megi@xff.cz>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
linux-iio@vger.kernel.org, phone-devel@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev,
"Willow Barraco" <contact@willowbarraco.fr>
Subject: [PATCH v2 3/6] iio: light: stk3310: Manage LED power supply
Date: Tue, 23 Apr 2024 18:33:06 -0400 [thread overview]
Message-ID: <20240423223309.1468198-5-aren@peacevolution.org> (raw)
In-Reply-To: <20240423223309.1468198-2-aren@peacevolution.org>
The stk3310 and stk3310 chips have an input for power to the infrared
LED. Add support for managing it's state.
Signed-off-by: Aren Moynihan <aren@peacevolution.org>
---
drivers/iio/light/stk3310.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
index a0547eeca3e3..ee1ac95dbc0e 100644
--- a/drivers/iio/light/stk3310.c
+++ b/drivers/iio/light/stk3310.c
@@ -120,6 +120,7 @@ struct stk3310_data {
struct regmap_field *reg_flag_psint;
struct regmap_field *reg_flag_nf;
struct regulator *vdd_reg;
+ struct regulator *led_reg;
};
static const struct iio_event_spec stk3310_events[] = {
@@ -614,6 +615,10 @@ static int stk3310_probe(struct i2c_client *client)
if (IS_ERR(data->vdd_reg))
return dev_err_probe(&client->dev, ret, "get regulator vdd failed\n");
+ data->led_reg = devm_regulator_get(&client->dev, "leda");
+ if (IS_ERR(data->led_reg))
+ return dev_err_probe(&client->dev, ret, "get regulator led failed\n");
+
ret = stk3310_regmap_init(data);
if (ret < 0)
return ret;
@@ -629,12 +634,18 @@ static int stk3310_probe(struct i2c_client *client)
return dev_err_probe(&client->dev, ret,
"regulator vdd enable failed\n");
+ ret = regulator_enable(data->led_reg);
+ if (ret) {
+ dev_err_probe(&client->dev, ret, "regulator led enable failed\n");
+ goto err_vdd_disable;
+ }
+
/* we need a short delay to allow the chip time to power on */
fsleep(1000);
ret = stk3310_init(indio_dev);
if (ret < 0)
- goto err_vdd_disable;
+ goto err_led_disable;
if (client->irq > 0) {
ret = devm_request_threaded_irq(&client->dev, client->irq,
@@ -660,6 +671,8 @@ static int stk3310_probe(struct i2c_client *client)
err_standby:
stk3310_set_state(data, STK3310_STATE_STANDBY);
+err_led_disable:
+ regulator_disable(data->led_reg);
err_vdd_disable:
regulator_disable(data->vdd_reg);
return ret;
@@ -672,6 +685,7 @@ static void stk3310_remove(struct i2c_client *client)
iio_device_unregister(indio_dev);
stk3310_set_state(iio_priv(indio_dev), STK3310_STATE_STANDBY);
+ regulator_disable(data->led_reg);
regulator_disable(data->vdd_reg);
}
@@ -687,6 +701,7 @@ static int stk3310_suspend(struct device *dev)
return ret;
regcache_mark_dirty(data->regmap);
+ regulator_disable(data->led_reg);
regulator_disable(data->vdd_reg);
return 0;
@@ -706,6 +721,12 @@ static int stk3310_resume(struct device *dev)
return ret;
}
+ ret = regulator_enable(data->led_reg);
+ if (ret) {
+ dev_err(dev, "Failed to re-enable regulator led\n");
+ return ret;
+ }
+
fsleep(1000);
ret = regcache_sync(data->regmap);
--
2.44.0
next prev parent reply other threads:[~2024-04-23 22:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 22:33 [PATCH v2 0/6] iio: light: stk3310: support powering off during suspend Aren Moynihan
2024-04-23 22:33 ` [PATCH v2 1/6] dt-bindings: iio: light: stk33xx: add vdd and leda regulators Aren Moynihan
2024-04-24 4:28 ` Krzysztof Kozlowski
2024-04-23 22:33 ` [PATCH v2 2/6] iio: light: stk3310: Implement vdd supply and power it off during suspend Aren Moynihan
2024-04-23 23:16 ` Andy Shevchenko
2024-04-24 12:59 ` Ondřej Jirman
2024-04-24 15:20 ` Andy Shevchenko
2024-04-24 16:14 ` Ondřej Jirman
2024-04-24 17:31 ` Andy Shevchenko
2024-04-24 20:00 ` Ondřej Jirman
2024-04-28 16:48 ` Jonathan Cameron
2024-04-28 16:45 ` Jonathan Cameron
2024-04-25 0:00 ` Aren
2024-04-28 16:34 ` Jonathan Cameron
2024-04-24 12:34 ` kernel test robot
2024-04-25 5:31 ` Dan Carpenter
2024-04-28 16:53 ` Jonathan Cameron
2024-06-07 14:19 ` Aren
2024-04-23 22:33 ` Aren Moynihan [this message]
2024-04-23 23:08 ` [PATCH v2 3/6] iio: light: stk3310: Manage LED power supply Andy Shevchenko
2024-04-23 22:33 ` [PATCH v2 4/6] iio: light: stk3310: use dev_err_probe where possible Aren Moynihan
2024-04-23 22:33 ` [PATCH v2 5/6] iio: light: stk3310: log error if reading the chip id fails Aren Moynihan
2024-04-23 22:33 ` [PATCH v2 6/6] 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=20240423223309.1468198-5-aren@peacevolution.org \
--to=aren@peacevolution.org \
--cc=andy.shevchenko@gmail.com \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=contact@willowbarraco.fr \
--cc=devicetree@vger.kernel.org \
--cc=jernej.skrabec@gmail.com \
--cc=jic23@kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--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=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;
as well as URLs for NNTP newsgroup(s).