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

Commit d77d9597 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:
  thinkpad-acpi fails to load with newer Thinkpad X201s BIOS
  acer-wmi: Fix capitalisation of GUID in module alias
  sony-laptop: keyboard backlight fixes
  sony-laptop: only show the handles sysfs file in debug mode
  samsung-laptop: set backlight type
  staging: samsung-laptop has moved to platform/x86
  samsung-laptop: Samsung R410P backlight driver
  samsung-laptop: add support for N230 model
  platform-drivers: x86: pmic: Restore the dropped buslock/unlock
  sony-laptop: fix early NULL pointer dereference
  msi-laptop: fix config-dependent build error
  eeepc-wmi: add keys found on EeePC 1215T
  asus-wmi: swap input name and phys
  asus-laptop: remove removed features from feature-removal-schedule.txt
parents 0bba0169 b569ab39

Documentation/feature-removal-schedule.txt

+0 −20
Original line number Diff line number Diff line
@@ -387,26 +387,6 @@ Who: Tejun Heo <tj@kernel.org> 


----------------------------



What:	Support for lcd_switch and display_get in asus-laptop driver

When:	March 2010

Why:	These two features use non-standard interfaces. There are the

	only features that really need multiple path to guess what's

	the right method name on a specific laptop.



	Removing them will allow to remove a lot of code an significantly

	clean the drivers.



	This will affect the backlight code which won't be able to know

	if the backlight is on or off. The platform display file will also be

	write only (like the one in eeepc-laptop).



	This should'nt affect a lot of user because they usually know

	when their display is on or off.



Who:	Corentin Chary <corentin.chary@gmail.com>



----------------------------



What:	sysfs-class-rfkill state file

When:	Feb 2014

Files:	net/rfkill/core.c

drivers/platform/x86/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ config MSI_LAPTOP 
	depends on ACPI

	depends on BACKLIGHT_CLASS_DEVICE

	depends on RFKILL

	depends on SERIO_I8042

	depends on INPUT && SERIO_I8042

	select INPUT_SPARSEKMAP

	---help---

	  This is a driver for laptops built by MSI (MICRO-STAR

	  INTERNATIONAL):

drivers/platform/x86/acer-wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ MODULE_LICENSE("GPL"); 
#define ACERWMID_EVENT_GUID "676AA15E-6A47-4D9F-A2CC-1E6D18D14026"



MODULE_ALIAS("wmi:67C3371D-95A3-4C37-BB61-DD47B491DAAB");

MODULE_ALIAS("wmi:6AF4F258-B401-42Fd-BE91-3D4AC2D7C0D3");

MODULE_ALIAS("wmi:6AF4F258-B401-42FD-BE91-3D4AC2D7C0D3");

MODULE_ALIAS("wmi:676AA15E-6A47-4D9F-A2CC-1E6D18D14026");



enum acer_wmi_event_ids {

drivers/platform/x86/asus-wmi.c

+2 −2
Original line number Diff line number Diff line
@@ -201,8 +201,8 @@ static int asus_wmi_input_init(struct asus_wmi *asus) 
	if (!asus->inputdev)

		return -ENOMEM;



	asus->inputdev->name = asus->driver->input_phys;

	asus->inputdev->phys = asus->driver->input_name;

	asus->inputdev->name = asus->driver->input_name;

	asus->inputdev->phys = asus->driver->input_phys;

	asus->inputdev->id.bustype = BUS_HOST;

	asus->inputdev->dev.parent = &asus->platform_device->dev;

drivers/platform/x86/eeepc-wmi.c

+2 −0
Original line number Diff line number Diff line
@@ -67,9 +67,11 @@ static const struct key_entry eeepc_wmi_keymap[] = { 
	{ KE_KEY, 0x82, { KEY_CAMERA } },

	{ KE_KEY, 0x83, { KEY_CAMERA_ZOOMIN } },

	{ KE_KEY, 0x88, { KEY_WLAN } },

	{ KE_KEY, 0xbd, { KEY_CAMERA } },

	{ KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } },

	{ KE_KEY, 0xe0, { KEY_PROG1 } }, /* Task Manager */

	{ KE_KEY, 0xe1, { KEY_F14 } }, /* Change Resolution */

	{ KE_KEY, 0xe8, { KEY_SCREENLOCK } },

	{ KE_KEY, 0xe9, { KEY_BRIGHTNESS_ZERO } },

	{ KE_KEY, 0xeb, { KEY_CAMERA_ZOOMOUT } },

	{ KE_KEY, 0xec, { KEY_CAMERA_UP } },