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

Commit 27b79027 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.8-1' of... 

Merge tag 'platform-drivers-x86-v4.8-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x8 platform driver updates from Darren Hart:
 "Several new quirks and tweaks for new platforms to existing laptop
  drivers.  A new ACPI virtual power button driver, similar to the
  intel-hid driver.  A rework of the dell keymap, using a single sparse
  keymap for all machines.  A few fixes and cleanups.

  Summary:

  intel-vbtn:
   - new driver for Intel Virtual Button

  intel_pmc_core:
   - Convert to DEFINE_DEBUGFS_ATTRIBUTE

  fujitsu-laptop:
   - Rework brightness of eco led

  asus-wmi:
   - Add quirk_no_rfkill_wapf4 for the Asus X456UA
   - Add quirk_no_rfkill_wapf4 for the Asus X456UF
   - Add quirk_no_rfkill for the Asus Z550MA
   - Add quirk_no_rfkill for the Asus U303LB
   - Add quirk_no_rfkill for the Asus N552VW
   - Create quirk for airplane_mode LED
   - Add ambient light sensor toggle key

  asus-wireless:
   - Toggle airplane mode LED

  intel_telemetry:
   - Remove Monitor MWAIT feature dependency

  intel-hid:
   - Remove duplicated acpi_remove_notify_handler

  fujitsu-laptop:
   - Add support for eco LED
   - Support touchpad toggle hotkey on Skylake-based models
   - Remove unused macros
   - Use module name in debug messages

  hp-wmi:
   - Fix wifi cannot be hard-unblocked

  toshiba_acpi:
   - Bump driver version and update copyright year
   - Remove the position sysfs entry
   - Add IIO interface for accelerometer axis data

  dell-wmi:
   - Add a WMI event code for display on/off
   - Generate one sparse keymap for all machines
   - Add information about other WMI event codes
   - Sort WMI event codes and update comments
   - Ignore WMI event code 0xe045"

* tag 'platform-drivers-x86-v4.8-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (26 commits)
  intel-vbtn: new driver for Intel Virtual Button
  intel_pmc_core: Convert to DEFINE_DEBUGFS_ATTRIBUTE
  fujitsu-laptop: Rework brightness of eco led
  asus-wmi: Add quirk_no_rfkill_wapf4 for the Asus X456UA
  asus-wmi: Add quirk_no_rfkill_wapf4 for the Asus X456UF
  asus-wmi: Add quirk_no_rfkill for the Asus Z550MA
  asus-wmi: Add quirk_no_rfkill for the Asus U303LB
  asus-wmi: Add quirk_no_rfkill for the Asus N552VW
  asus-wmi: Create quirk for airplane_mode LED
  asus-wireless: Toggle airplane mode LED
  intel_telemetry: Remove Monitor MWAIT feature dependency
  intel-hid: Remove duplicated acpi_remove_notify_handler
  asus-wmi: Add ambient light sensor toggle key
  fujitsu-laptop: Add support for eco LED
  fujitsu-laptop: Support touchpad toggle hotkey on Skylake-based models
  fujitsu-laptop: Remove unused macros
  fujitsu-laptop: Use module name in debug messages
  hp-wmi: Fix wifi cannot be hard-unblocked
  toshiba_acpi: Bump driver version and update copyright year
  toshiba_acpi: Remove the position sysfs entry
  ...
parents f7e68169 332e0812

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -5921,6 +5921,12 @@ L: platform-driver-x86@vger.kernel.org 
S:	Maintained

F:	drivers/platform/x86/intel-hid.c



INTEL VIRTUAL BUTTON DRIVER

M:	AceLan Kao <acelan.kao@canonical.com>

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

S:	Maintained

F:	drivers/platform/x86/intel-vbtn.c



INTEL IDLE DRIVER

M:	Len Brown <lenb@kernel.org>

L:	linux-pm@vger.kernel.org

drivers/platform/x86/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -603,6 +603,8 @@ config ASUS_WIRELESS 
	tristate "Asus Wireless Radio Control Driver"

	depends on ACPI

	depends on INPUT

	select NEW_LEDS

	select LEDS_CLASS

	---help---

	  The Asus Wireless Radio Control handles the airplane mode hotkey

	  present on some Asus laptops.
