Commit 18b34b95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (32 commits)
  regulator: twl4030 VAUX3 supports 3.0V
  regulator: Support disabling of unused regulators by machines
  regulator: Don't increment use_count for boot_on regulators
  twl4030-regulator: expose VPLL2
  regulator: refcount fixes
  regulator: Don't warn if we failed to get a regulator
  regulator: Allow boot_on regulators to be disabled by clients
  regulator: Implement list_voltage for WM835x LDOs and DCDCs
  twl4030-regulator: list more VAUX4 voltages
  regulator: Don't warn on omitted voltage constraints
  regulator: Implement list_voltage() for WM8400 DCDCs and LDOs
  MMC: regulator utilities
  regulator: twl4030 voltage enumeration (v2)
  regulator: twl4030 regulators
  regulator: get_status() grows kerneldoc
  regulator: enumerate voltages (v2)
  regulator: Fix get_mode() for WM835x DCDCs
  regulator: Allow regulators to set the initial operating mode
  regulator: Suggest use of datasheet supply or pin names for consumers
  regulator: email - update email address and regulator webpage.
  ...
parents ca1ee219 d6bb69cf

Documentation/ABI/testing/sysfs-class-regulator

+48 −9
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ KernelVersion: 2.6.26 
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Some regulator directories will contain a field called

		state. This reports the regulator enable status, for

		regulators which can report that value.

		state. This reports the regulator enable control, for

		regulators which can report that input value.



		This will be one of the following strings:
@@ -14,16 +14,54 @@ Description: 
		'unknown'



		'enabled' means the regulator output is ON and is supplying

		power to the system.

		power to the system (assuming no error prevents it).



		'disabled' means the regulator output is OFF and is not

		supplying power to the system..

		supplying power to the system (unless some non-Linux

		control has enabled it).



		'unknown' means software cannot determine the state, or

		the reported state is invalid.



		NOTE: this field can be used in conjunction with microvolts

		and microamps to determine regulator output levels.

		or microamps to determine configured regulator output levels.





What:		/sys/class/regulator/.../status

Description:

		Some regulator directories will contain a field called

		"status". This reports the current regulator status, for

		regulators which can report that output value.



		This will be one of the following strings:



			off

			on

			error

			fast

			normal

			idle

			standby



		"off" means the regulator is not supplying power to the

		system.



		"on" means the regulator is supplying power to the system,

		and the regulator can't report a detailed operation mode.



		"error" indicates an out-of-regulation status such as being

		disabled due to thermal shutdown, or voltage being unstable

		because of problems with the input power supply.



		"fast", "normal", "idle", and "standby" are all detailed

		regulator operation modes (described elsewhere).  They

		imply "on", but provide more detail.



		Note that regulator status is a function of many inputs,

		not limited to control inputs from Linux.  For example,

		the actual load presented may trigger "error" status; or

		a regulator may be enabled by another user, even though

		Linux did not enable it.





What:		/sys/class/regulator/.../type
@@ -58,7 +96,7 @@ Description: 
		Some regulator directories will contain a field called

		microvolts. This holds the regulator output voltage setting

		measured in microvolts (i.e. E-6 Volts), for regulators

		which can report that voltage.

		which can report the control input for voltage.



		NOTE: This value should not be used to determine the regulator

		output voltage level as this value is the same regardless of
@@ -73,7 +111,7 @@ Description: 
		Some regulator directories will contain a field called

		microamps. This holds the regulator output current limit

		setting measured in microamps (i.e. E-6 Amps), for regulators

		which can report that current.

		which can report the control input for a current limit.



		NOTE: This value should not be used to determine the regulator

		output current level as this value is the same regardless of
@@ -87,7 +125,7 @@ Contact: Liam Girdwood <lrg@slimlogic.co.uk> 
Description:

		Some regulator directories will contain a field called

		opmode. This holds the current regulator operating mode,

		for regulators which can report it.

		for regulators which can report that control input value.



		The opmode value can be one of the following strings:
@@ -101,7 +139,8 @@ Description: 


		NOTE: This value should not be used to determine the regulator

		output operating mode as this value is the same regardless of

		whether the regulator is enabled or disabled.

		whether the regulator is enabled or disabled.  A "status"

		attribute may be available to determine the actual mode.





What:		/sys/class/regulator/.../min_microvolts

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4847,7 +4847,7 @@ M: lrg@slimlogic.co.uk 
P:	Mark Brown

M:	broonie@opensource.wolfsonmicro.com

W:	http://opensource.wolfsonmicro.com/node/15

W:	http://www.slimlogic.co.uk/?page_id=5

W:	http://www.slimlogic.co.uk/?p=48

T:	git kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git

S:	Supported

drivers/mfd/twl4030-core.c

