diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-09 01:04:44 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-09 01:04:44 +0200 |
commit | b55a0262a4fb4a9754f8a3319df0a6d2fe4c4c58 (patch) | |
tree | ce6c8a51a41cac9af7e63cb43d6a460b59bfd202 /drivers/acpi | |
parent | cpuidle: Fix last_residency division (diff) | |
parent | idle_intel: Add Denverton (diff) | |
download | linux-b55a0262a4fb4a9754f8a3319df0a6d2fe4c4c58.tar.xz linux-b55a0262a4fb4a9754f8a3319df0a6d2fe4c4c58.zip |
Merge back earlier cpuidle changes for v4.8.
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/acpi_lpss.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c index 0872d5fecb82..357a0b8f860b 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c @@ -29,6 +29,7 @@ ACPI_MODULE_NAME("acpi_lpss"); #ifdef CONFIG_X86_INTEL_LPSS #include <asm/cpu_device_id.h> +#include <asm/intel-family.h> #include <asm/iosf_mbi.h> #include <asm/pmc_atom.h> @@ -229,8 +230,8 @@ static const struct lpss_device_desc bsw_spi_dev_desc = { #define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } static const struct x86_cpu_id lpss_cpu_ids[] = { - ICPU(0x37), /* Valleyview, Bay Trail */ - ICPU(0x4c), /* Braswell, Cherry Trail */ + ICPU(INTEL_FAM6_ATOM_SILVERMONT1), /* Valleyview, Bay Trail */ + ICPU(INTEL_FAM6_ATOM_AIRMONT), /* Braswell, Cherry Trail */ {} }; |