Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d1dae72f authored by Mark Brown's avatar Mark Brown
Browse files

regulator: max77686: Fix shared GPIOs 



This reverts commit c89c00e2 "regulator: max77686: Pass descriptor
instead of GPIO number" as it has problems with shared GPIOs similar to
that on s2mps11.

Reported-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ba08799e

drivers/regulator/max77686-regulator.c

+7 −12
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 
#include <linux/kernel.h>

#include <linux/bug.h>

#include <linux/err.h>

#include <linux/gpio/consumer.h>

#include <linux/gpio.h>

#include <linux/of_gpio.h>

#include <linux/slab.h>

#include <linux/platform_device.h>

#include <linux/regulator/driver.h>
@@ -89,7 +90,6 @@ enum max77686_ramp_rate { 
};



struct max77686_data {

	struct device *dev;

	DECLARE_BITMAP(gpio_enabled, MAX77686_REGULATORS);



	/* Array indexed by regulator id */
@@ -269,20 +269,16 @@ static int max77686_of_parse_cb(struct device_node *np, 
	case MAX77686_BUCK8:

	case MAX77686_BUCK9:

	case MAX77686_LDO20 ... MAX77686_LDO22:

		config->ena_gpiod = devm_gpiod_get_from_of_node(max77686->dev,

								np,

								"maxim,ena",

								0,

								GPIOD_OUT_HIGH,

								"max77686-regulator");

		if (IS_ERR(config->ena_gpiod))

			config->ena_gpiod = NULL;

		config->ena_gpio = of_get_named_gpio(np,

					"maxim,ena-gpios", 0);

		config->ena_gpio_flags = GPIOF_OUT_INIT_HIGH;

		config->ena_gpio_initialized = true;

		break;

	default:

		return 0;

	}



	if (config->ena_gpiod) {

	if (gpio_is_valid(config->ena_gpio)) {

		set_bit(desc->id, max77686->gpio_enabled);



		return regmap_update_bits(config->regmap, desc->enable_reg,
@@ -525,7 +521,6 @@ static int max77686_pmic_probe(struct platform_device *pdev) 
	if (!max77686)

		return -ENOMEM;



	max77686->dev = &pdev->dev;

	config.dev = iodev->dev;

	config.regmap = iodev->regmap;

	config.driver_data = max77686;