aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq/powernow-k7.c
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
committerJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
commit8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
treea8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/cpufreq/powernow-k7.c
parent406089d01562f1e2bf9f089fd7637009ebaad589 (diff)
Patched in Tegra support.
Diffstat (limited to 'drivers/cpufreq/powernow-k7.c')
-rw-r--r--drivers/cpufreq/powernow-k7.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index 334cc2f1e9f..d71d9f37235 100644
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -27,7 +27,7 @@
27 27
28#include <asm/timer.h> /* Needed for recalibrate_cpu_khz() */ 28#include <asm/timer.h> /* Needed for recalibrate_cpu_khz() */
29#include <asm/msr.h> 29#include <asm/msr.h>
30#include <asm/cpu_device_id.h> 30#include <asm/system.h>
31 31
32#ifdef CONFIG_X86_POWERNOW_K7_ACPI 32#ifdef CONFIG_X86_POWERNOW_K7_ACPI
33#include <linux/acpi.h> 33#include <linux/acpi.h>
@@ -110,19 +110,18 @@ static int check_fsb(unsigned int fsbspeed)
110 return delta < 5; 110 return delta < 5;
111} 111}
112 112
113static const struct x86_cpu_id powernow_k7_cpuids[] = {
114 { X86_VENDOR_AMD, 6, },
115 {}
116};
117MODULE_DEVICE_TABLE(x86cpu, powernow_k7_cpuids);
118
119static int check_powernow(void) 113static int check_powernow(void)
120{ 114{
121 struct cpuinfo_x86 *c = &cpu_data(0); 115 struct cpuinfo_x86 *c = &cpu_data(0);
122 unsigned int maxei, eax, ebx, ecx, edx; 116 unsigned int maxei, eax, ebx, ecx, edx;
123 117
124 if (!x86_match_cpu(powernow_k7_cpuids)) 118 if ((c->x86_vendor != X86_VENDOR_AMD) || (c->x86 != 6)) {
119#ifdef MODULE
120 printk(KERN_INFO PFX "This module only works with "
121 "AMD K7 CPUs\n");
122#endif
125 return 0; 123 return 0;
124 }
126 125
127 /* Get maximum capabilities */ 126 /* Get maximum capabilities */
128 maxei = cpuid_eax(0x80000000); 127 maxei = cpuid_eax(0x80000000);