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

Commit b47ba9fd authored by Mark Brown's avatar Mark Brown Committed by Liam Girdwood
Browse files

regulator: Set up GPIO for WM831x VSEL before enabling VSEL mode 



If the VSEL is not in use prior to us starting up then we need to make
sure we initialise the GPIO before we push the DVS control to being done
by the GPIO.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 24b43150

drivers/regulator/wm831x-dcdc.c

+20 −21
Original line number Diff line number Diff line
@@ -456,27 +456,6 @@ static __devinit void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc, 
	if (!pdata || !pdata->dvs_gpio)

		return;



	switch (pdata->dvs_control_src) {

	case 1:

		ctrl = 2 << WM831X_DC1_DVS_SRC_SHIFT;

		break;

	case 2:

		ctrl = 3 << WM831X_DC1_DVS_SRC_SHIFT;

		break;

	default:

		dev_err(wm831x->dev, "Invalid DVS control source %d for %s\n",

			pdata->dvs_control_src, dcdc->name);

		return;

	}



	ret = wm831x_set_bits(wm831x, dcdc->base + WM831X_DCDC_DVS_CONTROL,

			      WM831X_DC1_DVS_SRC_MASK, ctrl);

	if (ret < 0) {

		dev_err(wm831x->dev, "Failed to set %s DVS source: %d\n",

			dcdc->name, ret);

		return;

	}



	ret = gpio_request(pdata->dvs_gpio, "DCDC DVS");

	if (ret < 0) {

		dev_err(wm831x->dev, "Failed to get %s DVS GPIO: %d\n",
@@ -498,6 +477,26 @@ static __devinit void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc, 
	}



	dcdc->dvs_gpio = pdata->dvs_gpio;



	switch (pdata->dvs_control_src) {

	case 1:

		ctrl = 2 << WM831X_DC1_DVS_SRC_SHIFT;

		break;

	case 2:

		ctrl = 3 << WM831X_DC1_DVS_SRC_SHIFT;

		break;

	default:

		dev_err(wm831x->dev, "Invalid DVS control source %d for %s\n",

			pdata->dvs_control_src, dcdc->name);

		return;

	}



	ret = wm831x_set_bits(wm831x, dcdc->base + WM831X_DCDC_DVS_CONTROL,

			      WM831X_DC1_DVS_SRC_MASK, ctrl);

	if (ret < 0) {

		dev_err(wm831x->dev, "Failed to set %s DVS source: %d\n",

			dcdc->name, ret);

	}

}



static __devinit int wm831x_buckv_probe(struct platform_device *pdev)