diff options
author | Andres Salomon <dilinger@queued.net> | 2008-04-28 05:15:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:39 -0400 |
commit | 31f51fa8d47943f14a270955415b94a22e174a10 (patch) | |
tree | 14f3c6b33badda0cfa6ad01ebfedd6f49b8bf5a9 /drivers/video/geode/lxfb.h | |
parent | f5c90e85dc77669a55fecfb593bb8e7f47374ee2 (diff) |
lxfb: clean up final bits of df_regs
Finally drop the last remnants of df_regs, using vp_regs instead. Also, drop
panel_width and panel_height from lxfb_par; they're unused.
Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: 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/lxfb.h')
-rw-r--r-- | drivers/video/geode/lxfb.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/video/geode/lxfb.h b/drivers/video/geode/lxfb.h index 6eac13d0ffb4..0e3cb9191009 100644 --- a/drivers/video/geode/lxfb.h +++ b/drivers/video/geode/lxfb.h | |||
@@ -8,12 +8,10 @@ | |||
8 | 8 | ||
9 | struct lxfb_par { | 9 | struct lxfb_par { |
10 | int output; | 10 | int output; |
11 | int panel_width; | ||
12 | int panel_height; | ||
13 | 11 | ||
14 | void __iomem *gp_regs; | 12 | void __iomem *gp_regs; |
15 | void __iomem *dc_regs; | 13 | void __iomem *dc_regs; |
16 | void __iomem *df_regs; | 14 | void __iomem *vp_regs; |
17 | }; | 15 | }; |
18 | 16 | ||
19 | static inline unsigned int lx_get_pitch(unsigned int xres, int bpp) | 17 | static inline unsigned int lx_get_pitch(unsigned int xres, int bpp) |
@@ -374,22 +372,22 @@ static inline void write_dc(struct lxfb_par *par, int reg, uint32_t val) | |||
374 | 372 | ||
375 | static inline uint32_t read_vp(struct lxfb_par *par, int reg) | 373 | static inline uint32_t read_vp(struct lxfb_par *par, int reg) |
376 | { | 374 | { |
377 | return readl(par->df_regs + 8*reg); | 375 | return readl(par->vp_regs + 8*reg); |
378 | } | 376 | } |
379 | 377 | ||
380 | static inline void write_vp(struct lxfb_par *par, int reg, uint32_t val) | 378 | static inline void write_vp(struct lxfb_par *par, int reg, uint32_t val) |
381 | { | 379 | { |
382 | writel(val, par->df_regs + 8*reg); | 380 | writel(val, par->vp_regs + 8*reg); |
383 | } | 381 | } |
384 | 382 | ||
385 | static inline uint32_t read_fp(struct lxfb_par *par, int reg) | 383 | static inline uint32_t read_fp(struct lxfb_par *par, int reg) |
386 | { | 384 | { |
387 | return readl(par->df_regs + 8*reg + VP_FP_START); | 385 | return readl(par->vp_regs + 8*reg + VP_FP_START); |
388 | } | 386 | } |
389 | 387 | ||
390 | static inline void write_fp(struct lxfb_par *par, int reg, uint32_t val) | 388 | static inline void write_fp(struct lxfb_par *par, int reg, uint32_t val) |
391 | { | 389 | { |
392 | writel(val, par->df_regs + 8*reg + VP_FP_START); | 390 | writel(val, par->vp_regs + 8*reg + VP_FP_START); |
393 | } | 391 | } |
394 | 392 | ||
395 | #endif | 393 | #endif |