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

Commit 1e8143db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull x86 platform driver updates from Darren Hart:
 "Mostly minor updates and cleanups.  One new power management
  controller driver for Intel Core SoCs.

  platform/x86:
   - Add PMC Driver for Intel Core SoC

  dell-rbtn:
   - Ignore ACPI notifications if device is suspended

  thinkpad_acpi:
   - save kbdlight state on suspend and restore it on resume

  intel_menlow:
   - reduce code duplication

  asus-wmi:
   - provide access to ALS control

  ideapad-laptop:
   - add a new WMI string for ESC key

  surfacepro3_button:
   - Add a warning when switching to tablet mode

  sony-laptop:
   - Avoid oops on module unload for older laptops

  intel_telemetry:
   - Constify telemetry_core_ops structures

  fujitsu-laptop:
   - Use IS_ENABLED() instead of checking for built-in or module

  asus-laptop:
   - correct error handling in sysfs_acpi_set
   - remove redundant initializers
   - correct error handling in asus_read_brightness()

  fujitsu-laptop:
   - Support radio LED"

* tag 'platform-drivers-x86-v4.7-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  platform/x86: Add PMC Driver for Intel Core SoC
  dell-rbtn: Ignore ACPI notifications if device is suspended
  thinkpad_acpi: save kbdlight state on suspend and restore it on resume
  intel_menlow: reduce code duplication
  asus-wmi: provide access to ALS control
  ideapad-laptop: add a new WMI string for ESC key
  surfacepro3_button: Add a warning when switching to tablet mode
  sony-laptop: Avoid oops on module unload for older laptops
  intel_telemetry: Constify telemetry_core_ops structures
  fujitsu-laptop: Use IS_ENABLED() instead of checking for built-in or module
  asus-laptop: correct error handling in sysfs_acpi_set
  asus-laptop: remove redundant initializers
  asus-laptop: correct error handling in asus_read_brightness()
  fujitsu-laptop: Support radio LED
parents 25662785 b740d2e9

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -6096,6 +6096,14 @@ S: Maintained 
F:	arch/x86/include/asm/intel_telemetry.h

F:	drivers/platform/x86/intel_telemetry*



INTEL PMC CORE DRIVER

M:	Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>

M:	Vishwanath Somayaji <vishwanath.somayaji@intel.com>

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

S:	Maintained

F:	arch/x86/include/asm/pmc_core.h

F:	drivers/platform/x86/intel_pmc_core*



IOC3 ETHERNET DRIVER

M:	Ralf Baechle <ralf@linux-mips.org>

L:	linux-mips@linux-mips.org

arch/x86/include/asm/intel_telemetry.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ struct telemetry_core_ops { 
	int (*reset_events)(void);

};



int telemetry_set_pltdata(struct telemetry_core_ops *ops,

int telemetry_set_pltdata(const struct telemetry_core_ops *ops,

			  struct telemetry_plt_config *pltconfig);



int telemetry_clear_pltdata(void);

arch/x86/include/asm/pmc_core.h

0 → 100644
+27 −0
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 */

drivers/platform/x86/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -846,6 +846,18 @@ config INTEL_IMR 


	  If you are running on a Galileo/Quark say Y here.



config INTEL_PMC_CORE

	bool "Intel PMC Core driver"

	depends on X86 && PCI

	---help---

	  The Intel Platform Controller Hub for Intel Core SoCs provides access

	  to Power Management Controller registers via a PCI interface. This

	  driver can utilize debugging capabilities and supported features as

	  exposed by the Power Management Controller.



	  Supported features:

		- SLP_S0_RESIDENCY counter.



config IBM_RTL

	tristate "Device driver to enable PRTL support"

	depends on X86 && PCI

drivers/platform/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -69,3 +69,4 @@ obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o 
obj-$(CONFIG_INTEL_TELEMETRY)	+= intel_telemetry_core.o \

				   intel_telemetry_pltdrv.o \

				   intel_telemetry_debugfs.o

obj-$(CONFIG_INTEL_PMC_CORE)    += intel_pmc_core.o