diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/cpufreq/powernow-k6.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'drivers/cpufreq/powernow-k6.c')
-rw-r--r-- | drivers/cpufreq/powernow-k6.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/cpufreq/powernow-k6.c b/drivers/cpufreq/powernow-k6.c index af23e0b9ec9..b3379d6a5c5 100644 --- a/drivers/cpufreq/powernow-k6.c +++ b/drivers/cpufreq/powernow-k6.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/timex.h> | 16 | #include <linux/timex.h> |
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | 18 | ||
19 | #include <asm/cpu_device_id.h> | ||
20 | #include <asm/msr.h> | 19 | #include <asm/msr.h> |
21 | 20 | ||
22 | #define POWERNOW_IOPORT 0xfff0 /* it doesn't matter where, as long | 21 | #define POWERNOW_IOPORT 0xfff0 /* it doesn't matter where, as long |
@@ -211,12 +210,6 @@ static struct cpufreq_driver powernow_k6_driver = { | |||
211 | .attr = powernow_k6_attr, | 210 | .attr = powernow_k6_attr, |
212 | }; | 211 | }; |
213 | 212 | ||
214 | static const struct x86_cpu_id powernow_k6_ids[] = { | ||
215 | { X86_VENDOR_AMD, 5, 12 }, | ||
216 | { X86_VENDOR_AMD, 5, 13 }, | ||
217 | {} | ||
218 | }; | ||
219 | MODULE_DEVICE_TABLE(x86cpu, powernow_k6_ids); | ||
220 | 213 | ||
221 | /** | 214 | /** |
222 | * powernow_k6_init - initializes the k6 PowerNow! CPUFreq driver | 215 | * powernow_k6_init - initializes the k6 PowerNow! CPUFreq driver |
@@ -227,7 +220,10 @@ MODULE_DEVICE_TABLE(x86cpu, powernow_k6_ids); | |||
227 | */ | 220 | */ |
228 | static int __init powernow_k6_init(void) | 221 | static int __init powernow_k6_init(void) |
229 | { | 222 | { |
230 | if (!x86_match_cpu(powernow_k6_ids)) | 223 | struct cpuinfo_x86 *c = &cpu_data(0); |
224 | |||
225 | if ((c->x86_vendor != X86_VENDOR_AMD) || (c->x86 != 5) || | ||
226 | ((c->x86_model != 12) && (c->x86_model != 13))) | ||
231 | return -ENODEV; | 227 | return -ENODEV; |
232 | 228 | ||
233 | if (!request_region(POWERNOW_IOPORT, 16, "PowerNow!")) { | 229 | if (!request_region(POWERNOW_IOPORT, 16, "PowerNow!")) { |