diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-13 23:48:23 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-13 23:48:23 +0200 |
| commit | b77b5651082a4fa4091ac4e864254d9e71d15880 (patch) | |
| tree | 44b3b001cfd8ef1bfcf3e46484c6eae6230d68a2 /drivers/thermal | |
| parent | Linux 4.7-rc3 (diff) | |
| parent | x86, thermal: Clean up and fix CPU model detection for intel_soc_dts_thermal (diff) | |
| download | linux-b77b5651082a4fa4091ac4e864254d9e71d15880.tar.xz linux-b77b5651082a4fa4091ac4e864254d9e71d15880.zip | |
Merge branch 'x86/cpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into x86/cpu
Pull recent changes related to x86 CPU model representations from tip.
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/intel_soc_dts_thermal.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/thermal/intel_soc_dts_thermal.c b/drivers/thermal/intel_soc_dts_thermal.c index 4ebb31a35a64..b2bbaa1c60b0 100644 --- a/drivers/thermal/intel_soc_dts_thermal.c +++ b/drivers/thermal/intel_soc_dts_thermal.c @@ -18,6 +18,7 @@ #include <linux/module.h> #include <linux/interrupt.h> #include <asm/cpu_device_id.h> +#include <asm/intel-family.h> #include "intel_soc_dts_iosf.h" #define CRITICAL_OFFSET_FROM_TJ_MAX 5000 @@ -42,7 +43,8 @@ static irqreturn_t soc_irq_thread_fn(int irq, void *dev_data) } static const struct x86_cpu_id soc_thermal_ids[] = { - { X86_VENDOR_INTEL, X86_FAMILY_ANY, 0x37, 0, BYT_SOC_DTS_APIC_IRQ}, + { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT1, 0, + BYT_SOC_DTS_APIC_IRQ}, {} }; MODULE_DEVICE_TABLE(x86cpu, soc_thermal_ids); |