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

Commit 975f6b0c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branches 'topic/asoc', 'topic/misc-fixes', 'topic/ps3-csbits' and...

Merge branches 'topic/asoc', 'topic/misc-fixes', 'topic/ps3-csbits' and 'topic/staging-fixes' into for-linus
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ Changes
	- list of changes that break older software packages.
CodingStyle
	- how the boss likes the C code in the kernel to look.
development-process/
	- An extended tutorial on how to work with the kernel development
	  process.
DMA-API.txt
	- DMA API, pci_ API & extensions for non-consistent memory machines.
DMA-ISA-LPC.txt
@@ -159,8 +162,6 @@ hayes-esp.txt
	- info on using the Hayes ESP serial driver.
highuid.txt
	- notes on the change from 16 bit to 32 bit user/group IDs.
hpet.txt
	- High Precision Event Timer Driver for Linux.
timers/
	- info on the timer related topics
hw_random.txt
@@ -251,8 +252,6 @@ mono.txt
	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
moxa-smartio
	- file with info on installing/using Moxa multiport serial driver.
mtrr.txt
	- how to use PPro Memory Type Range Registers to increase performance.
mutex-design.txt
	- info on the generic mutex subsystem.
namespaces/
+62 −0
Original line number Diff line number Diff line
What:		/sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities
What:		/sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities
Date:		August 2008
Contact:	Greg Kroah-Hartman <gregkh@suse.de>
Description:
		These files show the various USB TMC capabilities as described
		by the device itself.  The full description of the bitfields
		can be found in the USB TMC documents from the USB-IF entitled
		"Universal Serial Bus Test and Measurement Class Specification
		(USBTMC) Revision 1.0" section 4.2.1.8.

		The files are read only.


What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities
What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities
Date:		August 2008
Contact:	Greg Kroah-Hartman <gregkh@suse.de>
Description:
		These files show the various USB TMC capabilities as described
		by the device itself.  The full description of the bitfields
		can be found in the USB TMC documents from the USB-IF entitled
		"Universal Serial Bus Test and Measurement Class, Subclass
		USB488 Specification (USBTMC-USB488) Revision 1.0" section
		4.2.2.

		The files are read only.


What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar
Date:		August 2008
Contact:	Greg Kroah-Hartman <gregkh@suse.de>
Description:
		This file is the TermChar value to be sent to the USB TMC
		device as described by the document, "Universal Serial Bus Test
		and Measurement Class Specification
		(USBTMC) Revision 1.0" as published by the USB-IF.

		Note that the TermCharEnabled file determines if this value is
		sent to the device or not.


What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled
Date:		August 2008
Contact:	Greg Kroah-Hartman <gregkh@suse.de>
Description:
		This file determines if the TermChar is to be sent to the
		device on every transaction or not.  For more details about
		this, please see the document, "Universal Serial Bus Test and
		Measurement Class Specification (USBTMC) Revision 1.0" as
		published by the USB-IF.


What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort
Date:		August 2008
Contact:	Greg Kroah-Hartman <gregkh@suse.de>
Description:
		This file determines if the the transaction of the USB TMC
		device is to be automatically aborted if there is any error.
		For more details about this, please see the document,
		"Universal Serial Bus Test and Measurement Class Specification
		(USBTMC) Revision 1.0" as published by the USB-IF.
+16 −0
Original line number Diff line number Diff line
@@ -85,3 +85,19 @@ Description:
Users:
		PowerTOP <power@bughost.org>
		http://www.lesswatts.org/projects/powertop/

What:		/sys/bus/usb/device/<busnum>-<devnum>...:<config num>-<interface num>/supports_autosuspend
Date:		January 2008
KernelVersion:	2.6.27
Contact:	Sarah Sharp <sarah.a.sharp@intel.com>
Description:
		When read, this file returns 1 if the interface driver
		for this interface supports autosuspend.  It also
		returns 1 if no driver has claimed this interface, as an
		unclaimed interface will not stop the device from being
		autosuspended if all other interface drivers are idle.
		The file returns 0 if autosuspend support has not been
		added to the driver.
Users:
		USB PM tool
		git://git.moblin.org/users/sarah/usb-pm-tool/
+43 −0
Original line number Diff line number Diff line
Where:		/sys/bus/usb/.../powered
Date:		August 2008
Kernel Version:	2.6.26
Contact:	Harrison Metzger <harrisonmetz@gmail.com>
Description:	Controls whether the device's display will powered.
		A value of 0 is off and a non-zero value is on.

Where:		/sys/bus/usb/.../mode_msb
Where:		/sys/bus/usb/.../mode_lsb
Date:		August 2008
Kernel Version:	2.6.26
Contact:	Harrison Metzger <harrisonmetz@gmail.com>
Description:	Controls the devices display mode.
		For a 6 character display the values are
			MSB 0x06; LSB 0x3F, and
		for an 8 character display the values are
			MSB 0x08; LSB 0xFF.

