aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS4
-rw-r--r--drivers/platform/x86/ideapad-laptop.c7
-rw-r--r--drivers/platform/x86/intel_telemetry_debugfs.c2
3 files changed, 10 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 59373e5bb09e..78f71f471bd6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5780,10 +5780,8 @@ INTEL TELEMETRY DRIVER
5780M: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com> 5780M: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
5781L: platform-driver-x86@vger.kernel.org 5781L: platform-driver-x86@vger.kernel.org
5782S: Maintained 5782S: Maintained
5783F: drivers/platform/x86/intel_telemetry_core.c
5784F: arch/x86/include/asm/intel_telemetry.h 5783F: arch/x86/include/asm/intel_telemetry.h
5785F: drivers/platform/x86/intel_telemetry_pltdrv.c 5784F: drivers/platform/x86/intel_telemetry*
5786F: drivers/platform/x86/intel_telemetry_debugfs.c
5787 5785
5788IOC3 ETHERNET DRIVER 5786IOC3 ETHERNET DRIVER
5789M: Ralf Baechle <ralf@linux-mips.org> 5787M: Ralf Baechle <ralf@linux-mips.org>
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index d28db0e793df..d78ee151c9e4 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -900,6 +900,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
900 }, 900 },
901 }, 901 },
902 { 902 {
903 .ident = "Lenovo Yoga 700",
904 .matches = {
905 DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
906 DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 700"),
907 },
908 },
909 {
903 .ident = "Lenovo Yoga 900", 910 .ident = "Lenovo Yoga 900",
904 .matches = { 911 .matches = {
905 DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), 912 DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c
index 5b31d1548c07..f5134acd6ff0 100644
--- a/drivers/platform/x86/intel_telemetry_debugfs.c
+++ b/drivers/platform/x86/intel_telemetry_debugfs.c
@@ -96,9 +96,11 @@
96 } \ 96 } \
97} 97}
98 98
99#ifdef CONFIG_PM_SLEEP
99static u8 suspend_prep_ok; 100static u8 suspend_prep_ok;
100static u32 suspend_shlw_ctr_temp, suspend_deep_ctr_temp; 101static u32 suspend_shlw_ctr_temp, suspend_deep_ctr_temp;
101static u64 suspend_shlw_res_temp, suspend_deep_res_temp; 102static u64 suspend_shlw_res_temp, suspend_deep_res_temp;
103#endif
102 104
103struct telemetry_susp_stats { 105struct telemetry_susp_stats {
104 u32 shlw_swake_ctr; 106 u32 shlw_swake_ctr;