Commit b037bba7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of... 

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (45 commits)
  compal-laptop: Make it depend on CONFIG_RFKILL
  classmate-laptop: Added some keys present in other devices
  MAINTAINERS: Add git tree to x86 Platform Drivers
  asus-acpi: remove duplicate comparison of asus_model strings
  toshiba-acpi: fix multimedia keys on some machines
  dell-laptop: Fix errors on failure and exit paths
  dell-laptop: Fix build error by making buffer_mutex static
  asus-laptop: fix style problems reported by checkpath.pl
  asus-laptop: use device_create_file() instead of platform_group
  asus-laptop: clean led code
  asus-laptop: add gps rfkill
  asus-laptop: set initial lcd state
  asus-laptop: leds, remove dead code and fix asus_led_exit()/asus_led_init()
  asus-laptop: add backlight changes notifications
  asus-laptop: add bluetooth keys found on M9V
  asus-laptop: switch to sparse keymap library
  asus-laptop: rename wireless_status to wlan_status to avoid confusion
  asus-laptop: add error check for write_acpi_int calls
  asus-laptop: stop using ASUS_HANDLE and use relative methods instead
  asus-laptop: rename function talking directly to acpi with asus_xxx scheme
  ...
parents a03696e9 51c1410b

Documentation/ABI/testing/sysfs-platform-asus-laptop

+6 −6
Original line number Diff line number Diff line 
What:		/sys/devices/platform/asus-laptop/display

What:		/sys/devices/platform/asus_laptop/display

Date:		January 2007

KernelVersion:	2.6.20

Contact:	"Corentin Chary" <corentincj@iksaif.net>
@@ -13,7 +13,7 @@ Description: 
		Ex: - 0 (0000b) means no display

		    - 3 (0011b) CRT+LCD.



What:		/sys/devices/platform/asus-laptop/gps

What:		/sys/devices/platform/asus_laptop/gps

Date:		January 2007

KernelVersion:	2.6.20

Contact:	"Corentin Chary" <corentincj@iksaif.net>
@@ -21,7 +21,7 @@ Description: 
		Control the gps device. 1 means on, 0 means off.

Users:		Lapsus



What:		/sys/devices/platform/asus-laptop/ledd

What:		/sys/devices/platform/asus_laptop/ledd

Date:		January 2007

KernelVersion:	2.6.20

Contact:	"Corentin Chary" <corentincj@iksaif.net>
@@ -29,11 +29,11 @@ Description: 
		Some models like the W1N have a LED display that can be

		used to display several informations.

		To control the LED display, use the following :

		    echo 0x0T000DDD > /sys/devices/platform/asus-laptop/

		    echo 0x0T000DDD > /sys/devices/platform/asus_laptop/

		where T control the 3 letters display, and DDD the 3 digits display.

		The DDD table can be found in Documentation/laptops/asus-laptop.txt



What:		/sys/devices/platform/asus-laptop/bluetooth

What:		/sys/devices/platform/asus_laptop/bluetooth

Date:		January 2007

KernelVersion:	2.6.20

Contact:	"Corentin Chary" <corentincj@iksaif.net>
@@ -42,7 +42,7 @@ Description: 
		This may control the led, the device or both.

Users:		Lapsus



What:		/sys/devices/platform/asus-laptop/wlan

What:		/sys/devices/platform/asus_laptop/wlan

Date:		January 2007

KernelVersion:	2.6.20

Contact:	"Corentin Chary" <corentincj@iksaif.net>

Documentation/ABI/testing/sysfs-platform-eeepc-laptop

+5 −5
Original line number Diff line number Diff line 
What:		/sys/devices/platform/eeepc-laptop/disp

What:		/sys/devices/platform/eeepc/disp

Date:		May 2008

KernelVersion:	2.6.26

Contact:	"Corentin Chary" <corentincj@iksaif.net>
@@ -9,21 +9,21 @@ Description: 
		- 3 = LCD+CRT

		If you run X11, you should use xrandr instead.



What:		/sys/devices/platform/eeepc-laptop/camera

What:		/sys/devices/platform/eeepc/camera

Date:		May 2008

KernelVersion:	2.6.26

Contact:	"Corentin Chary" <corentincj@iksaif.net>

Description:

		Control the camera. 1 means on, 0 means off.



What:		/sys/devices/platform/eeepc-laptop/cardr

What:		/sys/devices/platform/eeepc/cardr

Date:		May 2008

KernelVersion:	2.6.26

Contact:	"Corentin Chary" <corentincj@iksaif.net>

Description:

		Control the card reader. 1 means on, 0 means off.



What:		/sys/devices/platform/eeepc-laptop/cpufv

What:		/sys/devices/platform/eeepc/cpufv

Date:		Jun 2009

KernelVersion:	2.6.31

Contact:	"Corentin Chary" <corentincj@iksaif.net>
@@ -42,7 +42,7 @@ Description: 
		    `------------ Availables modes

		For example, 0x301 means: mode 1 selected, 3 available modes.



What:		/sys/devices/platform/eeepc-laptop/available_cpufv

What:		/sys/devices/platform/eeepc/available_cpufv

Date:		Jun 2009

KernelVersion:	2.6.31

Contact:	"Corentin Chary" <corentincj@iksaif.net>

Documentation/laptops/thinkpad-acpi.txt

+4 −0
Original line number Diff line number Diff line
@@ -650,6 +650,10 @@ LCD, CRT or DVI (if available). The following commands are available: 
	echo expand_toggle > /proc/acpi/ibm/video

	echo video_switch > /proc/acpi/ibm/video



NOTE: Access to this feature is restricted to processes owning the

CAP_SYS_ADMIN capability for safety reasons, as it can interact badly

enough with some versions of X.org to crash it.



Each video output device can be enabled or disabled individually.

Reading /proc/acpi/ibm/video shows the status of each device.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6097,6 +6097,7 @@ F: arch/x86/ 
X86 PLATFORM DRIVERS

M:	Matthew Garrett <mjg@redhat.com>

L:	platform-driver-x86@vger.kernel.org

T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git

S:	Maintained

F:	drivers/platform/x86

drivers/platform/x86/Kconfig

+11 −2
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ config ASUS_LAPTOP 
	select NEW_LEDS

	select BACKLIGHT_CLASS_DEVICE

	depends on INPUT

	depends on RFKILL || RFKILL = n

	select INPUT_SPARSEKMAP

	---help---

	  This is the new Linux driver for Asus laptops. It may also support some

	  MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
@@ -177,6 +179,7 @@ config COMPAL_LAPTOP 
	tristate "Compal Laptop Extras"

	depends on ACPI

	depends on BACKLIGHT_CLASS_DEVICE

	depends on RFKILL

	---help---

	  This is a driver for laptops built by Compal:
@@ -320,9 +323,15 @@ config THINKPAD_ACPI_VIDEO 
	  server running, phase of the moon, and the current mood of

	  Schroedinger's cat.  If you can use X.org's RandR to control

	  your ThinkPad's video output ports instead of this feature,

	  don't think twice: do it and say N here to save some memory.

	  don't think twice: do it and say N here to save memory and avoid

	  bad interactions with X.org.



	  NOTE: access to this feature is limited to processes with the

	  CAP_SYS_ADMIN capability, to avoid local DoS issues in platforms

	  where it interacts badly with X.org.



	  If you are not sure, say Y here.

	  If you are not sure, say Y here but do try to check if you could

	  be using X.org RandR instead.



config THINKPAD_ACPI_HOTKEY_POLL

	bool "Support NVRAM polling for hot keys"

CRA Git | Maintained and supported by SUSTech CRA and CCSE