@@ -668,6 +670,7 @@ config ACPI_TOSHIBA 
	depends on SERIO_I8042 || SERIO_I8042 = n

	depends on ACPI_VIDEO || ACPI_VIDEO = n

	depends on RFKILL || RFKILL = n

	depends on IIO

	select INPUT_POLLDEV

	select INPUT_SPARSEKMAP

	---help---
@@ -770,6 +773,18 @@ config INTEL_HID_EVENT 
	  To compile this driver as a module, choose M here: the module will

	  be called intel_hid.



config INTEL_VBTN

	tristate "INTEL VIRTUAL BUTTON"

	depends on ACPI

	depends on INPUT

	select INPUT_SPARSEKMAP

	help

	  This driver provides support for the Intel Virtual Button interface.

	  Some laptops require this driver for power button support.



	  To compile this driver as a module, choose M here: the module will

	  be called intel_vbtn.



config INTEL_SCU_IPC

	bool "Intel SCU IPC Support"

	depends on X86_INTEL_MID

drivers/platform/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ obj-$(CONFIG_TOSHIBA_BT_RFKILL) += toshiba_bluetooth.o 
obj-$(CONFIG_TOSHIBA_HAPS)	+= toshiba_haps.o

obj-$(CONFIG_TOSHIBA_WMI)	+= toshiba-wmi.o

obj-$(CONFIG_INTEL_HID_EVENT)	+= intel-hid.o

obj-$(CONFIG_INTEL_VBTN)	+= intel-vbtn.o

obj-$(CONFIG_INTEL_SCU_IPC)	+= intel_scu_ipc.o

obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o

obj-$(CONFIG_INTEL_MFLD_THERMAL) += intel_mid_thermal.o

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

+48 −2
Original line number Diff line number Diff line
@@ -78,6 +78,15 @@ static struct quirk_entry quirk_asus_x200ca = { 
	.wapf = 2,

};



static struct quirk_entry quirk_no_rfkill = {

	.no_rfkill = true,

};



static struct quirk_entry quirk_no_rfkill_wapf4 = {

	.wapf = 4,

	.no_rfkill = true,

};



static int dmi_matched(const struct dmi_system_id *dmi)