+0 −2
Original line number Diff line number Diff line
@@ -592,11 +592,9 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) 


	/* maybe add LDOs that are omitted on cost-reduced parts */

	if (twl_has_regulator() && !(features & TPS_SUBSET)) {

		/*

		child = add_regulator(TWL4030_REG_VPLL2, pdata->vpll2);

		if (IS_ERR(child))

			return PTR_ERR(child);

		*/



		child = add_regulator(TWL4030_REG_VMMC2, pdata->vmmc2);

		if (IS_ERR(child))

drivers/mmc/core/core.c

+100 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/leds.h>

#include <linux/scatterlist.h>

#include <linux/log2.h>

#include <linux/regulator/consumer.h>



#include <linux/mmc/card.h>

#include <linux/mmc/host.h>
@@ -523,6 +524,105 @@ u32 mmc_vddrange_to_ocrmask(int vdd_min, int vdd_max) 
}

EXPORT_SYMBOL(mmc_vddrange_to_ocrmask);



#ifdef CONFIG_REGULATOR



/**

 * mmc_regulator_get_ocrmask - return mask of supported voltages

 * @supply: regulator to use

 *

 * This returns either a negative errno, or a mask of voltages that

 * can be provided to MMC/SD/SDIO devices using the specified voltage

 * regulator.  This would normally be called before registering the

 * MMC host adapter.

 */

int mmc_regulator_get_ocrmask(struct regulator *supply)

{

	int			result = 0;

	int			count;

	int			i;



	count = regulator_count_voltages(supply);

	if (count < 0)

		return count;



	for (i = 0; i < count; i++) {

		int		vdd_uV;

		int		vdd_mV;



		vdd_uV = regulator_list_voltage(supply, i);

		if (vdd_uV <= 0)

			continue;



		vdd_mV = vdd_uV / 1000;

		result |= mmc_vddrange_to_ocrmask(vdd_mV, vdd_mV);

	}



	return result;

}

EXPORT_SYMBOL(mmc_regulator_get_ocrmask);



/**

 * mmc_regulator_set_ocr - set regulator to match host->ios voltage

 * @vdd_bit: zero for power off, else a bit number (host->ios.vdd)

 * @supply: regulator to use

 *

 * Returns zero on success, else negative errno.

 *

 * MMC host drivers may use this to enable or disable a regulator using

 * a particular supply voltage.  This would normally be called from the

 * set_ios() method.

 */

int mmc_regulator_set_ocr(struct regulator *supply, unsigned short vdd_bit)

{

	int			result = 0;

	int			min_uV, max_uV;

	int			enabled;



	enabled = regulator_is_enabled(supply);

	if (enabled < 0)

		return enabled;



	if (vdd_bit) {

		int		tmp;

		int		voltage;



		/* REVISIT mmc_vddrange_to_ocrmask() may have set some

		 * bits this regulator doesn't quite support ... don't

		 * be too picky, most cards and regulators are OK with

		 * a 0.1V range goof (it's a small error percentage).

		 */

		tmp = vdd_bit - ilog2(MMC_VDD_165_195);

		if (tmp == 0) {

			min_uV = 1650 * 1000;

			max_uV = 1950 * 1000;

		} else {

			min_uV = 1900 * 1000 + tmp * 100 * 1000;

			max_uV = min_uV + 100 * 1000;

		}



		/* avoid needless changes to this voltage; the regulator

		 * might not allow this operation

		 */

		voltage = regulator_get_voltage(supply);

		if (voltage < 0)

			result = voltage;

		else if (voltage < min_uV || voltage > max_uV)

			result = regulator_set_voltage(supply, min_uV, max_uV);

		else

			result = 0;



		if (result == 0 && !enabled)

			result = regulator_enable(supply);

	} else if (enabled) {

		result = regulator_disable(supply);

	}



	return result;

}

EXPORT_SYMBOL(mmc_regulator_set_ocr);



#endif



/*

 * Mask off any voltages we don't support and select

 * the lowest voltage

drivers/regulator/Kconfig

+12 −1
Original line number Diff line number Diff line
@@ -29,8 +29,12 @@ config REGULATOR_DEBUG 
	  Say yes here to enable debugging support.



config REGULATOR_FIXED_VOLTAGE

	tristate

	tristate "Fixed voltage regulator support"

	default n

	help

	  This driver provides support for fixed voltage regulators,

	  useful for systems which use a combination of software

	  managed regulators and simple non-configurable regulators.



config REGULATOR_VIRTUAL_CONSUMER

	tristate "Virtual regulator consumer support"
@@ -52,6 +56,13 @@ config REGULATOR_BQ24022 
	  charging select between 100 mA and 500 mA charging current

	  limit.



config REGULATOR_TWL4030

	bool "TI TWL4030/TWL5030/TPS695x0 PMIC"

	depends on TWL4030_CORE

	help

	  This driver supports the voltage regulators provided by

	  this family of companion chips.



config REGULATOR_WM8350

	tristate "Wolfson Microelectroncis WM8350 AudioPlus PMIC"

	depends on MFD_WM8350

CRA Git | Maintained and supported by SUSTech CRA and CCSE