Commit a65c8663 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/doc' and... 

Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/tps65090' into regulator-linus
parents 69e273c0 a8dbfeed a4e2dec0

Documentation/devicetree/bindings/regulator/tps65090.txt

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ Example: 
		infet5-supply = <&some_reg>;

		infet6-supply = <&some_reg>;

		infet7-supply = <&some_reg>;

		vsys_l1-supply = <&some_reg>;

		vsys_l2-supply = <&some_reg>;

		vsys-l1-supply = <&some_reg>;

		vsys-l2-supply = <&some_reg>;



		regulators {

			dcdc1 {

Documentation/power/regulator/consumer.txt

+4 −3
Original line number Diff line number Diff line
@@ -143,8 +143,9 @@ This will cause the core to recalculate the total load on the regulator (based 
on all its consumers) and change operating mode (if necessary and permitted)

to best match the current operating load.



The load_uA value can be determined from the consumers datasheet. e.g.most

datasheets have tables showing the max current consumed in certain situations.

The load_uA value can be determined from the consumer's datasheet. e.g. most

datasheets have tables showing the maximum current consumed in certain

situations.



Most consumers will use indirect operating mode control since they have no

knowledge of the regulator or whether the regulator is shared with other
@@ -173,7 +174,7 @@ Consumers can register interest in regulator events by calling :- 
int regulator_register_notifier(struct regulator *regulator,

			      struct notifier_block *nb);



Consumers can uregister interest by calling :-

Consumers can unregister interest by calling :-



int regulator_unregister_notifier(struct regulator *regulator,

				struct notifier_block *nb);

Documentation/power/regulator/design.txt

+4 −4
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@ Safety 


 - Errors in regulator configuration can have very serious consequences

   for the system, potentially including lasting hardware damage.

 - It is not possible to automatically determine the power confugration

 - It is not possible to automatically determine the power configuration

   of the system - software-equivalent variants of the same chip may

   have different power requirments, and not all components with power

   have different power requirements, and not all components with power

   requirements are visible to software.



  => The API should make no changes to the hardware state unless it has

     specific knowledge that these changes are safe to do perform on

     this particular system.

     specific knowledge that these changes are safe to perform on this

     particular system.



Consumer use cases

------------------

Documentation/power/regulator/machine.txt

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Consider the following machine :- 
               +-> [Consumer B @ 3.3V]



The drivers for consumers A & B must be mapped to the correct regulator in

order to control their power supply. This mapping can be achieved in machine

order to control their power supplies. This mapping can be achieved in machine

initialisation code by creating a struct regulator_consumer_supply for

each regulator.
@@ -39,7 +39,7 @@ to the 'Vcc' supply for Consumer A. 


Constraints can now be registered by defining a struct regulator_init_data

for each regulator power domain. This structure also maps the consumers

to their supply regulator :-

to their supply regulators :-



static struct regulator_init_data regulator1_data = {

	.constraints = {

Documentation/power/regulator/overview.txt

+3 −3
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ Some terms used in this document:- 
                   Consumers can be classified into two types:-



                   Static: consumer does not change its supply voltage or

                   current limit. It only needs to enable or disable it's

                   current limit. It only needs to enable or disable its

                   power supply. Its supply voltage is set by the hardware,

                   bootloader, firmware or kernel board initialisation code.



                   Dynamic: consumer needs to change it's supply voltage or

                   Dynamic: consumer needs to change its supply voltage or

                   current limit to meet operation demands.