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

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

Merge tag 'platform-drivers-x86-v4.5-2' of... 

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

Pull x86 platform driver updates from Darren Hart:
 "Emergency travel prevented me from completing my final testing on this
  until today.  Nothing here that couldn't wait until RC1 fixes, but I
  thought it best to get it out sooner rather than later as it does
  contain a build warning fix.

  Summary:

  A build warning fix, MAINTAINERS cleanup, and a new DMI quirk:

  ideapad-laptop:
   - Add Lenovo Yoga 700 to no_hw_rfkill dmi list

  MAINTAINERS:
   - Combine multiple telemetry entries

  intel_telemetry_debugfs:
   - Fix unused warnings in telemetry debugfs"

* tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  ideapad-laptop: Add Lenovo Yoga 700 to no_hw_rfkill dmi list
  MAINTAINERS: Combine multiple telemetry entries
  intel_telemetry_debugfs: Fix unused warnings in telemetry debugfs
parents 81f05fee 6b31de3e

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -5780,10 +5780,8 @@ INTEL TELEMETRY DRIVER 
M:	Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>

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

S:	Maintained

F:	drivers/platform/x86/intel_telemetry_core.c

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

F:	drivers/platform/x86/intel_telemetry_pltdrv.c

F:	drivers/platform/x86/intel_telemetry_debugfs.c

F:	drivers/platform/x86/intel_telemetry*



IOC3 ETHERNET DRIVER

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

drivers/platform/x86/ideapad-laptop.c

+7 −0
Original line number Diff line number Diff line
@@ -899,6 +899,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = { 
			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 3"),

		},

	},

	{

		.ident = "Lenovo Yoga 700",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 700"),

		},

	},

	{

		.ident = "Lenovo Yoga 900",

		.matches = {

drivers/platform/x86/intel_telemetry_debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -96,9 +96,11 @@ 
	} \

}



#ifdef CONFIG_PM_SLEEP

static u8 suspend_prep_ok;

static u32 suspend_shlw_ctr_temp, suspend_deep_ctr_temp;

static u64 suspend_shlw_res_temp, suspend_deep_res_temp;

#endif



struct telemetry_susp_stats {

	u32 shlw_swake_ctr;