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

Commit 87d3af4a authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

mfd: arizona: Hold device in reset while ramping supplies 



Acquire the /RESET GPIO before we enable regulators and hold the device
in reset while the regulators power up in order to improve robustness
during the initial power up.

Also fix the error path so that the device is left in reset while we're
at it.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 9bf7e0e8

drivers/mfd/arizona-core.c

+13 −13
Original line number Diff line number Diff line
@@ -504,6 +504,17 @@ int arizona_dev_init(struct arizona *arizona) 
		goto err_early;

	}



	if (arizona->pdata.reset) {

		/* Start out with /RESET low to put the chip into reset */

		ret = gpio_request_one(arizona->pdata.reset,

				       GPIOF_DIR_OUT | GPIOF_INIT_LOW,

				       "arizona /RESET");

		if (ret != 0) {

			dev_err(dev, "Failed to request /RESET: %d\n", ret);

			goto err_early;

		}

	}



	ret = regulator_bulk_enable(arizona->num_core_supplies,

				    arizona->core_supplies);

	if (ret != 0) {
@@ -518,18 +529,8 @@ int arizona_dev_init(struct arizona *arizona) 
		goto err_enable;

	}



	if (arizona->pdata.reset) {

		/* Start out with /RESET low to put the chip into reset */

		ret = gpio_request_one(arizona->pdata.reset,

				       GPIOF_DIR_OUT | GPIOF_INIT_LOW,

				       "arizona /RESET");

		if (ret != 0) {

			dev_err(dev, "Failed to request /RESET: %d\n", ret);

			goto err_dcvdd;

		}



	if (arizona->pdata.reset)

		gpio_set_value_cansleep(arizona->pdata.reset, 1);

	}



	regcache_cache_only(arizona->regmap, false);
@@ -769,10 +770,9 @@ int arizona_dev_init(struct arizona *arizona) 
	arizona_irq_exit(arizona);

err_reset:

	if (arizona->pdata.reset) {

		gpio_set_value_cansleep(arizona->pdata.reset, 1);

		gpio_set_value_cansleep(arizona->pdata.reset, 0);

		gpio_free(arizona->pdata.reset);

	}

err_dcvdd:

	regulator_disable(arizona->dcvdd);

err_enable:

	regulator_bulk_disable(arizona->num_core_supplies,