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

Commit cbd7b8a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 platform-driver updates from Darren Hart:
 "New model support added for Dell, Ideapad, Acer, Asus, Thinkpad, and
  GPD laptops. Improvements to the common intel-vbtn driver, including
  tablet mode, rotate, and front button support. Intel CPU support added
  for Cannonlake and platform support for Dollar Cove power button.

  Overhaul of the mellanox platform driver, creating a new
  platform/mellanox directory for the newly multi-architecture regmap
  interface.

  Significant Intel PMC update with CannonLake support, Coffeelake
  update, CPUID enumeration, module support, new read64 API, refactoring
  and cleanups.

  Revert the apple-gmux iGP IO lock, addressing reported issues with
  non-binary drivers, leaving Nvidia binary driver users to comment out
  conflicting code.

  Miscellaneous fixes and cleanups"

* tag 'platform-drivers-x86-v4.16-1' of git://git.infradead.org/linux-platform-drivers-x86: (81 commits)
  platform/x86: mlx-platform: Fix an ERR_PTR vs NULL issue
  platform/x86: intel_pmc_core: Special case for Coffeelake
  platform/x86: intel_pmc_core: Add CannonLake PCH support
  x86/cpu: Add Cannonlake to Intel family
  platform/x86: intel_pmc_core: Read base address from LPIT
  ACPI / LPIT: Export lpit_read_residency_count_address()
  platform/x86: intel-vbtn: Replace License by SDPX identifier
  platform/x86: intel-vbtn: Remove redundant inclusions
  platform/x86: intel-vbtn: Support tablet mode switch
  platform/x86: dell-laptop: Allocate buffer on heap rather than globally
  platform/x86: intel_pmc_core: Remove unused header file
  platform/x86: mlx-platform: Add hotplug device unregister to error path
  platform/x86: mlx-platform: fix module aliases
  platform/mellanox: mlxreg-hotplug: Add check for negative adapter number
  platform/x86: mlx-platform: Add IO access verification callbacks
  platform/x86: mlx-platform: Document pdev_hotplug field
  platform/x86: mlx-platform: Allow compilation for 32 bit arch
  platform/mellanox: mlxreg-hotplug: Enable building for ARM
  platform/mellanox: mlxreg-hotplug: Modify to use a regmap interface
  platform/mellanox: Group create/destroy with attribute functions
  ...
parents 3f551e3c 8a0f5b6f

Documentation/ABI/testing/sysfs-driver-samsung-laptop

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Date: January 1, 2010 
KernelVersion:	2.6.33

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:	Some Samsung laptops have different "performance levels"

		that are can be modified by a function key, and by this

		that can be modified by a function key, and by this

		sysfs file.  These values don't always make a whole lot

		of sense, but some users like to modify them to keep

		their fans quiet at all costs.  Reading from this file

MAINTAINERS

+11 −4
Original line number Diff line number Diff line
@@ -6001,6 +6001,12 @@ L: linux-input@vger.kernel.org 
S:	Maintained

F:	drivers/input/touchscreen/goodix.c



GPD POCKET FAN DRIVER

M:	Hans de Goede <hdegoede@redhat.com>

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

S:	Maintained

F:	drivers/platform/x86/gpd-pocket-fan.c



GPIO ACPI SUPPORT

M:	Mika Westerberg <mika.westerberg@linux.intel.com>

M:	Andy Shevchenko <andriy.shevchenko@linux.intel.com>
@@ -8939,12 +8945,13 @@ W: http://www.mellanox.com 
Q:	http://patchwork.ozlabs.org/project/netdev/list/

F:	drivers/net/ethernet/mellanox/mlxfw/



MELLANOX MLX CPLD HOTPLUG DRIVER

MELLANOX HARDWARE PLATFORM SUPPORT

M:	Andy Shevchenko <andy@infradead.org>

M:	Darren Hart <dvhart@infradead.org>

M:	Vadim Pasternak <vadimp@mellanox.com>

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

S:	Supported

F:	drivers/platform/x86/mlxcpld-hotplug.c

F:	include/linux/platform_data/mlxcpld-hotplug.h

F:	drivers/platform/mellanox/



MELLANOX MLX4 core VPI driver

M:	Tariq Toukan <tariqt@mellanox.com>
@@ -15134,7 +15141,7 @@ X86 PLATFORM DRIVERS 
M:	Darren Hart <dvhart@infradead.org>

M:	Andy Shevchenko <andy@infradead.org>

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

T:	git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git

T:	git git://git.infradead.org/linux-platform-drivers-x86.git

S:	Maintained

F:	drivers/platform/x86/

F:	drivers/platform/olpc/

arch/x86/include/asm/intel-family.h

+6 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ 
 *

 * Things ending in "2" are usually because we have no better

 * name for them.  There's no processor called "SILVERMONT2".

 *

 * While adding a new CPUID for a new microarchitecture, add a new

 * group to keep logically sorted out in chronological order. Within

 * that group keep the CPUID for the variants sorted by model number.

 */



#define INTEL_FAM6_CORE_YONAH		0x0E
@@ -49,6 +53,8 @@ 
#define INTEL_FAM6_KABYLAKE_MOBILE	0x8E

#define INTEL_FAM6_KABYLAKE_DESKTOP	0x9E



#define INTEL_FAM6_CANNONLAKE_MOBILE	0x66



/* "Small Core" Processors (Atom) */



#define INTEL_FAM6_ATOM_PINEVIEW	0x1C

arch/x86/include/asm/intel_pmc_ipc.h

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ int intel_pmc_ipc_command(u32 cmd, u32 sub, u8 *in, u32 inlen, 
		u32 *out, u32 outlen);

int intel_pmc_s0ix_counter_read(u64 *data);

int intel_pmc_gcr_read(u32 offset, u32 *data);

int intel_pmc_gcr_read64(u32 offset, u64 *data);

int intel_pmc_gcr_write(u32 offset, u32 data);

int intel_pmc_gcr_update(u32 offset, u32 mask, u32 val);
@@ -70,6 +71,11 @@ static inline int intel_pmc_gcr_read(u32 offset, u32 *data) 
	return -EINVAL;

}



static inline int intel_pmc_gcr_read64(u32 offset, u64 *data)

{

	return -EINVAL;

}



static inline int intel_pmc_gcr_write(u32 offset, u32 data)

{

	return -EINVAL;

arch/x86/include/asm/pmc_core.h

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
/*

 * Intel Core SoC Power Management Controller Header File

 *

 * Copyright (c) 2016, Intel Corporation.

 * All Rights Reserved.

 *

 * Authors: Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>

 *          Vishwanath Somayaji <vishwanath.somayaji@intel.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 */



#ifndef _ASM_PMC_CORE_H

#define _ASM_PMC_CORE_H



/* API to read SLP_S0_RESIDENCY counter */

int intel_pmc_slp_s0_counter_read(u32 *data);



#endif /* _ASM_PMC_CORE_H */