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

Pull x86 platform driver updates from Darren Hart:

 - Move the Dell dcdbas and dell_rbu drivers into platform/drivers/x86
   as they are closely coupled with other drivers in this location.

 - Improve _init* usage for acerhdf and fix some usage issues with
   messages and module parameters.

 - Simplify asus-wmi by calling ACPI/WMI methods directly, eliminating
   workqueue overhead, eliminate double reporting of keyboard backlight.

 - Fix wake from USB failure on Bay Trail devices (intel_int0002_vgpio).

 - Notify intel_telemetry users when IPC1 device is not enabled.

 - Update various drivers with new laptop model IDs.

 - Update several intel drivers to use SPDX identifers and order headers
   alphabetically.

* tag 'platform-drivers-x86-v4.20-1' of git://git.infradead.org/linux-platform-drivers-x86: (64 commits)
  HID: asus: only support backlight when it's not driven by WMI
  platform/x86: asus-wmi: export function for evaluating WMI methods
  platform/x86: asus-wmi: Only notify kbd LED hw_change by fn-key pressed
  platform/x86: wmi: declare device_type structure as constant
  platform/x86: ideapad: Add Y530-15ICH to no_hw_rfkill
  platform/x86: Add Intel AtomISP2 dummy / power-management driver
  platform/x86: touchscreen_dmi: Add min-x and min-y settings for various models
  platform/x86: touchscreen_dmi: Add info for the Onda V80 Plus v3 tablet
  platform/x86: touchscreen_dmi: Add info for the Trekstor Primetab T13B tablet
  platform/x86: intel_telemetry: Get rid of custom macro
  platform/x86: intel_telemetry: report debugfs failure
  MAINTAINERS: intel_telemetry: Update maintainers info
  platform/x86: Add LG Gram laptop special features driver
  platform/x86: asus-wmi: Simplify the keyboard brightness updating process
  platform/x86: touchscreen_dmi: Add info for the Trekstor Primebook C11 convertible
  platform/x86: mlx-platform: Properly use mlxplat_mlxcpld_msn201x_items
  MAINTAINERS: intel_pmc_core: Update MAINTAINERS
  firmware: dcdbas: include linux/io.h
  platform/x86: intel-wmi-thunderbolt: Add dynamic debugging
  platform/x86: intel-wmi-thunderbolt: Convert to use SPDX identifier
  ...

diff --cc MAINTAINERS
index 1c0f771b859ec24b6123efc7a511525613d86199,08bddcf43314e484f80d2329d384f32d734eb25a..245ba32f53649a6897816da12439cd1cc4a5b737
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7576,8 -7515,17 +7588,9 @@@ S:     Supporte
  F:    drivers/infiniband/hw/i40iw/
  F:    include/uapi/rdma/i40iw-abi.h
  
 -INTEL SHA MULTIBUFFER DRIVER
 -M:    Megha Dey <megha.dey@linux.intel.com>
 -R:    Tim Chen <tim.c.chen@linux.intel.com>
 -L:    linux-crypto@vger.kernel.org
 -S:    Supported
 -F:    arch/x86/crypto/sha*-mb/
 -F:    crypto/mcryptd.c
 -
  INTEL TELEMETRY DRIVER
- M:    Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
+ M:    Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
+ M:    "David E. Box" <david.e.box@linux.intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    arch/x86/include/asm/intel_telemetry.h

diff --cc drivers/firmware/Kconfig
Simple merge

diff --cc drivers/firmware/Makefile
Simple merge

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/platform/x86/Kconfig
Simple merge

diff --cc drivers/platform/x86/asus-wmi.c
Simple merge

diff --cc drivers/platform/x86/intel_cht_int33fe.c
Simple merge

diff --cc drivers/platform/x86/intel_int0002_vgpio.c
index e89ad4964dc139daec390560bfcecb145cdd5505,c958a628c3757e0867ebce8e7d7fcc541a1ee71e..4b8f7305fc8a773b8a0e06291b69672ef559a7ab
--- 1/drivers/platform/x86/intel_int0002_vgpio.c
--- 2/drivers/platform/x86/intel_int0002_vgpio.c
+++ b/drivers/platform/x86/intel_int0002_vgpio.c
@@@ -57,11 -54,7 +54,7 @@@
  #define ICPU(model)   { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
  
  static const struct x86_cpu_id int0002_cpu_ids[] = {
- /*
-  * Limit ourselves to Cherry Trail for now, until testing shows we
-  * need to handle the INT0002 device on Baytrail too.
-  *    ICPU(INTEL_FAM6_ATOM_SILVERMONT),        * Valleyview, Bay Trail *
-  */
 -      ICPU(INTEL_FAM6_ATOM_SILVERMONT1),      /* Valleyview, Bay Trail  */
++      ICPU(INTEL_FAM6_ATOM_SILVERMONT),       /* Valleyview, Bay Trail  */
        ICPU(INTEL_FAM6_ATOM_AIRMONT),          /* Braswell, Cherry Trail */
        {}
  };

diff --cc drivers/platform/x86/intel_mid_powerbtn.c
index 5ad44204a9c3c997bf237aacfb1bbb99ab292ef7,a8c0fbb7f799d7629538c6ff8e8161063be5db0a..292bace83f1e3d95a8dae813370b1fc6610bc0df
--- 1/drivers/platform/x86/intel_mid_powerbtn.c
--- 2/drivers/platform/x86/intel_mid_powerbtn.c
+++ b/drivers/platform/x86/intel_mid_powerbtn.c
@@@ -121,12 -112,9 +112,9 @@@ static const struct mid_pb_ddata mrfld_
        .setup  = mrfld_setup,
  };
  
- #define ICPU(model, ddata)    \
-       { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (kernel_ulong_t)&ddata }
- 
  static const struct x86_cpu_id mid_pb_cpu_ids[] = {
-       ICPU(INTEL_FAM6_ATOM_SALTWELL_MID,              mfld_ddata),
-       ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID,    mrfld_ddata),
 -      INTEL_CPU_FAM6(ATOM_PENWELL,            mfld_ddata),
 -      INTEL_CPU_FAM6(ATOM_MERRIFIELD,         mrfld_ddata),
++      INTEL_CPU_FAM6(ATOM_SALTWELL_MID,       mfld_ddata),
++      INTEL_CPU_FAM6(ATOM_SILVERMONT_MID,     mrfld_ddata),
        {}
  };
  

diff --cc drivers/platform/x86/intel_telemetry_debugfs.c
index cee08f23629245803783734af6229ac18c69e3e6,30988e31c713d0cdede26c13868c5468fc79a406..40bce560eb30d9cf2ca1a348d7b1eece30d00616
--- 1/drivers/platform/x86/intel_telemetry_debugfs.c
--- 2/drivers/platform/x86/intel_telemetry_debugfs.c
+++ b/drivers/platform/x86/intel_telemetry_debugfs.c
@@@ -319,8 -308,8 +308,8 @@@ static struct telemetry_debugfs_conf te
  };
  
  static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = {
-       TELEM_DEBUGFS_CPU(INTEL_FAM6_ATOM_GOLDMONT, telem_apl_debugfs_conf),
-       TELEM_DEBUGFS_CPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS, telem_apl_debugfs_conf),
+       INTEL_CPU_FAM6(ATOM_GOLDMONT, telem_apl_debugfs_conf),
 -      INTEL_CPU_FAM6(ATOM_GEMINI_LAKE, telem_apl_debugfs_conf),
++      INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS, telem_apl_debugfs_conf),
        {}
  };
  

diff --cc drivers/platform/x86/intel_telemetry_pltdrv.c
Simple merge