diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-09-16 16:40:38 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-16 16:40:38 +0200 |
| commit | 779608521976e3b8d264f89c67e64c918949cc9b (patch) | |
| tree | 12d604aa1a08b5bf556be11ee9c08b5b6b000179 /Documentation/power/regulator/machine.txt | |
| parent | 7a9744cb455e6faa287e148394b4b422a6f3c5c4 (diff) | |
| parent | f7667af21736eb231e3589d9f91183d325cabfbe (diff) | |
Merge tag 'asoc-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17
This is mostly driver fixes, the biggest one being the tlv320aic31xx
which is relatively large but simple and device specific. There's a
small fix in the error handling in DPCM too which is relatively minor
error handling fix.
Diffstat (limited to 'Documentation/power/regulator/machine.txt')
| -rw-r--r-- | Documentation/power/regulator/machine.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/power/regulator/machine.txt b/Documentation/power/regulator/machine.txt index ce63af0a8e35..757e3b53dc11 100644 --- a/Documentation/power/regulator/machine.txt +++ b/Documentation/power/regulator/machine.txt @@ -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 = { |