Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 128015
b: refs/heads/master
c: 29a41e9
h: refs/heads/master
i:
  128013: 0f27911
  128011: b029d3c
  128007: 18f77c6
  127999: c3235cf
v: v3
  • Loading branch information
Linus Torvalds committed Jan 9, 2009
1 parent ffc1c81 commit ebc3fff
Show file tree
Hide file tree
Showing 3,216 changed files with 608,849 additions and 78,264 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ae16489eb1175066c8f3008fc3c0396c525e1906
refs/heads/master: 29a41e9e029d21c306e3ad6e723700348b04706a
1 change: 1 addition & 0 deletions trunk/.mailmap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Christoph Hellwig <hch@lst.de>
Corey Minyard <minyard@acm.org>
David Brownell <david-b@pacbell.net>
David Woodhouse <dwmw2@shinybook.infradead.org>
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Domen Puncer <domen@coderock.org>
Douglas Gilbert <dougg@torque.net>
Ed L. Cashin <ecashin@coraid.com>
Expand Down
19 changes: 18 additions & 1 deletion trunk/CREDITS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,11 @@ S: 1200 Goldenrod Dr.
S: Nampa, Idaho 83686
S: USA

N: Dirk J. Brandewie
E: dirk.j.brandewie@intel.com
E: linux-wimax@intel.com
D: Intel Wireless WiMAX Connection 2400 SDIO driver

N: Derrick J. Brashear
E: shadow@dementia.org
W: http://www.dementia.org/~shadow
Expand Down Expand Up @@ -1681,7 +1686,7 @@ E: ajoshi@shell.unixbox.com
D: fbdev hacking

N: Jesper Juhl
E: jesper.juhl@gmail.com
E: jj@chaosbits.net
D: Various fixes, cleanups and minor features all over the tree.
D: Wrote initial version of the hdaps driver (since passed on to others).
S: Lemnosvej 1, 3.tv
Expand Down Expand Up @@ -2119,6 +2124,11 @@ N: H.J. Lu
E: hjl@gnu.ai.mit.edu
D: GCC + libraries hacker

N: Yanir Lubetkin
E: yanirx.lubatkin@intel.com
E: linux-wimax@intel.com
D: Intel Wireless WiMAX Connection 2400 driver

N: Michal Ludvig
E: michal@logix.cz
E: michal.ludvig@asterisk.co.nz
Expand Down Expand Up @@ -2693,6 +2703,13 @@ S: RR #5, 497 Pole Line Road
S: Thunder Bay, Ontario
S: CANADA P7C 5M9

N: Inaky Perez-Gonzalez
E: inaky.perez-gonzalez@intel.com
E: linux-wimax@intel.com
E: inakypg@yahoo.com
D: WiMAX stack
D: Intel Wireless WiMAX Connection 2400 driver

N: Yuri Per
E: yuri@pts.mipt.ru
D: Some smbfs fixes
Expand Down
136 changes: 60 additions & 76 deletions trunk/Documentation/ABI/testing/sysfs-class-regulator
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ Date: April 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
state. This holds the regulator output state.
Some regulator directories will contain a field called
state. This reports the regulator enable status, for
regulators which can report that value.

This will be one of the following strings:

Expand All @@ -18,7 +19,8 @@ Description:
'disabled' means the regulator output is OFF and is not
supplying power to the system..

'unknown' means software cannot determine the state.
'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.
Expand Down Expand Up @@ -53,9 +55,10 @@ Date: April 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
microvolts. This holds the regulator output voltage setting
measured in microvolts (i.e. E-6 Volts).
measured in microvolts (i.e. E-6 Volts), for regulators
which can report that voltage.

NOTE: This value should not be used to determine the regulator
output voltage level as this value is the same regardless of
Expand All @@ -67,9 +70,10 @@ Date: April 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
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).
setting measured in microamps (i.e. E-6 Amps), for regulators
which can report that current.

NOTE: This value should not be used to determine the regulator
output current level as this value is the same regardless of
Expand All @@ -81,8 +85,9 @@ Date: April 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
opmode. This holds the regulator operating mode setting.
Some regulator directories will contain a field called
opmode. This holds the current regulator operating mode,
for regulators which can report it.

The opmode value can be one of the following strings:

Expand All @@ -92,7 +97,7 @@ Description:
'standby'
'unknown'

The modes are described in include/linux/regulator/regulator.h
The modes are described in include/linux/regulator/consumer.h

NOTE: This value should not be used to determine the regulator
output operating mode as this value is the same regardless of
Expand All @@ -104,9 +109,10 @@ Date: April 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
min_microvolts. This holds the minimum safe working regulator
output voltage setting for this domain measured in microvolts.
output voltage setting for this domain measured in microvolts,
for regulators which support voltage constraints.

