Commit 63345b47 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 

Pull x86 platform driver updates from Matthew Garrett:
 "Nothing overly exciting here - a couple of new drivers that don't do a
  great deal, along with some miscellaneous fixes and a couple of small
  feature enablement patches"

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
  x86 platform drivers: fix gpio leak
  toshiba_acpi: Add dependency on SERIO_I8042
  asus-nb-wmi: set wapf=4 for ASUSTeK COMPUTER INC. 1015E/U
  Add trivial driver to disable Intel Smart Connect
  Add support driver for Intel Rapid Start Technology
  hp-wmi: add supports for POST code error
  asus-wmi: control wlan-led only if wapf == 4
  drivers/platform/x86/intel_ips: Convert to module_pci_driver
  asus-nb-wmi: ignore ALS notification key code
  asus-wmi: append newline to messages
  x86: asus-laptop: fix invalid point access
  x86: msi-laptop: fix memleak
  amilo-rfkill: Add dependency on SERIO_I8042
  dell-laptop: fix error return code in dell_init()
  hp-wmi: Enable hotkeys on some systems
parents 18fb38e2 fef8ce16

Documentation/ABI/testing/sysfs-driver-intel-rapid-start

0 → 100644
+21 −0
Original line number Diff line number Diff line 
What:		/sys/bus/acpi/intel-rapid-start/wakeup_events

Date:		July 2, 2013

KernelVersion:	3.11

Contact:	Matthew Garrett <mjg59@srcf.ucam.org>

Description:	An integer representing a set of wakeup events as follows:

		1: Wake to enter hibernation when the wakeup timer expires

		2: Wake to enter hibernation when the battery reaches a

		critical level



		These values are ORed together. For example, a value of 3

		indicates that the system will wake to enter hibernation when

		either the wakeup timer expires or the battery reaches a

		critical level.



What:		/sys/bus/acpi/intel-rapid-start/wakeup_time

Date:		July 2, 2013

KernelVersion:	3.11

Contact:	Matthew Garrett <mjg59@srcf.ucam.org>

Description:	An integer representing the length of time the system will

		remain asleep before waking up to enter hibernation.

		This value is in minutes.

drivers/platform/x86/Kconfig

+28 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ config FUJITSU_TABLET 
config AMILO_RFKILL

	tristate "Fujitsu-Siemens Amilo rfkill support"

	depends on RFKILL

	depends on SERIO_I8042

	---help---

	  This is a driver for enabling wifi on some Fujitsu-Siemens Amilo

	  laptops.
@@ -591,6 +592,7 @@ config ACPI_TOSHIBA 
	depends on BACKLIGHT_CLASS_DEVICE

	depends on INPUT

	depends on RFKILL || RFKILL = n

	depends on SERIO_I8042 || SERIO_I8042 = n

	select INPUT_POLLDEV

	select INPUT_SPARSEKMAP

	---help---
@@ -781,6 +783,32 @@ config APPLE_GMUX 
	  graphics as well as the backlight. Currently only backlight

	  control is supported by the driver.



config INTEL_RST

        tristate "Intel Rapid Start Technology Driver"

	depends on ACPI

	---help---

	  This driver provides support for modifying paramaters on systems

	  equipped with Intel's Rapid Start Technology. When put in an ACPI

	  sleep state, these devices will wake after either a configured

	  timeout or when the system battery reaches a critical state,

	  automatically copying memory contents to disk. On resume, the

	  firmware will copy the memory contents back to RAM and resume the OS

	  as usual.



config INTEL_SMARTCONNECT

        tristate "Intel Smart Connect disabling driver"

	depends on ACPI

	---help---

	  Intel Smart Connect is a technology intended to permit devices to

	  update state by resuming for a short period of time at regular

	  intervals. If a user enables this functionality under Windows and

	  then reboots into Linux, the system may remain configured to resume

	  on suspend. In the absence of any userspace to support it, the system

	  will then remain awake until something triggers another suspend.



	  This driver checks to determine whether the device has Intel Smart

	  Connect enabled, and if so disables it.



config PVPANIC

	tristate "pvpanic device support"

	depends on ACPI

drivers/platform/x86/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -51,5 +51,7 @@ obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o 
obj-$(CONFIG_SAMSUNG_Q10)	+= samsung-q10.o

obj-$(CONFIG_APPLE_GMUX)	+= apple-gmux.o

obj-$(CONFIG_CHROMEOS_LAPTOP)	+= chromeos_laptop.o

obj-$(CONFIG_INTEL_RST)		+= intel-rst.o

obj-$(CONFIG_INTEL_SMARTCONNECT)	+= intel-smartconnect.o



obj-$(CONFIG_PVPANIC)           += pvpanic.o

drivers/platform/x86/asus-laptop.c

+0 −1
Original line number Diff line number Diff line
@@ -1935,7 +1935,6 @@ fail_input: 
fail_backlight:

	asus_platform_exit(asus);

fail_platform:

	kfree(asus->name);

	kfree(asus);



	return result;

drivers/platform/x86/asus-nb-wmi.c

+19 −0
Original line number Diff line number Diff line
@@ -180,6 +180,24 @@ static struct dmi_system_id asus_quirks[] = { 
		},

		.driver_data = &quirk_asus_x401u,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. 1015E",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "1015E"),

		},

		.driver_data = &quirk_asus_x401u,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. 1015U",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "1015U"),

		},

		.driver_data = &quirk_asus_x401u,

	},

	{},

};
@@ -256,6 +274,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { 
	{ KE_KEY, 0xB5, { KEY_CALC } },

	{ KE_KEY, 0xC4, { KEY_KBDILLUMUP } },

	{ KE_KEY, 0xC5, { KEY_KBDILLUMDOWN } },

	{ KE_IGNORE, 0xC6, },  /* Ambient Light Sensor notification */

	{ KE_END, 0},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE