Commit 23caaeea 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:
 "Mostly relatively small updates, along with some hardware enablement
  for Sony hardware and a pile of updates to Google's Chromebook driver"

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (49 commits)
  ideapad-laptop: Depend on BACKLIGHT_CLASS_DEVICE instead of selecting it
  ideapad: depends on backlight subsystem and update comment
  Platform: x86: chromeos_laptop - add i915 gmbuses to adapter names
  Platform: x86: chromeos_laptop - Add isl light sensor for Pixel
  Platform: x86: chromeos_laptop - Add a more general add_i2c_device
  Platform: x86: chromeos_laptop - Add Pixel Touchscreen
  Platform: x86: chromeos_laptop - Add support for probing devices
  Platform: x86: chromeos_laptop - Add Pixel Trackpad
  hp-wmi: fix handling of platform device
  sony-laptop: leak in error handling sony_nc_lid_resume_setup()
  hp-wmi: Add support for SMBus hotkeys
  asus-wmi: Fix unused function build warning
  acer-wmi: avoid the warning of 'devices' may be used uninitialized
  drivers/platform/x86/thinkpad_acpi.c: Handle HKEY event 0x6040
  Platform: x86: chromeos_laptop - Add HP Pavilion 14
  Platform: x86: chromeos_laptop - Add Taos tsl2583 device
  Platform: x86: chromeos_laptop - Add Taos tsl2563 device
  Platform: x86: chromeos_laptop - Add Acer C7 trackpad
  Platform: x86: chromeos_laptop - Rename setup_lumpy_tp to setup_cyapa_smbus_tp
  asus-laptop: always report brightness key events
  ...
parents a7c1120d 445e8d00

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

0 → 100644
+83 −0
Original line number Diff line number Diff line 
What:		/sys/devices/platform/msi-laptop-pf/lcd_level

Date:		Oct 2006

KernelVersion:	2.6.19

Contact:	"Lennart Poettering <mzxreary@0pointer.de>"

Description:

		Screen brightness: contains a single integer in the range 0..8.



What:		/sys/devices/platform/msi-laptop-pf/auto_brightness

Date:		Oct 2006

KernelVersion:	2.6.19

Contact:	"Lennart Poettering <mzxreary@0pointer.de>"

Description:

		Enable automatic brightness control: contains either 0 or 1. If

		set to 1 the hardware adjusts the screen brightness

		automatically when the power cord is plugged/unplugged.



What:		/sys/devices/platform/msi-laptop-pf/wlan

Date:		Oct 2006

KernelVersion:	2.6.19

Contact:	"Lennart Poettering <mzxreary@0pointer.de>"

Description:

		WLAN subsystem enabled: contains either 0 or 1.



What:		/sys/devices/platform/msi-laptop-pf/bluetooth

Date:		Oct 2006

KernelVersion:	2.6.19

Contact:	"Lennart Poettering <mzxreary@0pointer.de>"

Description:

		Bluetooth subsystem enabled: contains either 0 or 1. Please

		note that this file is constantly 0 if no Bluetooth hardware is

		available.



What:		/sys/devices/platform/msi-laptop-pf/touchpad

Date:		Nov 2012

KernelVersion:	3.8

Contact:	"Maxim Mikityanskiy <maxtram95@gmail.com>"

Description:

		Contains either 0 or 1 and indicates if touchpad is turned on.

		Touchpad state can only be toggled by pressing Fn+F3.



What:		/sys/devices/platform/msi-laptop-pf/turbo_mode

Date:		Nov 2012

KernelVersion:	3.8

Contact:	"Maxim Mikityanskiy <maxtram95@gmail.com>"

Description:

		Contains either 0 or 1 and indicates if turbo mode is turned

		on. In turbo mode power LED is orange and processor is

		overclocked. Turbo mode is available only if charging. It is

		only possible to toggle turbo mode state by pressing Fn+F10,

		and there is a few seconds cooldown between subsequent toggles.

		If user presses Fn+F10 too frequent, turbo mode state is not

		changed.



What:		/sys/devices/platform/msi-laptop-pf/eco_mode

Date:		Nov 2012

KernelVersion:	3.8

Contact:	"Maxim Mikityanskiy <maxtram95@gmail.com>"

Description:

		Contains either 0 or 1 and indicates if ECO mode is turned on.

		In ECO mode power LED is green and userspace should do some

		powersaving actions. ECO mode is available only on battery

		power. ECO mode can only be toggled by pressing Fn+F10.



What:		/sys/devices/platform/msi-laptop-pf/turbo_cooldown

Date:		Nov 2012

KernelVersion:	3.8

Contact:	"Maxim Mikityanskiy <maxtram95@gmail.com>"

Description:

		Contains value in range 0..3:

			* 0 -> Turbo mode is off

			* 1 -> Turbo mode is on, cannot be turned off yet

			* 2 -> Turbo mode is off, cannot be turned on yet

			* 3 -> Turbo mode is on



What:		/sys/devices/platform/msi-laptop-pf/auto_fan

Date:		Nov 2012

KernelVersion:	3.8

Contact:	"Maxim Mikityanskiy <maxtram95@gmail.com>"

Description:

		Contains either 0 or 1 and indicates if fan speed is controlled

		automatically (1) or fan runs at maximal speed (0). Can be

		toggled in software.

drivers/platform/x86/Kconfig

+14 −1
Original line number Diff line number Diff line
@@ -79,6 +79,17 @@ config ASUS_LAPTOP 


	  If you have an ACPI-compatible ASUS laptop, say Y or M here.



config CHROMEOS_LAPTOP

	tristate "Chrome OS Laptop"

	depends on I2C

	depends on DMI

	---help---

	  This driver instantiates i2c and smbus devices such as

	  light sensors and touchpads.



	  If you have a supported Chromebook, choose Y or M here.

	  The module will be called chromeos_laptop.



config DELL_LAPTOP

	tristate "Dell Laptop Extras"

	depends on X86
@@ -288,9 +299,11 @@ config IDEAPAD_LAPTOP 
	depends on ACPI

	depends on RFKILL && INPUT

	depends on SERIO_I8042

	depends on BACKLIGHT_CLASS_DEVICE

	select INPUT_SPARSEKMAP

	help

	  This is a driver for the rfkill switches on Lenovo IdeaPad netbooks.

	  This is a driver for Lenovo IdeaPad netbooks contains drivers for

	  rfkill switch, hotkey, fan control and backlight control.



config THINKPAD_ACPI

	tristate "ThinkPad ACPI Laptop Extras"

drivers/platform/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -50,3 +50,4 @@ obj-$(CONFIG_INTEL_MID_POWER_BUTTON) += intel_mid_powerbtn.o 
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

drivers/platform/x86/acer-wmi.c

+21 −0
Original line number Diff line number Diff line
@@ -511,6 +511,24 @@ static struct dmi_system_id acer_quirks[] = { 
		},

		.driver_data = &quirk_fujitsu_amilo_li_1718,

	},

	{

		.callback = dmi_matched,

		.ident = "Lenovo Ideapad S205-10382JG",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "10382JG"),

		},

		.driver_data = &quirk_lenovo_ideapad_s205,

	},

	{

		.callback = dmi_matched,

		.ident = "Lenovo Ideapad S205-1038DPG",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "1038DPG"),

		},

		.driver_data = &quirk_lenovo_ideapad_s205,

	},

	{}

};
@@ -1204,6 +1222,9 @@ static acpi_status WMID_set_capabilities(void) 
			devices = *((u32 *) obj->buffer.pointer);

		} else if (obj->type == ACPI_TYPE_INTEGER) {

			devices = (u32) obj->integer.value;

		} else {

			kfree(out.pointer);

			return AE_ERROR;

		}

	} else {

		kfree(out.pointer);

drivers/platform/x86/asus-laptop.c

+58 −27
Original line number Diff line number Diff line
@@ -128,10 +128,12 @@ MODULE_PARM_DESC(als_status, "Set the ALS status on boot " 
/*

 * Some events we use, same for all Asus

 */

#define ATKD_BR_UP	0x10	/* (event & ~ATKD_BR_UP) = brightness level */

#define ATKD_BR_DOWN	0x20	/* (event & ~ATKD_BR_DOWN) = britghness level */

#define ATKD_BR_MIN	ATKD_BR_UP

#define ATKD_BR_MAX	(ATKD_BR_DOWN | 0xF)	/* 0x2f */

#define ATKD_BRNUP_MIN		0x10

#define ATKD_BRNUP_MAX		0x1f

#define ATKD_BRNDOWN_MIN	0x20

#define ATKD_BRNDOWN_MAX	0x2f

#define ATKD_BRNDOWN		0x20

#define ATKD_BRNUP		0x2f

#define ATKD_LCD_ON	0x33

#define ATKD_LCD_OFF	0x34
@@ -301,40 +303,65 @@ static const struct key_entry asus_keymap[] = { 
	{KE_KEY, 0x17, { KEY_ZOOM } },

	{KE_KEY, 0x1f, { KEY_BATTERY } },

	/* End of Lenovo SL Specific keycodes */

	{KE_KEY, ATKD_BRNDOWN, { KEY_BRIGHTNESSDOWN } },

	{KE_KEY, ATKD_BRNUP, { KEY_BRIGHTNESSUP } },

	{KE_KEY, 0x30, { KEY_VOLUMEUP } },

	{KE_KEY, 0x31, { KEY_VOLUMEDOWN } },

	{KE_KEY, 0x32, { KEY_MUTE } },

	{KE_KEY, 0x33, { KEY_SWITCHVIDEOMODE } },

	{KE_KEY, 0x34, { KEY_SWITCHVIDEOMODE } },

	{KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */

	{KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */

	{KE_KEY, 0x40, { KEY_PREVIOUSSONG } },

	{KE_KEY, 0x41, { KEY_NEXTSONG } },

	{KE_KEY, 0x43, { KEY_STOPCD } },

	{KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */

	{KE_KEY, 0x45, { KEY_PLAYPAUSE } },

	{KE_KEY, 0x4c, { KEY_MEDIA } },

	{KE_KEY, 0x4c, { KEY_MEDIA } }, /* WMP Key */

	{KE_KEY, 0x50, { KEY_EMAIL } },

	{KE_KEY, 0x51, { KEY_WWW } },

	{KE_KEY, 0x55, { KEY_CALC } },

	{KE_IGNORE, 0x57, },  /* Battery mode */

	{KE_IGNORE, 0x58, },  /* AC mode */

	{KE_KEY, 0x5C, { KEY_SCREENLOCK } },  /* Screenlock */

	{KE_KEY, 0x5D, { KEY_WLAN } },

	{KE_KEY, 0x5E, { KEY_WLAN } },

	{KE_KEY, 0x5F, { KEY_WLAN } },

	{KE_KEY, 0x60, { KEY_SWITCHVIDEOMODE } },

	{KE_KEY, 0x61, { KEY_SWITCHVIDEOMODE } },

	{KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } },

	{KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } },

	{KE_KEY, 0x6B, { KEY_F13 } }, /* Lock Touchpad */

	{KE_KEY, 0x5D, { KEY_WLAN } }, /* WLAN Toggle */

	{KE_KEY, 0x5E, { KEY_WLAN } }, /* WLAN Enable */

	{KE_KEY, 0x5F, { KEY_WLAN } }, /* WLAN Disable */

	{KE_KEY, 0x60, { KEY_TOUCHPAD_ON } },

	{KE_KEY, 0x61, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD only */

	{KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT only */

	{KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT */

	{KE_KEY, 0x64, { KEY_SWITCHVIDEOMODE } }, /* SDSP TV */

	{KE_KEY, 0x65, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + TV */

	{KE_KEY, 0x66, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + TV */

	{KE_KEY, 0x67, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV */

	{KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad */

	{KE_KEY, 0x6C, { KEY_SLEEP } }, /* Suspend */

	{KE_KEY, 0x6D, { KEY_SLEEP } }, /* Hibernate */

	{KE_KEY, 0x7E, { KEY_BLUETOOTH } },

	{KE_KEY, 0x7D, { KEY_BLUETOOTH } },

	{KE_IGNORE, 0x6E, },  /* Low Battery notification */

	{KE_KEY, 0x7D, { KEY_BLUETOOTH } }, /* Bluetooth Enable */

	{KE_KEY, 0x7E, { KEY_BLUETOOTH } }, /* Bluetooth Disable */

	{KE_KEY, 0x82, { KEY_CAMERA } },

	{KE_KEY, 0x88, { KEY_WLAN  } },

	{KE_KEY, 0x8A, { KEY_PROG1 } },

	{KE_KEY, 0x88, { KEY_RFKILL  } }, /* Radio Toggle Key */

	{KE_KEY, 0x8A, { KEY_PROG1 } }, /* Color enhancement mode */

	{KE_KEY, 0x8C, { KEY_SWITCHVIDEOMODE } }, /* SDSP DVI only */

	{KE_KEY, 0x8D, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + DVI */

	{KE_KEY, 0x8E, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + DVI */

	{KE_KEY, 0x8F, { KEY_SWITCHVIDEOMODE } }, /* SDSP TV + DVI */

	{KE_KEY, 0x90, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + DVI */

	{KE_KEY, 0x91, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + TV + DVI */

	{KE_KEY, 0x92, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + TV + DVI */

	{KE_KEY, 0x93, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV + DVI */

	{KE_KEY, 0x95, { KEY_MEDIA } },

	{KE_KEY, 0x99, { KEY_PHONE } },

	{KE_KEY, 0xc4, { KEY_KBDILLUMUP } },

	{KE_KEY, 0xc5, { KEY_KBDILLUMDOWN } },

	{KE_KEY, 0xb5, { KEY_CALC } },

	{KE_KEY, 0xA0, { KEY_SWITCHVIDEOMODE } }, /* SDSP HDMI only */

	{KE_KEY, 0xA1, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + HDMI */

	{KE_KEY, 0xA2, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + HDMI */

	{KE_KEY, 0xA3, { KEY_SWITCHVIDEOMODE } }, /* SDSP TV + HDMI */

	{KE_KEY, 0xA4, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + HDMI */

	{KE_KEY, 0xA5, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + TV + HDMI */

	{KE_KEY, 0xA6, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + TV + HDMI */

	{KE_KEY, 0xA7, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV + HDMI */

	{KE_KEY, 0xB5, { KEY_CALC } },

	{KE_KEY, 0xC4, { KEY_KBDILLUMUP } },

	{KE_KEY, 0xC5, { KEY_KBDILLUMDOWN } },

	{KE_END, 0},

};
@@ -1521,16 +1548,20 @@ static void asus_acpi_notify(struct acpi_device *device, u32 event) 
					dev_name(&asus->device->dev), event,

					count);



	/* Brightness events are special */

	if (event >= ATKD_BR_MIN && event <= ATKD_BR_MAX) {

	if (event >= ATKD_BRNUP_MIN && event <= ATKD_BRNUP_MAX)

		event = ATKD_BRNUP;

	else if (event >= ATKD_BRNDOWN_MIN &&

		 event <= ATKD_BRNDOWN_MAX)

		event = ATKD_BRNDOWN;



		/* Ignore them completely if the acpi video driver is used */

	/* Brightness events are special */

	if (event == ATKD_BRNDOWN || event == ATKD_BRNUP) {

		if (asus->backlight_device != NULL) {

			/* Update the backlight device. */

			asus_backlight_notify(asus);

		}

			return ;

		}

	}



	/* Accelerometer "coarse orientation change" event */

	if (asus->pega_accel_poll && event == 0xEA) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE