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

Commit fbaab1dc 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: (44 commits)
  eeepc-wmi: Add cpufv sysfs interface
  eeepc-wmi: add additional hotkeys
  panasonic-laptop: Simplify calls to acpi_pcc_retrieve_biosdata
  panasonic-laptop: Handle errors properly if they happen
  intel_pmic_gpio: fix off-by-one value range checking
  IBM Real-Time "SMI Free" mode driver -v7
  Add OLPC XO-1 rfkill driver
  Move hdaps driver to platform/x86
  ideapad-laptop: Fix Makefile
  intel_pmic_gpio: swap the bits and mask args for intel_scu_ipc_update_register
  ideapad: Add param: no_bt_rfkill
  ideapad: Change the driver name to ideapad-laptop
  ideapad: rewrite the sw rfkill set
  ideapad: rewrite the hw rfkill notify
  ideapad: use EC command to control camera
  ideapad: use return value of _CFG to tell if device exist or not
  ideapad: make sure we bind on the correct device
  ideapad: check VPC bit before sync rfkill hw status
  ideapad: add ACPI helpers
  dell-laptop: Add debugfs support
  ...
parents 51f00a47 7f80d734

Documentation/ABI/testing/sysfs-devices-system-ibm-rtl

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 
What:           state

Date:           Sep 2010

KernelVersion:  2.6.37

Contact:        Vernon Mauery <vernux@us.ibm.com>

Description:    The state file allows a means by which to change in and

                out of Premium Real-Time Mode (PRTM), as well as the

                ability to query the current state.

                    0 => PRTM off

                    1 => PRTM enabled

Users:          The ibm-prtm userspace daemon uses this interface.





What:           version

Date:           Sep 2010

KernelVersion:  2.6.37

Contact:        Vernon Mauery <vernux@us.ibm.com>

Description:    The version file provides a means by which to query

                the RTL table version that lives in the Extended

                BIOS Data Area (EBDA).

Users:          The ibm-prtm userspace daemon uses this interface.

MAINTAINERS

+2 −2
Original line number Original line Diff line number Diff line
@@ -2646,10 +2646,10 @@ F: drivers/net/greth* 




HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER

HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER

M:	Frank Seidel <frank@f-seidel.de>

M:	Frank Seidel <frank@f-seidel.de>

L:	lm-sensors@lm-sensors.org

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

W:	http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/

W:	http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/

S:	Maintained

S:	Maintained

F:	drivers/hwmon/hdaps.c

F:	drivers/platform/x86/hdaps.c





HWPOISON MEMORY FAILURE HANDLING

HWPOISON MEMORY FAILURE HANDLING

M:	Andi Kleen <andi@firstfloor.org>

M:	Andi Kleen <andi@firstfloor.org>

arch/x86/include/asm/olpc.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -89,6 +89,8 @@ extern int olpc_ec_mask_unset(uint8_t bits); 
/* EC commands */

/* EC commands */





#define EC_FIRMWARE_REV		0x08

#define EC_FIRMWARE_REV		0x08

#define EC_WLAN_ENTER_RESET	0x35

#define EC_WLAN_LEAVE_RESET	0x25





/* SCI source values */

/* SCI source values */

drivers/hwmon/Kconfig

+0 −20
Original line number Original line Diff line number Diff line
@@ -1088,26 +1088,6 @@ config SENSORS_ULTRA45 
	  This driver provides support for the Ultra45 workstation environmental

	  This driver provides support for the Ultra45 workstation environmental

	  sensors.

	  sensors.





config SENSORS_HDAPS

	tristate "IBM Hard Drive Active Protection System (hdaps)"

	depends on INPUT && X86

	select INPUT_POLLDEV

	default n

	help

	  This driver provides support for the IBM Hard Drive Active Protection

	  System (hdaps), which provides an accelerometer and other misc. data.

	  ThinkPads starting with the R50, T41, and X40 are supported.  The

	  accelerometer data is readable via sysfs.



	  This driver also provides an absolute input class device, allowing

	  the laptop to act as a pinball machine-esque joystick.



	  If your ThinkPad is not recognized by the driver, please update to latest

	  BIOS. This is especially the case for some R52 ThinkPads.



	  Say Y here if you have an applicable laptop and want to experience

	  the awesome power of hdaps.



config SENSORS_LIS3_SPI

config SENSORS_LIS3_SPI

	tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)"

	tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)"

	depends on !ACPI && SPI_MASTER && INPUT

	depends on !ACPI && SPI_MASTER && INPUT

drivers/hwmon/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,6 @@ obj-$(CONFIG_SENSORS_G760A) += g760a.o 
obj-$(CONFIG_SENSORS_GL518SM)	+= gl518sm.o

obj-$(CONFIG_SENSORS_GL518SM)	+= gl518sm.o

obj-$(CONFIG_SENSORS_GL520SM)	+= gl520sm.o

obj-$(CONFIG_SENSORS_GL520SM)	+= gl520sm.o

obj-$(CONFIG_SENSORS_ULTRA45)	+= ultra45_env.o

obj-$(CONFIG_SENSORS_ULTRA45)	+= ultra45_env.o

obj-$(CONFIG_SENSORS_HDAPS)	+= hdaps.o

obj-$(CONFIG_SENSORS_I5K_AMB)	+= i5k_amb.o

obj-$(CONFIG_SENSORS_I5K_AMB)	+= i5k_amb.o

obj-$(CONFIG_SENSORS_IBMAEM)	+= ibmaem.o

obj-$(CONFIG_SENSORS_IBMAEM)	+= ibmaem.o

obj-$(CONFIG_SENSORS_IBMPEX)	+= ibmpex.o

obj-$(CONFIG_SENSORS_IBMPEX)	+= ibmpex.o