Date:   Mon, 20 Mar 2023 14:22:48 +0000
To:     linux-kernel@vger.kernel.org
From:   "Lin, Meng-Bo" <linmengbo0689@protonmail.com>
Cc:     Pavel Machek <pavel@ucw.cz>, Lee Jones <lee@kernel.org>,
        Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Nikita Travkin <nikita@trvn.ru>,
        Stephan Gerhold <stephan@gerhold.net>,
        linux-leds@vger.kernel.org, devicetree@vger.kernel.org,
        ~postmarketos/upstreaming@lists.sr.ht
Subject: [PATCH 2/2] leds: aw2013: Add vdd regulator
Message-ID: <20230320142116.3494-1-linmengbo0689@protonmail.com>
In-Reply-To: <20230320141638.3378-1-linmengbo0689@protonmail.com>
References: <20230320141638.3378-1-linmengbo0689@protonmail.com>
Feedback-ID: 40467236:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Implement support for a "vdd" that is enabled by the aw2013 driver so that
the regulator gets enabled when needed.

Signed-off-by: Lin, Meng-Bo <linmengbo0689@protonmail.com>
---
 drivers/leds/leds-aw2013.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/drivers/leds/leds-aw2013.c b/drivers/leds/leds-aw2013.c
index 0b52fc9097c6..91d720edb857 100644
--- a/drivers/leds/leds-aw2013.c
+++ b/drivers/leds/leds-aw2013.c
@@ -62,7 +62,7 @@ struct aw2013_led {
=20
 struct aw2013 {
 =09struct mutex mutex; /* held when writing to registers */
-=09struct regulator *vcc_regulator;
+=09struct regulator_bulk_data regulators[2];
 =09struct i2c_client *client;
 =09struct aw2013_led leds[AW2013_MAX_LEDS];
 =09struct regmap *regmap;
@@ -106,7 +106,8 @@ static void aw2013_chip_disable(struct aw2013 *chip)
=20
 =09regmap_write(chip->regmap, AW2013_GCR, 0);
=20
-=09ret =3D regulator_disable(chip->vcc_regulator);
+=09ret =3D regulator_bulk_disable(ARRAY_SIZE(chip->regulators),
+=09=09=09=09     chip->regulators);
 =09if (ret) {
 =09=09dev_err(&chip->client->dev,
 =09=09=09"Failed to disable regulator: %d\n", ret);
@@ -123,7 +124,8 @@ static int aw2013_chip_enable(struct aw2013 *chip)
 =09if (chip->enabled)
 =09=09return 0;
=20
-=09ret =3D regulator_enable(chip->vcc_regulator);
+=09ret =3D regulator_bulk_enable(ARRAY_SIZE(chip->regulators),
+=09=09=09=09    chip->regulators);
 =09if (ret) {
 =09=09dev_err(&chip->client->dev,
 =09=09=09"Failed to enable regulator: %d\n", ret);
@@ -348,16 +350,20 @@ static int aw2013_probe(struct i2c_client *client)
 =09=09goto error;
 =09}
=20
-=09chip->vcc_regulator =3D devm_regulator_get(&client->dev, "vcc");
-=09ret =3D PTR_ERR_OR_ZERO(chip->vcc_regulator);
-=09if (ret) {
+=09chip->regulators[0].supply =3D "vcc";
+=09chip->regulators[1].supply =3D "vdd";
+=09ret =3D devm_regulator_bulk_get(&client->dev,
+=09=09=09=09      ARRAY_SIZE(chip->regulators),
+=09=09=09=09      chip->regulators);
+=09if (ret < 0) {
 =09=09if (ret !=3D -EPROBE_DEFER)
 =09=09=09dev_err(&client->dev,
 =09=09=09=09"Failed to request regulator: %d\n", ret);
 =09=09goto error;
 =09}
=20
-=09ret =3D regulator_enable(chip->vcc_regulator);
+=09ret =3D regulator_bulk_enable(ARRAY_SIZE(chip->regulators),
+=09=09=09=09    chip->regulators);
 =09if (ret) {
 =09=09dev_err(&client->dev,
 =09=09=09"Failed to enable regulator: %d\n", ret);
@@ -382,7 +388,8 @@ static int aw2013_probe(struct i2c_client *client)
 =09if (ret < 0)
 =09=09goto error_reg;
=20
-=09ret =3D regulator_disable(chip->vcc_regulator);
+=09ret =3D regulator_bulk_disable(ARRAY_SIZE(chip->regulators),
+=09=09=09=09     chip->regulators);
 =09if (ret) {
 =09=09dev_err(&client->dev,
 =09=09=09"Failed to disable regulator: %d\n", ret);
@@ -394,7 +401,8 @@ static int aw2013_probe(struct i2c_client *client)
 =09return 0;
=20
 error_reg:
-=09regulator_disable(chip->vcc_regulator);
+=09regulator_bulk_disable(ARRAY_SIZE(chip->regulators),
+=09=09=09       chip->regulators);
=20
 error:
 =09mutex_destroy(&chip->mutex);
--=20
2.30.2