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

Commit 1b958a3e authored by Len Brown's avatar Len Brown
Browse files

Merge branches 'misc-up-now' and 'platform-drivers' into release

parents 27ce3419 da511997

drivers/platform/x86/Kconfig

+6 −8
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ menuconfig X86_PLATFORM_DEVICES 
if X86_PLATFORM_DEVICES



config ACER_WMI

	tristate "Acer WMI Laptop Extras (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	tristate "Acer WMI Laptop Extras"

	depends on ACPI

	depends on LEDS_CLASS

	depends on NEW_LEDS
@@ -39,9 +38,9 @@ config ASUS_LAPTOP 
	tristate "Asus Laptop Extras (EXPERIMENTAL)"

	depends on ACPI

	depends on EXPERIMENTAL && !ACPI_ASUS

	depends on LEDS_CLASS

	depends on NEW_LEDS

	depends on BACKLIGHT_CLASS_DEVICE

	select LEDS_CLASS

	select NEW_LEDS

	select BACKLIGHT_CLASS_DEVICE

	depends on INPUT

	---help---

	  This is the new Linux driver for Asus laptops. It may also support some
@@ -185,11 +184,11 @@ config SONYPI_COMPAT 
config THINKPAD_ACPI

	tristate "ThinkPad ACPI Laptop Extras"

	depends on ACPI

	depends on INPUT

	select BACKLIGHT_LCD_SUPPORT

	select BACKLIGHT_CLASS_DEVICE

	select HWMON

	select NVRAM

	select INPUT

	select NEW_LEDS

	select LEDS_CLASS

	select NET
@@ -315,9 +314,8 @@ config EEEPC_LAPTOP 




config ACPI_WMI

	tristate "WMI (EXPERIMENTAL)"

	tristate "WMI"

	depends on ACPI

	depends on EXPERIMENTAL

	help

	  This driver adds support for the ACPI-WMI (Windows Management

	  Instrumentation) mapper device (PNP0C14) found on some systems.

drivers/platform/x86/acer-wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -1026,7 +1026,7 @@ static void acer_rfkill_exit(void) 
	kfree(wireless_rfkill->data);

	rfkill_unregister(wireless_rfkill);

	if (has_cap(ACER_CAP_BLUETOOTH)) {

		kfree(wireless_rfkill->data);

		kfree(bluetooth_rfkill->data);

		rfkill_unregister(bluetooth_rfkill);

	}

	return;

drivers/platform/x86/asus-laptop.c

+4 −1
Original line number Diff line number Diff line
@@ -815,6 +815,7 @@ static int asus_setkeycode(struct input_dev *dev, int scancode, int keycode) 
static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)

{

	static struct key_entry *key;

	u16 count;



	/* TODO Find a better way to handle events count. */

	if (!hotk)
@@ -832,9 +833,11 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data) 
		lcd_blank(FB_BLANK_POWERDOWN);

	}



	count = hotk->event_count[event % 128]++;

	acpi_bus_generate_proc_event(hotk->device, event, count);

	acpi_bus_generate_netlink_event(hotk->device->pnp.device_class,

					dev_name(&hotk->device->dev), event,

					hotk->event_count[event % 128]++);

					count);



	if (hotk->inputdev) {

		key = asus_get_entry_by_scancode(event);

drivers/platform/x86/eeepc-laptop.c

+5 −1
Original line number Diff line number Diff line
@@ -557,13 +557,17 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data) 
static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)

{

	static struct key_entry *key;

	u16 count;



	if (!ehotk)

		return;

	if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX)

		notify_brn();

	count = ehotk->event_count[event % 128]++;

	acpi_bus_generate_proc_event(ehotk->device, event, count);

	acpi_bus_generate_netlink_event(ehotk->device->pnp.device_class,

					dev_name(&ehotk->device->dev), event,

					ehotk->event_count[event % 128]++);

					count);

	if (ehotk->inputdev) {

		key = eepc_get_entry_by_scancode(event);

		if (key) {

drivers/platform/x86/thinkpad_acpi.c

+4 −4
Original line number Diff line number Diff line
@@ -7532,7 +7532,7 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME); 
 * if it is not there yet.

 */

#define IBM_BIOS_MODULE_ALIAS(__type) \

	MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW")

	MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*")



/* Non-ancient thinkpads */

MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*");
@@ -7541,9 +7541,9 @@ MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*"); 
/* Ancient thinkpad BIOSes have to be identified by

 * BIOS type or model number, and there are far less

 * BIOS types than model numbers... */

IBM_BIOS_MODULE_ALIAS("I[B,D,H,I,M,N,O,T,W,V,Y,Z]");

IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]");

IBM_BIOS_MODULE_ALIAS("K[U,X-Z]");

IBM_BIOS_MODULE_ALIAS("I[BDHIMNOTWVYZ]");

IBM_BIOS_MODULE_ALIAS("1[0368A-GIKM-PST]");

IBM_BIOS_MODULE_ALIAS("K[UX-Z]");



MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh");

MODULE_DESCRIPTION(TPACPI_DESC);