Unverified Commit 69635691 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

regulator: richtek,rt4801: parse GPIOs per regulator 



Having one enable-gpios property for all regulators is discouraged and
instead, similarly to regulator core ena_gpiod feature, each GPIO should
be present in each regulator node.  Add support for parsing such GPIOs,
keeping backwards compatibility.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Tested-by: default avatarChiYuan Huang <cy_huang@richtek.com>
Link: https://lore.kernel.org/r/20220425072455.27356-3-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a498db69

drivers/regulator/rt4801-regulator.c

+38 −11
Original line number Diff line number Diff line
@@ -29,11 +29,33 @@ 


struct rt4801_priv {

	struct device *dev;

	struct gpio_descs *enable_gpios;

	struct gpio_desc *enable_gpios[DSV_OUT_MAX];

	unsigned int enable_flag;

	unsigned int volt_sel[DSV_OUT_MAX];

};



static int rt4801_of_parse_cb(struct device_node *np,

			      const struct regulator_desc *desc,

			      struct regulator_config *config)

{

	struct rt4801_priv *priv = config->driver_data;

	int id = desc->id;



	if (priv->enable_gpios[id]) {

		dev_warn(priv->dev, "duplicated enable-gpios property\n");

		return 0;

	}

	priv->enable_gpios[id] = devm_fwnode_gpiod_get_index(priv->dev,

							     of_fwnode_handle(np),

							     "enable", 0,

							     GPIOD_OUT_HIGH,

							     "rt4801");

	if (IS_ERR(priv->enable_gpios[id]))

		priv->enable_gpios[id] = NULL;



	return 0;

}



static int rt4801_set_voltage_sel(struct regulator_dev *rdev, unsigned int selector)

{

	struct rt4801_priv *priv = rdev_get_drvdata(rdev);
@@ -63,15 +85,14 @@ static int rt4801_get_voltage_sel(struct regulator_dev *rdev) 
static int rt4801_enable(struct regulator_dev *rdev)

{

	struct rt4801_priv *priv = rdev_get_drvdata(rdev);

	struct gpio_descs *gpios = priv->enable_gpios;

	int id = rdev_get_id(rdev), ret;



	if (!gpios || gpios->ndescs <= id) {

	if (!priv->enable_gpios[id]) {

		dev_warn(&rdev->dev, "no dedicated gpio can control\n");

		goto bypass_gpio;

	}



	gpiod_set_value(gpios->desc[id], 1);

	gpiod_set_value(priv->enable_gpios[id], 1);



bypass_gpio:

	ret = regmap_write(rdev->regmap, rdev->desc->vsel_reg, priv->volt_sel[id]);
@@ -85,15 +106,14 @@ static int rt4801_enable(struct regulator_dev *rdev) 
static int rt4801_disable(struct regulator_dev *rdev)

{

	struct rt4801_priv *priv = rdev_get_drvdata(rdev);

	struct gpio_descs *gpios = priv->enable_gpios;

	int id = rdev_get_id(rdev);



	if (!gpios || gpios->ndescs <= id) {

	if (!priv->enable_gpios[id]) {

		dev_warn(&rdev->dev, "no dedicated gpio can control\n");

		goto bypass_gpio;

	}



	gpiod_set_value(gpios->desc[id], 0);

	gpiod_set_value(priv->enable_gpios[id], 0);



bypass_gpio:

	priv->enable_flag &= ~BIT(id);
@@ -122,6 +142,7 @@ static const struct regulator_desc rt4801_regulator_descs[] = { 
		.name = "DSVP",

		.ops = &rt4801_regulator_ops,

		.of_match = of_match_ptr("DSVP"),

		.of_parse_cb = rt4801_of_parse_cb,

		.type = REGULATOR_VOLTAGE,

		.id = DSV_OUT_POS,

		.min_uV = MIN_UV,
@@ -135,6 +156,7 @@ static const struct regulator_desc rt4801_regulator_descs[] = { 
		.name = "DSVN",

		.ops = &rt4801_regulator_ops,

		.of_match = of_match_ptr("DSVN"),

		.of_parse_cb = rt4801_of_parse_cb,

		.type = REGULATOR_VOLTAGE,

		.id = DSV_OUT_NEG,

		.min_uV = MIN_UV,
@@ -172,10 +194,15 @@ static int rt4801_probe(struct i2c_client *i2c) 
		return PTR_ERR(regmap);

	}



	priv->enable_gpios = devm_gpiod_get_array_optional(&i2c->dev, "enable", GPIOD_OUT_HIGH);

	if (IS_ERR(priv->enable_gpios)) {

	for (i = 0; i < DSV_OUT_MAX; i++) {

		priv->enable_gpios[i] = devm_gpiod_get_index_optional(&i2c->dev,

								      "enable",

								      i,

								      GPIOD_OUT_HIGH);

		if (IS_ERR(priv->enable_gpios[i])) {

			dev_err(&i2c->dev, "Failed to get gpios\n");

		return PTR_ERR(priv->enable_gpios);

			return PTR_ERR(priv->enable_gpios[i]);

		}

	}



	for (i = 0; i < DSV_OUT_MAX; i++) {