aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/s3c2410fb.c
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2007-10-16 01:29:01 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 09:43:17 -0700
commite92e739514baed2be83cfb269db003c73dd885c2 (patch)
tree722f158a6ba32d4266b4067e01eba7482e5c5130 /drivers/video/s3c2410fb.c
parents3c2410fb: add pulse length fields to s3c2410fb_display (diff)
downloadlinux-dev-e92e739514baed2be83cfb269db003c73dd885c2.tar.xz
linux-dev-e92e739514baed2be83cfb269db003c73dd885c2.zip
s3c2410fb: remove lcdcon2 and lcdcon3 register fields
This patch removes unused lcdcon2 and lcdcon3 register value from the s3c2410fb_display structure. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/s3c2410fb.c')
-rw-r--r--drivers/video/s3c2410fb.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 43749bd1fd67..e850f11488e1 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -341,8 +341,7 @@ static void s3c2410fb_calculate_stn_lcd_regs(const struct fb_info *info,
S3C2410_LCDCON3_LINEBLANK(var->right_margin / 8) |
S3C2410_LCDCON3_HOZVAL(hs - 1);
- regs->lcdcon4 &= ~S3C2410_LCDCON4_HSPW(0xff);
- regs->lcdcon4 |= S3C2410_LCDCON4_HSPW(wlh);
+ regs->lcdcon4 = S3C2410_LCDCON4_WLH(wlh);
}
/* s3c2410fb_calculate_tft_lcd_regs
@@ -399,8 +398,7 @@ static void s3c2410fb_calculate_tft_lcd_regs(const struct fb_info *info,
S3C2410_LCDCON3_HFPD(var->left_margin - 1) |
S3C2410_LCDCON3_HOZVAL(var->xres - 1);
- regs->lcdcon4 &= ~S3C2410_LCDCON4_HSPW(0xff);
- regs->lcdcon4 |= S3C2410_LCDCON4_HSPW(var->hsync_len - 1);
+ regs->lcdcon4 = S3C2410_LCDCON4_HSPW(var->hsync_len - 1);
}
/* s3c2410fb_activate_var
@@ -850,8 +848,6 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
strcpy(fbinfo->fix.id, driver_name);
info->regs.lcdcon1 = display->lcdcon1;
- info->regs.lcdcon2 = display->lcdcon2;
- info->regs.lcdcon4 = display->lcdcon4;
info->regs.lcdcon5 = display->lcdcon5;
/* Stop the video and unset ENVID if set */