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 /drivers/video/geode/video_gx.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 'drivers/video/geode/video_gx.c')
-rw-r--r-- | drivers/video/geode/video_gx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c index febf09c63492..d0885370675d 100644 --- a/drivers/video/geode/video_gx.c +++ b/drivers/video/geode/video_gx.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <asm/io.h> | 16 | #include <asm/io.h> |
17 | #include <asm/delay.h> | 17 | #include <asm/delay.h> |
18 | #include <asm/msr.h> | 18 | #include <asm/msr.h> |
19 | #include <asm/geode.h> | ||
19 | 20 | ||
20 | #include "geodefb.h" | 21 | #include "geodefb.h" |
21 | #include "video_gx.h" | 22 | #include "video_gx.h" |
@@ -184,10 +185,10 @@ gx_configure_tft(struct fb_info *info) | |||
184 | 185 | ||
185 | /* Set up the DF pad select MSR */ | 186 | /* Set up the DF pad select MSR */ |
186 | 187 | ||
187 | rdmsrl(GX_VP_MSR_PAD_SELECT, val); | 188 | rdmsrl(MSR_GX_MSR_PADSEL, val); |
188 | val &= ~GX_VP_PAD_SELECT_MASK; | 189 | val &= ~GX_VP_PAD_SELECT_MASK; |
189 | val |= GX_VP_PAD_SELECT_TFT; | 190 | val |= GX_VP_PAD_SELECT_TFT; |
190 | wrmsrl(GX_VP_MSR_PAD_SELECT, val); | 191 | wrmsrl(MSR_GX_MSR_PADSEL, val); |
191 | 192 | ||
192 | /* Turn off the panel */ | 193 | /* Turn off the panel */ |
193 | 194 | ||