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

Commit cf9b59e9 authored by Grant Likely's avatar Grant Likely
Browse files

Merge remote branch 'origin' into secretlab/next-devicetree 



Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parents 44504b2b f4b87dee

Documentation/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -250,6 +250,8 @@ numastat.txt 
	- info on how to read Numa policy hit/miss statistics in sysfs.

oops-tracing.txt

	- how to decode those nasty internal kernel error dump messages.

padata.txt

	- An introduction to the "padata" parallel execution API

parisc/

	- directory with info on using Linux on PA-RISC architecture.

parport.txt

Documentation/ABI/obsolete/sysfs-bus-usb

0 → 100644
+31 −0
Original line number Diff line number Diff line 
What:		/sys/bus/usb/devices/.../power/level

Date:		March 2007

KernelVersion:	2.6.21

Contact:	Alan Stern <stern@rowland.harvard.edu>

Description:

		Each USB device directory will contain a file named

		power/level.  This file holds a power-level setting for

		the device, either "on" or "auto".



		"on" means that the device is not allowed to autosuspend,

		although normal suspends for system sleep will still

		be honored.  "auto" means the device will autosuspend

		and autoresume in the usual manner, according to the

		capabilities of its driver.



		During normal use, devices should be left in the "auto"

		level.  The "on" level is meant for administrative uses.

		If you want to suspend a device immediately but leave it

		free to wake up in response to I/O requests, you should

		write "0" to power/autosuspend.



		Device not capable of proper suspend and resume should be

		left in the "on" level.  Although the USB spec requires

		devices to support suspend/resume, many of them do not.

		In fact so many don't that by default, the USB core

		initializes all non-hub devices in the "on" level.  Some

		drivers may change this setting when they are bound.



		This file is deprecated and will be removed after 2010.

		Use the power/control file instead; it does exactly the

		same thing.

Documentation/ABI/obsolete/sysfs-class-rfkill

0 → 100644
+29 −0
Original line number Diff line number Diff line 
rfkill - radio frequency (RF) connector kill switch support



For details to this subsystem look at Documentation/rfkill.txt.



What:		/sys/class/rfkill/rfkill[0-9]+/state

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Current state of the transmitter.

		This file is deprecated and sheduled to be removed in 2014,

		because its not possible to express the 'soft and hard block'

		state of the rfkill driver.

Values: 	A numeric value.

		0: RFKILL_STATE_SOFT_BLOCKED

			transmitter is turned off by software

		1: RFKILL_STATE_UNBLOCKED

			transmitter is (potentially) active

		2: RFKILL_STATE_HARD_BLOCKED

			transmitter is forced off by something outside of

			the driver's control.



What:		/sys/class/rfkill/rfkill[0-9]+/claim

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description:	This file is deprecated because there no longer is a way to

		claim just control over a single rfkill instance.

		This file is scheduled to be removed in 2012.

Values: 	0: Kernel handles events

Documentation/ABI/stable/sysfs-class-rfkill

0 → 100644
+67 −0
Original line number Diff line number Diff line 
rfkill - radio frequency (RF) connector kill switch support



For details to this subsystem look at Documentation/rfkill.txt.



For the deprecated /sys/class/rfkill/*/state and

/sys/class/rfkill/*/claim knobs of this interface look in

Documentation/ABI/obsolete/sysfs-class-rfkill.



What: 		/sys/class/rfkill

Date:		09-Jul-2007

KernelVersion:	v2.6.22

Contact:	linux-wireless@vger.kernel.org,

Description: 	The rfkill class subsystem folder.

		Each registered rfkill driver is represented by an rfkillX

		subfolder (X being an integer > 0).





What:		/sys/class/rfkill/rfkill[0-9]+/name

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Name assigned by driver to this key (interface or driver name).

Values: 	arbitrary string.





What: 		/sys/class/rfkill/rfkill[0-9]+/type

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Driver type string ("wlan", "bluetooth", etc).

Values: 	See include/linux/rfkill.h.





What:		/sys/class/rfkill/rfkill[0-9]+/persistent

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Whether the soft blocked state is initialised from non-volatile

		storage at startup.

Values: 	A numeric value.

		0: false

		1: true





What:		/sys/class/rfkill/rfkill[0-9]+/hard

Date:		12-March-2010

KernelVersion	v2.6.34

Contact:	linux-wireless@vger.kernel.org

Description: 	Current hardblock state. This file is read only.

Values: 	A numeric value.

		0: inactive

			The transmitter is (potentially) active.

		1: active

			The transmitter is forced off by something outside of

			the driver's control.





What:		/sys/class/rfkill/rfkill[0-9]+/soft

Date:		12-March-2010

KernelVersion	v2.6.34

Contact:	linux-wireless@vger.kernel.org

Description:	Current softblock state. This file is read and write.

Values: 	A numeric value.

		0: inactive

			The transmitter is (potentially) active.

		1: active

			The transmitter is turned off by software.

Documentation/ABI/testing/sysfs-bus-pci

+40 −0
Original line number Diff line number Diff line
@@ -133,6 +133,46 @@ Description: 
		The symbolic link points to the PCI device sysfs entry of the

		Physical Function this device associates with.





What:		/sys/bus/pci/slots/...

Date:		April 2005 (possibly older)

KernelVersion:	2.6.12 (possibly older)

Contact:	linux-pci@vger.kernel.org

Description:

		When the appropriate driver is loaded, it will create a

		directory per claimed physical PCI slot in

		/sys/bus/pci/slots/.  The names of these directories are

		specific to the driver, which in turn, are specific to the

		platform, but in general, should match the label on the

		machine's physical chassis.



		The drivers that can create slot directories include the

		PCI hotplug drivers, and as of 2.6.27, the pci_slot driver.



		The slot directories contain, at a minimum, a file named

		'address' which contains the PCI bus:device:function tuple.

		Other files may appear as well, but are specific to the

		driver.



What:		/sys/bus/pci/slots/.../function[0-7]

Date:		March 2010

KernelVersion:	2.6.35

Contact:	linux-pci@vger.kernel.org

Description:

		If PCI slot directories (as described above) are created,

		and the physical slot is actually populated with a device,

		symbolic links in the slot directory pointing to the

		device's PCI functions are created as well.



What:		/sys/bus/pci/devices/.../slot

Date:		March 2010

KernelVersion:	2.6.35

Contact:	linux-pci@vger.kernel.org

Description:

		If PCI slot directories (as described above) are created,

		a symbolic link pointing to the slot directory will be

		created as well.



What:		/sys/bus/pci/slots/.../module

Date:		June 2009

Contact:	linux-pci@vger.kernel.org