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 /include/asm-x86 | |
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 'include/asm-x86')
-rw-r--r-- | include/asm-x86/geode.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h index 9870cc1f2f8f..b1bdf6378563 100644 --- a/include/asm-x86/geode.h +++ b/include/asm-x86/geode.h | |||
@@ -30,7 +30,11 @@ extern int geode_get_dev_base(unsigned int dev); | |||
30 | 30 | ||
31 | /* MSRS */ | 31 | /* MSRS */ |
32 | 32 | ||
33 | #define GX_GLCP_SYS_RSTPLL 0x4C000014 | 33 | #define MSR_LX_GLD_MSR_CONFIG 0x48002001 |
34 | #define MSR_LX_MSR_PADSEL 0x48002011 /* NOT 0x48000011; the data | ||
35 | * sheet has the wrong value */ | ||
36 | #define MSR_GLCP_SYS_RSTPLL 0x4C000014 | ||
37 | #define MSR_GLCP_DOTPLL 0x4C000015 | ||
34 | 38 | ||
35 | #define MSR_LBAR_SMB 0x5140000B | 39 | #define MSR_LBAR_SMB 0x5140000B |
36 | #define MSR_LBAR_GPIO 0x5140000C | 40 | #define MSR_LBAR_GPIO 0x5140000C |
@@ -45,8 +49,14 @@ extern int geode_get_dev_base(unsigned int dev); | |||
45 | #define MSR_PIC_ZSEL_LOW 0x51400022 | 49 | #define MSR_PIC_ZSEL_LOW 0x51400022 |
46 | #define MSR_PIC_ZSEL_HIGH 0x51400023 | 50 | #define MSR_PIC_ZSEL_HIGH 0x51400023 |
47 | 51 | ||
48 | #define MFGPT_IRQ_MSR 0x51400028 | 52 | #define MSR_MFGPT_IRQ 0x51400028 |
49 | #define MFGPT_NR_MSR 0x51400029 | 53 | #define MSR_MFGPT_NR 0x51400029 |
54 | #define MSR_MFGPT_SETUP 0x5140002B | ||
55 | |||
56 | #define MSR_LX_SPARE_MSR 0x80000011 /* DC-specific */ | ||
57 | |||
58 | #define MSR_GX_GLD_MSR_CONFIG 0xC0002001 | ||
59 | #define MSR_GX_MSR_PADSEL 0xC0002011 | ||
50 | 60 | ||
51 | /* Resource Sizes */ | 61 | /* Resource Sizes */ |
52 | 62 | ||