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

Commit 22c5fb6a authored by Mark Brown's avatar Mark Brown
Browse files

regulator: wm831x-ldo: Add bypass support 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e477ce07

drivers/regulator/wm831x-ldo.c

+8 −0
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ static struct regulator_ops wm831x_gp_ldo_ops = { 
	.set_mode = wm831x_gp_ldo_set_mode,

	.get_status = wm831x_gp_ldo_get_status,

	.get_optimum_mode = wm831x_gp_ldo_get_optimum_mode,

	.get_bypass = regulator_get_bypass_regmap,

	.set_bypass = regulator_set_bypass_regmap,



	.is_enabled = regulator_is_enabled_regmap,

	.enable = regulator_enable_regmap,
@@ -293,6 +295,8 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev) 
	ldo->desc.vsel_mask = WM831X_LDO1_ON_VSEL_MASK;

	ldo->desc.enable_reg = WM831X_LDO_ENABLE;

	ldo->desc.enable_mask = 1 << id;

	ldo->desc.bypass_reg = ldo->base;

	ldo->desc.bypass_mask = WM831X_LDO1_SWI;



	config.dev = pdev->dev.parent;

	if (pdata)
@@ -488,6 +492,8 @@ static struct regulator_ops wm831x_aldo_ops = { 
	.get_mode = wm831x_aldo_get_mode,

	.set_mode = wm831x_aldo_set_mode,

	.get_status = wm831x_aldo_get_status,

	.set_bypass = regulator_set_bypass_regmap,

	.get_bypass = regulator_get_bypass_regmap,



	.is_enabled = regulator_is_enabled_regmap,

	.enable = regulator_enable_regmap,
@@ -544,6 +550,8 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev) 
	ldo->desc.vsel_mask = WM831X_LDO7_ON_VSEL_MASK;

	ldo->desc.enable_reg = WM831X_LDO_ENABLE;

	ldo->desc.enable_mask = 1 << id;

	ldo->desc.bypass_reg = ldo->base;

	ldo->desc.bypass_mask = WM831X_LDO7_SWI;



	config.dev = pdev->dev.parent;

	if (pdata)