Where:		/sys/bus/usb/.../textmode
Date:		August 2008
Kernel Version:	2.6.26
Contact:	Harrison Metzger <harrisonmetz@gmail.com>
Description:	Controls the way the device interprets its text buffer.
		raw:	each character controls its segment manually
		hex:	each character is between 0-15
		ascii:	each character is between '0'-'9' and 'A'-'F'.

Where:		/sys/bus/usb/.../text
Date:		August 2008
Kernel Version:	2.6.26
Contact:	Harrison Metzger <harrisonmetz@gmail.com>
Description:	The text (or data) for the device to display

Where:		/sys/bus/usb/.../decimals
Date:		August 2008
Kernel Version:	2.6.26
Contact:	Harrison Metzger <harrisonmetz@gmail.com>
Description:	Controls the decimal places on the device.
		To set the nth decimal place, give this field
		the value of 10 ** n. Assume this field has
		the value k and has 1 or more decimal places set,
		to set the mth place (where m is not already set),
		change this fields value to k + 10 ** m.
 No newline at end of file
+34 −21
Original line number Diff line number Diff line
What:		/sys/class/regulator/.../state
Date:		April 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		state. This holds the regulator output state.
@@ -27,7 +27,7 @@ Description:
What:		/sys/class/regulator/.../type
Date:		April 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		type. This holds the regulator type.
@@ -51,7 +51,7 @@ Description:
What:		/sys/class/regulator/.../microvolts
Date:		April 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		microvolts. This holds the regulator output voltage setting
@@ -65,7 +65,7 @@ Description:
What:		/sys/class/regulator/.../microamps
Date:		April 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		microamps. This holds the regulator output current limit
@@ -79,7 +79,7 @@ Description:
What:		/sys/class/regulator/.../opmode
Date:		April 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		opmode. This holds the regulator operating mode setting.
@@ -102,7 +102,7 @@ Description:
What:		/sys/class/regulator/.../min_microvolts
Date:		April 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		min_microvolts. This holds the minimum safe working regulator
@@ -116,7 +116,7 @@ Description:
What:		/sys/class/regulator/.../max_microvolts
Date:		April 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		max_microvolts. This holds the maximum safe working regulator
@@ -130,7 +130,7 @@ Description:
What:		/sys/class/regulator/.../min_microamps
Date:		April 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		min_microamps. This holds the minimum safe working regulator
@@ -145,7 +145,7 @@ Description:
What:		/sys/class/regulator/.../max_microamps
Date:		April 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		max_microamps. This holds the maximum safe working regulator
@@ -157,10 +157,23 @@ Description:
		platform code.


What:		/sys/class/regulator/.../name
Date:		October 2008
KernelVersion:	2.6.28
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		name. This holds a string identifying the regulator for
		display purposes.

		NOTE: this will be empty if no suitable name is provided
		by platform or regulator drivers.


What:		/sys/class/regulator/.../num_users
Date:		April 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		num_users. This holds the number of consumer devices that
@@ -170,7 +183,7 @@ Description:
What:		/sys/class/regulator/.../requested_microamps
Date:		April 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		requested_microamps. This holds the total requested load
@@ -181,7 +194,7 @@ Description:
What:		/sys/class/regulator/.../parent
Date:		April 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Some regulator directories will contain a link called parent.
		This points to the parent or supply regulator if one exists.
@@ -189,7 +202,7 @@ Description:
What:		/sys/class/regulator/.../suspend_mem_microvolts
Date:		May 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		suspend_mem_microvolts. This holds the regulator output
@@ -203,7 +216,7 @@ Description:
What:		/sys/class/regulator/.../suspend_disk_microvolts
Date:		May 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		suspend_disk_microvolts. This holds the regulator output
@@ -217,7 +230,7 @@ Description:
What:		/sys/class/regulator/.../suspend_standby_microvolts
Date:		May 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		suspend_standby_microvolts. This holds the regulator output
@@ -231,7 +244,7 @@ Description:
What:		/sys/class/regulator/.../suspend_mem_mode
Date:		May 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		suspend_mem_mode. This holds the regulator operating mode
@@ -245,7 +258,7 @@ Description:
What:		/sys/class/regulator/.../suspend_disk_mode
Date:		May 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		suspend_disk_mode. This holds the regulator operating mode
@@ -258,7 +271,7 @@ Description:
What:		/sys/class/regulator/.../suspend_standby_mode
Date:		May 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		suspend_standby_mode. This holds the regulator operating mode
@@ -272,7 +285,7 @@ Description:
What:		/sys/class/regulator/.../suspend_mem_state
Date:		May 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		suspend_mem_state. This holds the regulator operating state
@@ -287,7 +300,7 @@ Description:
What:		/sys/class/regulator/.../suspend_disk_state
Date:		May 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		suspend_disk_state. This holds the regulator operating state
@@ -302,7 +315,7 @@ Description:
What:		/sys/class/regulator/.../suspend_standby_state
Date:		May 2008
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
		Each regulator directory will contain a field called
		suspend_standby_state. This holds the regulator operating
Loading