From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jul 2016 00:23:08 +0000 (-0700)
Subject: Merge tag 'platform-drivers-x86-v4.8-1' of git://git.infradead.org/users/dvhart/linux... 
X-Git-Tag: v4.8-rc1~159
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=27b79027bc112a63ad4004eb83c6acacae08a0de;p=linux-2.6-block.git

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
  ...
---

27b79027bc112a63ad4004eb83c6acacae08a0de
diff --cc drivers/platform/x86/intel_pmc_core.c
index e57f923eea0b,d8379cd86516..520b58a04daa
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@@ -23,10 -23,8 +23,9 @@@
  #include <linux/init.h>
  #include <linux/io.h>
  #include <linux/pci.h>
- #include <linux/seq_file.h>
  
  #include <asm/cpu_device_id.h>
 +#include <asm/intel-family.h>
  #include <asm/pmc_core.h>
  
  #include "intel_pmc_core.h"
@@@ -127,22 -113,12 +114,12 @@@ static int pmc_core_dbgfs_register(stru
  
  	return 0;
  }
- #else
- static inline int pmc_core_dbgfs_register(struct pmc_dev *pmcdev)
- {
- 	return 0;
- }
- 
- static inline void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev)
- {
- }
- #endif /* CONFIG_DEBUG_FS */
  
  static const struct x86_cpu_id intel_pmc_core_ids[] = {
 -	{ X86_VENDOR_INTEL, 6, 0x4e, X86_FEATURE_MWAIT,
 -		(kernel_ulong_t)NULL}, /* Skylake CPUID Signature */
 -	{ X86_VENDOR_INTEL, 6, 0x5e, X86_FEATURE_MWAIT,
 -		(kernel_ulong_t)NULL}, /* Skylake CPUID Signature */
 +	{ X86_VENDOR_INTEL, 6, INTEL_FAM6_SKYLAKE_MOBILE, X86_FEATURE_MWAIT,
 +		(kernel_ulong_t)NULL},
 +	{ X86_VENDOR_INTEL, 6, INTEL_FAM6_SKYLAKE_DESKTOP, X86_FEATURE_MWAIT,
 +		(kernel_ulong_t)NULL},
  	{}
  };