diff options
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | drivers/platform/x86/ideapad-laptop.c | 7 | ||||
| -rw-r--r-- | drivers/platform/x86/intel_telemetry_debugfs.c | 2 |
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 | |||
| 5780 | M: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com> | 5780 | M: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com> |
| 5781 | L: platform-driver-x86@vger.kernel.org | 5781 | L: platform-driver-x86@vger.kernel.org |
| 5782 | S: Maintained | 5782 | S: Maintained |
| 5783 | F: drivers/platform/x86/intel_telemetry_core.c | ||
| 5784 | F: arch/x86/include/asm/intel_telemetry.h | 5783 | F: arch/x86/include/asm/intel_telemetry.h |
| 5785 | F: drivers/platform/x86/intel_telemetry_pltdrv.c | 5784 | F: drivers/platform/x86/intel_telemetry* |
| 5786 | F: drivers/platform/x86/intel_telemetry_debugfs.c | ||
| 5787 | 5785 | ||
| 5788 | IOC3 ETHERNET DRIVER | 5786 | IOC3 ETHERNET DRIVER |
| 5789 | M: Ralf Baechle <ralf@linux-mips.org> | 5787 | M: 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 | ||
| 99 | static u8 suspend_prep_ok; | 100 | static u8 suspend_prep_ok; |
| 100 | static u32 suspend_shlw_ctr_temp, suspend_deep_ctr_temp; | 101 | static u32 suspend_shlw_ctr_temp, suspend_deep_ctr_temp; |
| 101 | static u64 suspend_shlw_res_temp, suspend_deep_res_temp; | 102 | static u64 suspend_shlw_res_temp, suspend_deep_res_temp; |
| 103 | #endif | ||
| 102 | 104 | ||
| 103 | struct telemetry_susp_stats { | 105 | struct telemetry_susp_stats { |
| 104 | u32 shlw_swake_ctr; | 106 | u32 shlw_swake_ctr; |
