Commit 6b06d2cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (105 commits)
  sonypi: use mutex instead of semaphore
  sony-laptop: remove user visible camera controls as platform attributes
  meye: make meye use sony-laptop instead of sonypi
  sony-laptop: add a meye-usable include file for camera ops
  sony-laptop: complete the motion eye camera support in sony-laptop
  sonypi: try to detect if sony-laptop has already taken one of the known ioports
  sonypi: suggest sonypi users to try sony-laptop instead
  sony-laptop: add edge modem support (also called WWAN)
  sony-laptop: add locking on accesses to the ioport and global vars
  sony-laptop: add camera enable/disable parameter, better handle possible infinite loop
  thinkpad-acpi: make drivers/misc/thinkpad_acpi:fan_mutex static
  ACPI: thinkpad-acpi: add sysfs support to wan and bluetooth subdrivers
  ACPI: thinkpad-acpi: add sysfs support to hotkey subdriver
  ACPI: thinkpad-acpi: improve dock subdriver initialization
  ACPI: thinkpad-acpi: improve debugging for acpi helpers
  ACPI: thinkpad-acpi: improve fan control documentation
  ACPI: thinkpad-acpi: map ENXIO to EINVAL for fan sysfs
  ACPI: thinkpad-acpi: fix a fan watchdog invocation
  ACPI: thinkpad-acpi: do not arm fan watchdog if it would not work
  ACPI: thinkpad-acpi: add a fan-control feature master toggle
  ...
parents b9099ff6 aac60c11

Documentation/kernel-parameters.txt

+27 −5
Original line number Diff line number Diff line
@@ -181,19 +181,41 @@ and is between 256 and 4096 characters. It is defined in the file 
			that require a timer override, but don't have

			HPET



	acpi_dbg_layer=	[HW,ACPI]

	acpi.debug_layer=	[HW,ACPI]

			Format: <int>

			Each bit of the <int> indicates an ACPI debug layer,

			1: enable, 0: disable. It is useful for boot time

			debugging. After system has booted up, it can be set

			via /proc/acpi/debug_layer.



	acpi_dbg_level=	[HW,ACPI]

			via /sys/module/acpi/parameters/debug_layer.

			CONFIG_ACPI_DEBUG must be enabled for this to produce any output.

			Available bits (add the numbers together) to enable debug output

			for specific parts of the ACPI subsystem:

			0x01 utilities 0x02 hardware 0x04 events 0x08 tables

			0x10 namespace 0x20 parser 0x40 dispatcher

			0x80 executer 0x100 resources 0x200 acpica debugger

			0x400 os services 0x800 acpica disassembler.

			The number can be in decimal or prefixed with 0x in hex.

			Warning: Many of these options can produce a lot of

			output and make your system unusable. Be very careful.



	acpi.debug_level=	[HW,ACPI]

			Format: <int>

			Each bit of the <int> indicates an ACPI debug level,

			1: enable, 0: disable. It is useful for boot time

			debugging. After system has booted up, it can be set

			via /proc/acpi/debug_level.

			via /sys/module/acpi/parameters/debug_level.

			CONFIG_ACPI_DEBUG must be enabled for this to produce any output.

			Available bits (add the numbers together) to enable different

			debug output levels of the ACPI subsystem:

			0x01 error 0x02 warn 0x04 init 0x08 debug object

			0x10 info 0x20 init names 0x40 parse 0x80 load

			0x100 dispatch 0x200 execute 0x400 names 0x800 operation region

			0x1000 bfield 0x2000 tables 0x4000 values 0x8000 objects

			0x10000 resources 0x20000 user requests 0x40000 package.

			The number can be in decimal or prefixed with 0x in hex.

			Warning: Many of these options can produce a lot of

			output and make your system unusable. Be very careful.





	acpi_fake_ecdt	[HW,ACPI] Workaround failure due to BIOS lacking ECDT

Documentation/sony-laptop.txt

+18 −7
Original line number Diff line number Diff line
@@ -3,12 +3,18 @@ Sony Notebook Control Driver (SNC) Readme 
	Copyright (C) 2004- 2005 Stelian Pop <stelian@popies.net>

	Copyright (C) 2007 Mattia Dongili <malattia@linux.it>



This mini-driver drives the SNC device present in the ACPI BIOS of

the Sony Vaio laptops.

This mini-driver drives the SNC and SPIC device present in the ACPI BIOS of the

Sony Vaio laptops. This driver mixes both devices functions under the same

(hopefully consistent) interface. This also means that the sonypi driver is

obsoleted by sony-laptop now.



It gives access to some extra laptop functionalities. In its current

form, this driver let the user set or query the screen brightness

through the backlight subsystem and remove/apply power to some devices.

Fn keys (hotkeys):

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

Some models report hotkeys through the SNC or SPIC devices, such events are

reported both through the ACPI subsystem as acpi events and through the INPUT

subsystem. See the logs of acpid or /proc/acpi/event and

/proc/bus/input/devices to find out what those events are and which input

devices are created by the driver.



Backlight control:

------------------
@@ -39,6 +45,8 @@ The files are: 
	audiopower		power on/off the internal sound card

	lanpower		power on/off the internal ethernet card

				(only in debug mode)

	bluetoothpower		power on/off the internal bluetooth device

	fanspeed		get/set the fan speed



Note that some files may be missing if they are not supported

by your particular laptop model.
@@ -76,9 +84,9 @@ The sony-laptop driver creates, for some of those methods (the most 
current ones found on several Vaio models), an entry under

/sys/devices/platform/sony-laptop, just like the 'cdpower' one.

You can create other entries corresponding to your own laptop methods by

further editing the source (see the 'sony_acpi_values' table, and add a new

further editing the source (see the 'sony_nc_values' table, and add a new

entry to this table with your get/set method names using the

HANDLE_NAMES macro).

SNC_HANDLE_NAMES macro).



Your mission, should you accept it, is to try finding out what

those entries are for, by reading/writing random values from/to those
@@ -87,6 +95,9 @@ files and find out what is the impact on your laptop. 
Should you find anything interesting, please report it back to me,

I will not disavow all knowledge of your actions :)



See also http://www.linux.it/~malattia/wiki/index.php/Sony_drivers for other

useful info.



Bugs/Limitations:

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

Documentation/ibm-acpi.txt→Documentation/thinkpad-acpi.txt

+419 −166

File changed and moved.

Preview size limit exceeded, changes collapsed.

Documentation/video4linux/meye.txt

+3 −4
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ Vaio Picturebook Motion Eye Camera Driver Readme 
	Copyright (C) 2000 Andrew Tridgell <tridge@samba.org>



This driver enable the use of video4linux compatible applications with the

Motion Eye camera. This driver requires the "Sony Vaio Programmable I/O

Control Device" driver (which can be found in the "Character drivers"

section of the kernel configuration utility) to be compiled and installed

(using its "camera=1" parameter).

Motion Eye camera. This driver requires the "Sony Laptop Extras" driver (which

can be found in the "Misc devices" section of the kernel configuration utility)

to be compiled and installed (using its "camera=1" parameter).



It can do at maximum 30 fps @ 320x240 or 15 fps @ 640x480.

MAINTAINERS

+9 −9
Original line number Diff line number Diff line
@@ -1658,15 +1658,6 @@ W: http://www.ia64-linux.org/ 
T:	git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git

S:	Maintained



IBM ACPI EXTRAS DRIVER

P:	Henrique de Moraes Holschuh

M:	ibm-acpi@hmh.eng.br

L:	ibm-acpi-devel@lists.sourceforge.net

W:	http://ibm-acpi.sourceforge.net

W:	http://thinkwiki.org/wiki/Ibm-acpi

T:	git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git

S:	Maintained



SN-IA64 (Itanium) SUB-PLATFORM

P:	Jes Sorensen

M:	jes@sgi.com
@@ -3166,6 +3157,15 @@ P: Chris Zankel 
M:	chris@zankel.net

S:	Maintained



THINKPAD ACPI EXTRAS DRIVER

P:	Henrique de Moraes Holschuh

M:	ibm-acpi@hmh.eng.br

L:	ibm-acpi-devel@lists.sourceforge.net

W:	http://ibm-acpi.sourceforge.net

W:	http://thinkwiki.org/wiki/Ibm-acpi

T:	git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git

S:	Maintained



UltraSPARC (sparc64):

P:	David S. Miller

M:	davem@davemloft.net

CRA Git | Maintained and supported by SUSTech CRA and CCSE