Commit 2e36a016 authored Oct 06, 2014 by Markus Pargmann Committed by Greg Kroah-Hartman Jan 08, 2015

regulator: anatop: Set default voltage selector for vddpu



commit fe08be3ec8672ed92b3ed1b85810df9fa0f98931 upstream.

The code reads the default voltage selector from its register. If the
bootloader disables the regulator, the default voltage selector will be
0 which results in faulty behaviour of this regulator driver.

This patch sets a default voltage selector for vddpu if it is not set in
the register.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9d91d6e0

drivers/regulator/anatop-regulator.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -283,6 +283,14 @@ static int anatop_regulator_probe(struct platform_device *pdev)
		sreg->sel = 0;
		sreg->bypass = true;
		}

		/*
		* In case vddpu was disabled by the bootloader, we need to set
		* a sane default until imx6-cpufreq was probed and changes the
		* voltage to the correct value. In this case we set 1.25V.
		*/
		if (!sreg->sel && !strcmp(sreg->name, "vddpu"))
		sreg->sel = 22;
		} else {
		rdesc->ops = &anatop_rops;
		}