From nobody Sun Nov 24 20:19:09 2024 Received: from a.peacevolution.org (a.peacevolution.org [206.189.193.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DE9914F12F; Sat, 2 Nov 2024 19:55:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=206.189.193.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730577343; cv=none; b=nbEcXzl5XqisCPfsemvJ5K63/NDLaKxaVqPlaHd7W1IP2DunryuM+wh3PLgx3SB4DrRhUmNoJnVrusuEGxpTxz4gaoughgr3fVFQFm2WDhV8UcXBQ37b9SqagqRRp+j1o89bSbs7C6nlPArxVsHRzQe/r8P8Xi+zZpFzH6+rgco= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730577343; c=relaxed/simple; bh=umjP4aXqz5QQ2yU6yTjfsFbN/Fg9BNOjZ+Nj8S3y9FU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MUlEFKVzD/q2wLqoCYNZY0Fix7yJG+CdZouGHIDUakklgEIviLOvFXRA5QQehhfjrKSgvEjywjTffq8n73fzN+7J/zMYfdMwAIoA8SLntL0sw8XYaXI/t9XiG3Dq27zP+4Gso35Z2AvI/5gqKVsDobLyGLBaQdTGkFYlB+2brCM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=peacevolution.org; spf=pass smtp.mailfrom=peacevolution.org; dkim=pass (1024-bit key) header.d=peacevolution.org header.i=@peacevolution.org header.b=OW4ekAto; arc=none smtp.client-ip=206.189.193.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=peacevolution.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=peacevolution.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=peacevolution.org header.i=@peacevolution.org header.b="OW4ekAto" Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by a.peacevolution.org (Postfix) with ESMTPA id 61D1C4C832; Sat, 2 Nov 2024 19:55:39 +0000 (UTC) From: Aren Moynihan To: Jonathan Cameron , Lars-Peter Clausen , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland Cc: Aren Moynihan , Kaustabh Chakraborty , =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= , Ondrej Jirman , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , 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, Dragan Simic , phone-devel@vger.kernel.org Subject: [PATCH v4 3/6] iio: light: stk3310: Implement vdd and leda supplies Date: Sat, 2 Nov 2024 15:50:39 -0400 Message-ID: <20241102195037.3013934-9-aren@peacevolution.org> In-Reply-To: <20241102195037.3013934-3-aren@peacevolution.org> References: <20241102195037.3013934-3-aren@peacevolution.org> 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 Authentication-Results: auth=pass smtp.auth=aren@peacevolution.org smtp.mailfrom=aren@peacevolution.org X-Spam-Level: ****** X-Spamd-Bar: ++++++ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=peacevolution.org; s=dkim; t=1730577340; h=from:subject:date:message-id:to:cc:mime-version:content-transfer-encoding:in-reply-to:references; bh=bZ4cqFntykXHpbFFV4ZfGRHhWWvK0O7Az93eNAhN7Dc=; b=OW4ekAto3UFMKXXS3S0cDNzAePkehJMi1jH2TlRvY/Fy2fyyCuWKyfKeXbKV6yFTFk/riD /XXAgwAbUG7sYkXkMd+CcaRmJZ/uFTMefVd6Eo3Tyhkq4c6eKktdx2YajP4A5ULvl/1t45 yVIE9EZPVPuSD3UAEHmroZ4HUASpkIw= Content-Type: text/plain; charset="utf-8" The vdd and leda supplies must be powered on for the chip to function and can be powered off during system suspend. This was originally based on a patch by Ondrej Jirman[1], but has been rewritten since. 1: https://codeberg.org/megi/linux/commit/a933aff8b7a0e6e3c9cf1d832dcba0702= 2bbfa82 Signed-off-by: Aren Moynihan --- Notes: Changes in v4: - fix variable declaration order in stk3310_resume to match the rest of the driver =20 Changes in v3: - use bulk regulators instead of two individual ones - handle cleanup using devm callbacks instead of the remove function =20 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 181b7acb3f96..f93689c61f44 100644 --- a/drivers/iio/light/stk3310.c +++ b/drivers/iio/light/stk3310.c @@ -13,6 +13,8 @@ #include #include #include +#include + #include #include #include @@ -130,6 +132,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]; }; =20 static const struct iio_event_spec stk3310_events[] =3D { @@ -621,6 +624,31 @@ static irqreturn_t stk3310_irq_event_handler(int irq, = void *private) return IRQ_HANDLED; } =20 +static int stk3310_regulators_enable(struct stk3310_data *data) +{ + int ret; + + ret =3D 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 =3D private; + struct device *dev =3D &data->client->dev; + + ret =3D 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 +670,13 @@ static int stk3310_probe(struct i2c_client *client) =20 devm_mutex_init(&client->dev, &data->lock); =20 + data->supplies[0].supply =3D "vdd"; + data->supplies[1].supply =3D "leda"; + ret =3D devm_regulator_bulk_get(&client->dev, ARRAY_SIZE(data->supplies), + data->supplies); + if (ret) + return dev_err_probe(&client->dev, ret, "get regulators failed\n"); + ret =3D stk3310_regmap_init(data); if (ret < 0) return ret; @@ -652,6 +687,16 @@ static int stk3310_probe(struct i2c_client *client) indio_dev->channels =3D stk3310_channels; indio_dev->num_channels =3D ARRAY_SIZE(stk3310_channels); =20 + ret =3D stk3310_regulators_enable(data); + if (ret) + return dev_err_probe(&client->dev, ret, + "regulator enable failed\n"); + + ret =3D devm_add_action_or_reset(&client->dev, stk3310_regulators_disable= , data); + if (ret) + return dev_err_probe(&client->dev, ret, + "failed to register regulator cleanup\n"); + ret =3D stk3310_init(indio_dev); if (ret < 0) return ret; @@ -682,18 +727,45 @@ static int stk3310_probe(struct i2c_client *client) static int stk3310_suspend(struct device *dev) { struct stk3310_data *data; + int ret; =20 data =3D iio_priv(i2c_get_clientdata(to_i2c_client(dev))); =20 - return stk3310_set_state(data, STK3310_STATE_STANDBY); + ret =3D stk3310_set_state(data, STK3310_STATE_STANDBY); + if (ret) + return ret; + + regcache_mark_dirty(data->regmap); + + ret =3D 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; } =20 static int stk3310_resume(struct device *dev) { - u8 state =3D 0; + int ret; struct stk3310_data *data; + u8 state =3D 0; =20 data =3D iio_priv(i2c_get_clientdata(to_i2c_client(dev))); + + ret =3D stk3310_regulators_enable(data); + if (ret) { + dev_err(dev, "Failed to re-enable regulators: %d", ret); + return ret; + } + + ret =3D regcache_sync(data->regmap); + if (ret) { + dev_err(dev, "Failed to restore registers: %d\n", ret); + return ret; + } + if (data->ps_enabled) state |=3D STK3310_STATE_EN_PS; if (data->als_enabled) --=20 2.47.0