{

	quirks = dmi->driver_data;
@@ -133,7 +142,7 @@ static const struct dmi_system_id asus_quirks[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X456UA"),

		},

		.driver_data = &quirk_asus_wapf4,

		.driver_data = &quirk_no_rfkill_wapf4,

	},

	{

		.callback = dmi_matched,
@@ -142,7 +151,7 @@ static const struct dmi_system_id asus_quirks[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X456UF"),

		},

		.driver_data = &quirk_asus_wapf4,

		.driver_data = &quirk_no_rfkill_wapf4,

	},

	{

		.callback = dmi_matched,
@@ -306,6 +315,42 @@ static const struct dmi_system_id asus_quirks[] = { 
		},

		.driver_data = &quirk_asus_x200ca,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. X555UB",

		.matches = {

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

			DMI_MATCH(DMI_PRODUCT_NAME, "X555UB"),

		},

		.driver_data = &quirk_no_rfkill,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. N552VW",

		.matches = {

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

			DMI_MATCH(DMI_PRODUCT_NAME, "N552VW"),

		},

		.driver_data = &quirk_no_rfkill,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. U303LB",

		.matches = {

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

			DMI_MATCH(DMI_PRODUCT_NAME, "U303LB"),

		},

		.driver_data = &quirk_no_rfkill,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. Z550MA",

		.matches = {

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

			DMI_MATCH(DMI_PRODUCT_NAME, "Z550MA"),

		},

		.driver_data = &quirk_no_rfkill,

	},

	{},

};
@@ -356,6 +401,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { 
	{ KE_KEY, 0x67, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV */

	{ KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } },

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

	{ KE_KEY, 0x7a, { KEY_ALS_TOGGLE } }, /* Ambient Light Sensor Toggle */

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

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

	{ KE_KEY, 0x82, { KEY_CAMERA } },

drivers/platform/x86/asus-wireless.c

+90 −1
Original line number Diff line number Diff line
@@ -15,11 +15,78 @@ 
#include <linux/acpi.h>

#include <linux/input.h>

#include <linux/pci_ids.h>

#include <linux/leds.h>



#define ASUS_WIRELESS_LED_STATUS 0x2

#define ASUS_WIRELESS_LED_OFF 0x4

#define ASUS_WIRELESS_LED_ON 0x5



struct asus_wireless_data {

	struct input_dev *idev;

	struct acpi_device *adev;

	struct workqueue_struct *wq;

	struct work_struct led_work;

	struct led_classdev led;

	int led_state;

};



static u64 asus_wireless_method(acpi_handle handle, const char *method,

				int param)

{

	struct acpi_object_list p;

	union acpi_object obj;

	acpi_status s;

	u64 ret;



	acpi_handle_debug(handle, "Evaluating method %s, parameter %#x\n",

			  method, param);

	obj.type = ACPI_TYPE_INTEGER;

	obj.integer.value = param;

	p.count = 1;

	p.pointer = &obj;



	s = acpi_evaluate_integer(handle, (acpi_string) method, &p, &ret);

	if (ACPI_FAILURE(s))

		acpi_handle_err(handle,

				"Failed to eval method %s, param %#x (%d)\n",

				method, param, s);

	acpi_handle_debug(handle, "%s returned %#x\n", method, (uint) ret);

	return ret;

}



static enum led_brightness led_state_get(struct led_classdev *led)

{

	struct asus_wireless_data *data;

	int s;



	data = container_of(led, struct asus_wireless_data, led);

	s = asus_wireless_method(acpi_device_handle(data->adev), "HSWC",

				 ASUS_WIRELESS_LED_STATUS);

	if (s == ASUS_WIRELESS_LED_ON)

		return LED_FULL;

	return LED_OFF;

}



static void led_state_update(struct work_struct *work)

{

	struct asus_wireless_data *data;



	data = container_of(work, struct asus_wireless_data, led_work);

	asus_wireless_method(acpi_device_handle(data->adev), "HSWC",

			     data->led_state);

}



static void led_state_set(struct led_classdev *led,

				  enum led_brightness value)

{

	struct asus_wireless_data *data;



	data = container_of(led, struct asus_wireless_data, led);

	data->led_state = value == LED_OFF ? ASUS_WIRELESS_LED_OFF :

					     ASUS_WIRELESS_LED_ON;

	queue_work(data->wq, &data->led_work);

}



static void asus_wireless_notify(struct acpi_device *adev, u32 event)

{

	struct asus_wireless_data *data = acpi_driver_data(adev);
@@ -37,6 +104,7 @@ static void asus_wireless_notify(struct acpi_device *adev, u32 event) 
static int asus_wireless_add(struct acpi_device *adev)

{

	struct asus_wireless_data *data;

	int err;



	data = devm_kzalloc(&adev->dev, sizeof(*data), GFP_KERNEL);

	if (!data)
@@ -52,11 +120,32 @@ static int asus_wireless_add(struct acpi_device *adev) 
	data->idev->id.vendor = PCI_VENDOR_ID_ASUSTEK;

	set_bit(EV_KEY, data->idev->evbit);

	set_bit(KEY_RFKILL, data->idev->keybit);

	return input_register_device(data->idev);

	err = input_register_device(data->idev);

	if (err)

		return err;



	data->adev = adev;

	data->wq = create_singlethread_workqueue("asus_wireless_workqueue");

	if (!data->wq)

		return -ENOMEM;

	INIT_WORK(&data->led_work, led_state_update);

	data->led.name = "asus-wireless::airplane";

	data->led.brightness_set = led_state_set;

	data->led.brightness_get = led_state_get;

	data->led.flags = LED_CORE_SUSPENDRESUME;

	data->led.max_brightness = 1;

	err = devm_led_classdev_register(&adev->dev, &data->led);

	if (err)

		destroy_workqueue(data->wq);

	return err;

}



static int asus_wireless_remove(struct acpi_device *adev)

{

	struct asus_wireless_data *data = acpi_driver_data(adev);



	if (data->wq)

		destroy_workqueue(data->wq);

	return 0;

}