Merge branch 'for-2.6.39' of... (4e29402f) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/ABI/testing/sysfs-driver-samsung-laptop

0 → 100644

+19 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/devices/platform/samsung/performance_level
			Date: January 1, 2010
			KernelVersion: 2.6.33
			Contact: Greg Kroah-Hartman <gregkh@suse.de>
			Description: Some Samsung laptops have different "performance levels"
			that are can be modified by a function key, and by this
			sysfs file. These values don't always make a whole lot
			of sense, but some users like to modify them to keep
			their fans quiet at all costs. Reading from this file
			will show the current performance level. Writing to the
			file can change this value.
			Valid options:
			"silent"
			"normal"
			"overclock"
			Note that not all laptops support all of these options.
			Specifically, not all support the "overclock" option,
			and it's still unknown if this value even changes
			anything, other than making the user feel a bit better.

Documentation/ABI/testing/sysfs-platform-eeepc-wmi→Documentation/ABI/testing/sysfs-platform-asus-wmi

+31 −0

Original line number	Original line	Diff line number	Diff line
	What: /sys/devices/platform/eeepc-wmi/cpufv		What: /sys/devices/platform/<platform>/cpufv
	Date: Oct 2010		Date: Oct 2010
	KernelVersion: 2.6.37		KernelVersion: 2.6.37
	Contact: "Corentin Chary" <corentincj@iksaif.net>		Contact: "Corentin Chary" <corentincj@iksaif.net>
	@@ -8,3 +8,24 @@ Description:
	* 0 -> Super Performance Mode		* 0 -> Super Performance Mode
	* 1 -> High Performance Mode		* 1 -> High Performance Mode
	* 2 -> Power Saving Mode		* 2 -> Power Saving Mode

			What: /sys/devices/platform/<platform>/camera
			Date: Jan 2010
			KernelVersion: 2.6.39
			Contact: "Corentin Chary" <corentincj@iksaif.net>
			Description:
			Control the camera. 1 means on, 0 means off.

			What: /sys/devices/platform/<platform>/cardr
			Date: Jan 2010
			KernelVersion: 2.6.39
			Contact: "Corentin Chary" <corentincj@iksaif.net>
			Description:
			Control the card reader. 1 means on, 0 means off.

			What: /sys/devices/platform/<platform>/touchpad
			Date: Jan 2010
			KernelVersion: 2.6.39
			Contact: "Corentin Chary" <corentincj@iksaif.net>
			Description:
			Control the card touchpad. 1 means on, 0 means off.

Documentation/laptops/sony-laptop.txt

+30 −7

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,8 @@ 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		reported both through the ACPI subsystem as acpi events and through the INPUT
	subsystem. See the logs of acpid or /proc/acpi/event and		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		/proc/bus/input/devices to find out what those events are and which input
	devices are created by the driver.		devices are created by the driver. Additionally, loading the driver with the
			debug option will report all events in the kernel log.

	Backlight control:		Backlight control:
	------------------		------------------
	@@ -64,6 +65,16 @@ powers off the sound card,
	# echo "1" > /sys/devices/platform/sony-laptop/audiopower		# echo "1" > /sys/devices/platform/sony-laptop/audiopower
	powers on the sound card.		powers on the sound card.


			RFkill control:
			---------------
			More recent Vaio models expose a consistent set of ACPI methods to
			control radio frequency emitting devices. If you are a lucky owner of
			such a laptop you will find the necessary rfkill devices under
			/sys/class/rfkill. Check those starting with sony-* in
			# grep . /sys/class/rfkill/*/{state,name}


	Development:		Development:
	------------		------------

	@@ -75,8 +86,21 @@ pass the option 'debug=1'.
	REPEAT: DON'T DO THIS IF YOU DON'T LIKE RISKY BUSINESS.		REPEAT: DON'T DO THIS IF YOU DON'T LIKE RISKY BUSINESS.

	In your kernel logs you will find the list of all ACPI methods		In your kernel logs you will find the list of all ACPI methods
	the SNC device has on your laptop. You can see the GCDP/GCDP methods		the SNC device has on your laptop.
	used to pwer on/off the CD drive, but there are others.
			* For new models you will see a long list of meaningless method names,
			reading the DSDT table source should reveal that:
			(1) the SNC device uses an internal capability lookup table
			(2) SN00 is used to find values in the lookup table
			(3) SN06 and SN07 are used to call into the real methods based on
			offsets you can obtain iterating the table using SN00
			(4) SN02 used to enable events.
			Some values in the capability lookup table are more or less known, see
			the code for all sony_call_snc_handle calls, others are more obscure.

			* For old models you can see the GCDP/GCDP methods used to pwer on/off
			the CD drive, but there are others and they are usually different from
			model to model.

	I HAVE NO IDEA WHAT THOSE METHODS DO.		I HAVE NO IDEA WHAT THOSE METHODS DO.

	@@ -108,9 +132,8 @@ Bugs/Limitations:
	laptop, including permanent damage.		laptop, including permanent damage.

	* The sony-laptop and sonypi drivers do not interact at all. In the		* The sony-laptop and sonypi drivers do not interact at all. In the
	future, sonypi could use sony-laptop to do (part of) its business.		future, sonypi will be removed and replaced by sony-laptop.

	* spicctrl, which is the userspace tool used to communicate with the		* spicctrl, which is the userspace tool used to communicate with the
	sonypi driver (through /dev/sonypi) does not try to use the		sonypi driver (through /dev/sonypi) is deprecated as well since all
	sony-laptop driver. In the future, spicctrl could try sonypi first,		its features are now available under the sysfs tree via sony-laptop.
	and if it isn't present, try sony-laptop instead.

MAINTAINERS

+3 −27

Original line number	Original line	Diff line number	Diff line
	@@ -1157,14 +1157,14 @@ S: Maintained
	F: Documentation/hwmon/asc7621		F: Documentation/hwmon/asc7621
	F: drivers/hwmon/asc7621.c		F: drivers/hwmon/asc7621.c

	ASUS ACPI EXTRAS DRIVER		ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
	M: Corentin Chary <corentincj@iksaif.net>		M: Corentin Chary <corentincj@iksaif.net>
	M: Karol Kozimor <sziwan@users.sourceforge.net>
	L: acpi4asus-user@lists.sourceforge.net		L: acpi4asus-user@lists.sourceforge.net
	L: platform-driver-x86@vger.kernel.org		L: platform-driver-x86@vger.kernel.org
	W: http://acpi4asus.sf.net		W: http://acpi4asus.sf.net
	S: Maintained		S: Maintained
	F: drivers/platform/x86/asus_acpi.c		F: drivers/platform/x86/asus*.c
			F: drivers/platform/x86/eeepc*.c

	ASUS ASB100 HARDWARE MONITOR DRIVER		ASUS ASB100 HARDWARE MONITOR DRIVER
	M: "Mark M. Hoffman" <mhoffman@lightlink.com>		M: "Mark M. Hoffman" <mhoffman@lightlink.com>
	@@ -1172,14 +1172,6 @@ L: lm-sensors@lm-sensors.org
	S: Maintained		S: Maintained
	F: drivers/hwmon/asb100.c		F: drivers/hwmon/asb100.c

	ASUS LAPTOP EXTRAS DRIVER
	M: Corentin Chary <corentincj@iksaif.net>
	L: acpi4asus-user@lists.sourceforge.net
	L: platform-driver-x86@vger.kernel.org
	W: http://acpi4asus.sf.net
	S: Maintained
	F: drivers/platform/x86/asus-laptop.c

	ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API		ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
	M: Dan Williams <dan.j.williams@intel.com>		M: Dan Williams <dan.j.williams@intel.com>
	W: http://sourceforge.net/projects/xscaleiop		W: http://sourceforge.net/projects/xscaleiop
	@@ -2414,22 +2406,6 @@ T: git git://git.alsa-project.org/alsa-kernel.git
	S: Maintained		S: Maintained
	F: sound/usb/misc/ua101.c		F: sound/usb/misc/ua101.c

	EEEPC LAPTOP EXTRAS DRIVER
	M: Corentin Chary <corentincj@iksaif.net>
	L: acpi4asus-user@lists.sourceforge.net
	L: platform-driver-x86@vger.kernel.org
	W: http://acpi4asus.sf.net
	S: Maintained
	F: drivers/platform/x86/eeepc-laptop.c

	EEEPC WMI EXTRAS DRIVER
	M: Corentin Chary <corentincj@iksaif.net>
	L: acpi4asus-user@lists.sourceforge.net
	L: platform-driver-x86@vger.kernel.org
	W: http://acpi4asus.sf.net
	S: Maintained
	F: drivers/platform/x86/eeepc-wmi.c

	EFIFB FRAMEBUFFER DRIVER		EFIFB FRAMEBUFFER DRIVER
	L: linux-fbdev@vger.kernel.org		L: linux-fbdev@vger.kernel.org
	M: Peter Jones <pjones@redhat.com>		M: Peter Jones <pjones@redhat.com>

Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 38		SUBLEVEL = 39
	EXTRAVERSION =		EXTRAVERSION = -rc1
	NAME = Flesh-Eating Bats with Fangs		NAME = Flesh-Eating Bats with Fangs

	# DOCUMENTATION		# DOCUMENTATION