diff options
| author | Andres Salomon <dilinger@queued.net> | 2008-04-28 02:15:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 08:58:36 -0700 |
| commit | 9f1277bd1497858a05a80222a6e98f9c43343491 (patch) | |
| tree | 8fccb34af16de101fbf43582d8c40611cc3765d5 /drivers/video/geode | |
| parent | d255114f22e19b50cf45fcc70963e6a9f287ad40 (diff) | |
| download | linux-9f1277bd1497858a05a80222a6e98f9c43343491.tar.gz linux-9f1277bd1497858a05a80222a6e98f9c43343491.tar.bz2 linux-9f1277bd1497858a05a80222a6e98f9c43343491.zip | |
gxfb: move MSR bit fields into gxfb.h
This continues the gxfb header cleanups. MSRs are defined in geode.h; the
specific bits we care about are defined in gxfb.h.
Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: Jordan Crouse <jordan.crouse@amd.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/geode')
| -rw-r--r-- | drivers/video/geode/display_gx.h | 3 | ||||
| -rw-r--r-- | drivers/video/geode/gxfb.h | 16 | ||||
| -rw-r--r-- | drivers/video/geode/gxfb_core.c | 2 | ||||
| -rw-r--r-- | drivers/video/geode/video_gx.c | 4 | ||||
| -rw-r--r-- | drivers/video/geode/video_gx.h | 14 |
5 files changed, 19 insertions, 20 deletions
diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h index 56e9d2ea52c9..ad556d39765c 100644 --- a/drivers/video/geode/display_gx.h +++ b/drivers/video/geode/display_gx.h @@ -16,7 +16,4 @@ int gx_line_delta(int xres, int bpp); extern struct geode_dc_ops gx_dc_ops; -/* MSR that tells us if a TFT or CRT is attached */ -#define GLD_MSR_CONFIG_DM_FP 0x40 - #endif /* !__DISPLAY_GX1_H__ */ diff --git a/drivers/video/geode/gxfb.h b/drivers/video/geode/gxfb.h index d408ad354d2d..c21f9dc5e0c1 100644 --- a/drivers/video/geode/gxfb.h +++ b/drivers/video/geode/gxfb.h @@ -252,4 +252,20 @@ static inline void write_fp(struct geodefb_par *par, int reg, uint32_t val) writel(val, par->vid_regs + 8*reg + VP_FP_START); } + +/* MSRs are defined in asm/geode.h; their bitfields are here */ + +#define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3 (1 << 3) +#define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2 (1 << 2) +#define MSR_GLCP_SYS_RSTPLL_DOTPREDIV2 (1 << 1) + +#define MSR_GLCP_DOTPLL_LOCK (1 << 25) /* r/o */ +#define MSR_GLCP_DOTPLL_BYPASS (1 << 15) +#define MSR_GLCP_DOTPLL_DOTRESET (1 << 0) + +#define MSR_GX_MSR_PADSEL_MASK 0x3FFFFFFF /* undocumented? */ +#define MSR_GX_MSR_PADSEL_TFT 0x1FFFFFFF /* undocumented? */ + +#define MSR_GX_GLD_MSR_CONFIG_FP (1 << 3) + #endif diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c index fd58dcc44670..09132513c69a 100644 --- a/drivers/video/geode/gxfb_core.c +++ b/drivers/video/geode/gxfb_core.c @@ -328,7 +328,7 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i rdmsrl(MSR_GX_GLD_MSR_CONFIG, val); - if ((val & GLD_MSR_CONFIG_DM_FP) == GLD_MSR_CONFIG_DM_FP) + if ((val & MSR_GX_GLD_MSR_CONFIG_FP) == MSR_GX_GLD_MSR_CONFIG_FP) par->enable_crt = 0; else par->enable_crt = 1; diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c index 1b98b7b4e853..1e26bc422461 100644 --- a/drivers/video/geode/video_gx.c +++ b/drivers/video/geode/video_gx.c @@ -187,8 +187,8 @@ gx_configure_tft(struct fb_info *info) /* Set up the DF pad select MSR */ rdmsrl(MSR_GX_MSR_PADSEL, val); - val &= ~GX_VP_PAD_SELECT_MASK; - val |= GX_VP_PAD_SELECT_TFT; + val &= ~MSR_GX_MSR_PADSEL_MASK; + val |= MSR_GX_MSR_PADSEL_TFT; wrmsrl(MSR_GX_MSR_PADSEL, val); /* Turn off the panel */ diff --git a/drivers/video/geode/video_gx.h b/drivers/video/geode/video_gx.h index 5457bd04ec74..79f6e818a6f4 100644 --- a/drivers/video/geode/video_gx.h +++ b/drivers/video/geode/video_gx.h @@ -13,18 +13,4 @@ extern struct geode_vid_ops gx_vid_ops; -/* GX Flatpanel control MSR */ -#define GX_VP_PAD_SELECT_MASK 0x3FFFFFFF -#define GX_VP_PAD_SELECT_TFT 0x1FFFFFFF - -/* Geode GX clock control MSRs */ - -# define MSR_GLCP_SYS_RSTPLL_DOTPREDIV2 (0x0000000000000002ull) -# define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2 (0x0000000000000004ull) -# define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3 (0x0000000000000008ull) - -# define MSR_GLCP_DOTPLL_DOTRESET (0x0000000000000001ull) -# define MSR_GLCP_DOTPLL_BYPASS (0x0000000000008000ull) -# define MSR_GLCP_DOTPLL_LOCK (0x0000000002000000ull) - #endif /* !__VIDEO_GX_H__ */ |