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>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c
index cfc2648d25f..3cad17fe026 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)
 
         /* The following udocumented bit resets the MFGPT timers */
         val = 0xFF; dummy = 0;
-        wrmsr(0x5140002B, val, dummy);
+        wrmsr(MSR_MFGPT_SETUP, val, dummy);
         return 1;
 }
 __setup("mfgptfix", mfgpt_fix);
@@ -127,17 +127,17 @@ int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable)
                  * 6; that is, resets for 7 and 8 will be ignored.  Is this
                  * a problem?   -dilinger
                  */
-                msr = MFGPT_NR_MSR;
+                msr = MSR_MFGPT_NR;
                 mask = 1 << (timer + 24);
                 break;
 
         case MFGPT_EVENT_NMI:
-                msr = MFGPT_NR_MSR;
+                msr = MSR_MFGPT_NR;
                 mask = 1 << (timer + shift);
                 break;
 
         case MFGPT_EVENT_IRQ:
-                msr = MFGPT_IRQ_MSR;
+                msr = MSR_MFGPT_IRQ;
                 mask = 1 << (timer + shift);
                 break;