diff options
author | Andres Salomon <dilinger@queued.net> | 2008-04-28 05:14:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:35 -0400 |
commit | 32bf87e3697cf2f730b8fbf47cad903ceef718a2 (patch) | |
tree | 6476a1f8796c28e7eb70deb7eaae75872f95fb6d /arch/x86/kernel/mfgpt_32.c | |
parent | 22af89aa0c0b4012a7431114a340efd3665a7617 (diff) |
x86: geode: MSR cleanup
This cleans up a few MSR-using drivers in the following manner:
- Ensures MSRs are all defined in asm/geode.h, rather than in misc
places
- Makes the naming consistent; cs553[56] ones begin with MSR_,
GX-specific ones start with MSR_GX_, and LX-specific ones start
with MSR_LX_. Also, make the names match the data sheet.
- Use MSR names rather than numbers in source code
- Document the fact that the LX's MSR_PADSEL has the wrong value
in the data sheet. That's, uh, good to note.
Signed-off-by: Andres Salomon <dilinger@debian.org>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/kernel/mfgpt_32.c')
-rw-r--r-- | arch/x86/kernel/mfgpt_32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c index cfc2648d25ff..3cad17fe026b 100644 --- a/arch/x86/kernel/mfgpt_32.c +++ b/arch/x86/kernel/mfgpt_32.c | |||
@@ -63,7 +63,7 @@ static int __init mfgpt_fix(char *s) | |||
63 | 63 | ||
64 | /* The following udocumented bit resets the MFGPT timers */ | 64 | /* The following udocumented bit resets the MFGPT timers */ |
65 | val = 0xFF; dummy = 0; | 65 | val = 0xFF; dummy = 0; |
66 | wrmsr(0x5140002B, val, dummy); | 66 | wrmsr(MSR_MFGPT_SETUP, val, dummy); |
67 | return 1; | 67 | return 1; |
68 | } | 68 | } |
69 | __setup("mfgptfix", mfgpt_fix); | 69 | __setup("mfgptfix", mfgpt_fix); |
@@ -127,17 +127,17 @@ int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable) | |||
127 | * 6; that is, resets for 7 and 8 will be ignored. Is this | 127 | * 6; that is, resets for 7 and 8 will be ignored. Is this |
128 | * a problem? -dilinger | 128 | * a problem? -dilinger |
129 | */ | 129 | */ |
130 | msr = MFGPT_NR_MSR; | 130 | msr = MSR_MFGPT_NR; |
131 | mask = 1 << (timer + 24); | 131 | mask = 1 << (timer + 24); |
132 | break; | 132 | break; |
133 | 133 | ||
134 | case MFGPT_EVENT_NMI: | 134 | case MFGPT_EVENT_NMI: |
135 | msr = MFGPT_NR_MSR; | 135 | msr = MSR_MFGPT_NR; |
136 | mask = 1 << (timer + shift); | 136 | mask = 1 << (timer + shift); |
137 | break; | 137 | break; |
138 | 138 | ||
139 | case MFGPT_EVENT_IRQ: | 139 | case MFGPT_EVENT_IRQ: |
140 | msr = MFGPT_IRQ_MSR; | 140 | msr = MSR_MFGPT_IRQ; |
141 | mask = 1 << (timer + shift); | 141 | mask = 1 << (timer + shift); |
142 | break; | 142 | break; |
143 | 143 | ||