NOTE: this will return the string 'constraint not defined' if
the power domain has no min microvolts constraint defined by
Expand All @@ -118,9 +124,10 @@ Date: April 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
max_microvolts. This holds the maximum safe working regulator
output voltage setting for this domain measured in microvolts.
output voltage setting for this domain measured in microvolts,
for regulators which support voltage constraints.

NOTE: this will return the string 'constraint not defined' if
the power domain has no max microvolts constraint defined by
Expand All @@ -132,10 +139,10 @@ Date: April 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
min_microamps. This holds the minimum safe working regulator
output current limit setting for this domain measured in
microamps.
microamps, for regulators which support current constraints.

NOTE: this will return the string 'constraint not defined' if
the power domain has no min microamps constraint defined by
Expand All @@ -147,10 +154,10 @@ Date: April 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
max_microamps. This holds the maximum safe working regulator
output current limit setting for this domain measured in
microamps.
microamps, for regulators which support current constraints.

NOTE: this will return the string 'constraint not defined' if
the power domain has no max microamps constraint defined by
Expand Down Expand Up @@ -185,7 +192,7 @@ Date: April 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
requested_microamps. This holds the total requested load
current in microamps for this regulator from all its consumer
devices.
Expand All @@ -204,125 +211,102 @@ Date: May 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
suspend_mem_microvolts. This holds the regulator output
voltage setting for this domain measured in microvolts when
the system is suspended to memory.

NOTE: this will return the string 'not defined' if
the power domain has no suspend to memory voltage defined by
platform code.
the system is suspended to memory, for voltage regulators
implementing suspend voltage configuration constraints.

What: /sys/class/regulator/.../suspend_disk_microvolts
Date: May 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
suspend_disk_microvolts. This holds the regulator output
voltage setting for this domain measured in microvolts when
the system is suspended to disk.

NOTE: this will return the string 'not defined' if
the power domain has no suspend to disk voltage defined by
platform code.
the system is suspended to disk, for voltage regulators
implementing suspend voltage configuration constraints.

What: /sys/class/regulator/.../suspend_standby_microvolts
Date: May 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
suspend_standby_microvolts. This holds the regulator output
voltage setting for this domain measured in microvolts when
the system is suspended to standby.

NOTE: this will return the string 'not defined' if
the power domain has no suspend to standby voltage defined by
platform code.
the system is suspended to standby, for voltage regulators
implementing suspend voltage configuration constraints.

What: /sys/class/regulator/.../suspend_mem_mode
Date: May 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
suspend_mem_mode. This holds the regulator operating mode
setting for this domain when the system is suspended to
memory.

NOTE: this will return the string 'not defined' if
the power domain has no suspend to memory mode defined by
platform code.
memory, for regulators implementing suspend mode
configuration constraints.

What: /sys/class/regulator/.../suspend_disk_mode
Date: May 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
suspend_disk_mode. This holds the regulator operating mode
setting for this domain when the system is suspended to disk.

NOTE: this will return the string 'not defined' if
the power domain has no suspend to disk mode defined by
platform code.
setting for this domain when the system is suspended to disk,
for regulators implementing suspend mode configuration
constraints.

What: /sys/class/regulator/.../suspend_standby_mode
Date: May 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
suspend_standby_mode. This holds the regulator operating mode
setting for this domain when the system is suspended to
standby.

NOTE: this will return the string 'not defined' if
the power domain has no suspend to standby mode defined by
platform code.
standby, for regulators implementing suspend mode
configuration constraints.

What: /sys/class/regulator/.../suspend_mem_state
Date: May 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
suspend_mem_state. This holds the regulator operating state
when suspended to memory.

This will be one of the following strings:
when suspended to memory, for regulators implementing suspend
configuration constraints.

'enabled'
'disabled'
'not defined'
This will be one of the same strings reported by
the "state" attribute.

What: /sys/class/regulator/.../suspend_disk_state
Date: May 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
suspend_disk_state. This holds the regulator operating state
when suspended to disk.

This will be one of the following strings:
when suspended to disk, for regulators implementing
suspend configuration constraints.

'enabled'
'disabled'
'not defined'
This will be one of the same strings reported by
the "state" attribute.

What: /sys/class/regulator/.../suspend_standby_state
Date: May 2008
KernelVersion: 2.6.26
Contact: Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Each regulator directory will contain a field called
Some regulator directories will contain a field called
suspend_standby_state. This holds the regulator operating
state when suspended to standby.

This will be one of the following strings:
state when suspended to standby, for regulators implementing
suspend configuration constraints.

'enabled'
'disabled'
'not defined'
This will be one of the same strings reported by
the "state" attribute.
Loading

0 comments on commit ebc3fff

Please sign in to comment.