diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/s3c2410fb.c | 8 |
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, | |||
341 | S3C2410_LCDCON3_LINEBLANK(var->right_margin / 8) | | 341 | S3C2410_LCDCON3_LINEBLANK(var->right_margin / 8) | |
342 | S3C2410_LCDCON3_HOZVAL(hs - 1); | 342 | S3C2410_LCDCON3_HOZVAL(hs - 1); |
343 | 343 | ||
344 | regs->lcdcon4 &= ~S3C2410_LCDCON4_HSPW(0xff); | 344 | regs->lcdcon4 = S3C2410_LCDCON4_WLH(wlh); |
345 | regs->lcdcon4 |= S3C2410_LCDCON4_HSPW(wlh); | ||
346 | } | 345 | } |
347 | 346 | ||
348 | /* s3c2410fb_calculate_tft_lcd_regs | 347 | /* s3c2410fb_calculate_tft_lcd_regs |
@@ -399,8 +398,7 @@ static void s3c2410fb_calculate_tft_lcd_regs(const struct fb_info *info, | |||
399 | S3C2410_LCDCON3_HFPD(var->left_margin - 1) | | 398 | S3C2410_LCDCON3_HFPD(var->left_margin - 1) | |
400 | S3C2410_LCDCON3_HOZVAL(var->xres - 1); | 399 | S3C2410_LCDCON3_HOZVAL(var->xres - 1); |
401 | 400 | ||
402 | regs->lcdcon4 &= ~S3C2410_LCDCON4_HSPW(0xff); | 401 | regs->lcdcon4 = S3C2410_LCDCON4_HSPW(var->hsync_len - 1); |
403 | regs->lcdcon4 |= S3C2410_LCDCON4_HSPW(var->hsync_len - 1); | ||
404 | } | 402 | } |
405 | 403 | ||
406 | /* s3c2410fb_activate_var | 404 | /* s3c2410fb_activate_var |
@@ -850,8 +848,6 @@ static int __init s3c2410fb_probe(struct platform_device *pdev) | |||
850 | strcpy(fbinfo->fix.id, driver_name); | 848 | strcpy(fbinfo->fix.id, driver_name); |
851 | 849 | ||
852 | info->regs.lcdcon1 = display->lcdcon1; | 850 | info->regs.lcdcon1 = display->lcdcon1; |
853 | info->regs.lcdcon2 = display->lcdcon2; | ||
854 | info->regs.lcdcon4 = display->lcdcon4; | ||
855 | info->regs.lcdcon5 = display->lcdcon5; | 851 | info->regs.lcdcon5 = display->lcdcon5; |
856 | 852 | ||
857 | /* Stop the video and unset ENVID if set */ | 853 | /* Stop the video and unset ENVID if set */ |