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

Commit 6d627684 authored Mar 05, 2013 by Mark Brown

Merge remote-tracking branch 'regulator/fix/doc' into tmp

parents 521e2e03 9345dfb8

drivers/regulator/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2830,7 +2830,7 @@ EXPORT_SYMBOL_GPL(regulator_get_bypass_regmap);
		* regulator_allow_bypass - allow the regulator to go into bypass mode
		*
		* @regulator: Regulator to configure
		* @allow: enable or disable bypass mode
		* @enable: enable or disable bypass mode
		*
		* Allow the regulator to go into bypass mode if all other consumers
		* for the regulator also enable bypass mode and the machine

include/linux/regulator/driver.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -199,6 +199,8 @@ enum regulator_type {
		* output when using regulator_set_voltage_sel_regmap
		* @enable_reg: Register for control when using regmap enable/disable ops
		* @enable_mask: Mask for control when using regmap enable/disable ops
		* @bypass_reg: Register for control when using regmap set_bypass
		* @bypass_mask: Mask for control when using regmap set_bypass
		*
		* @enable_time: Time taken for initial enable of regulator (in uS).
		*/