Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

s3c2410fb: remove lcdcon2 and lcdcon3 register fields

Browse source 
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>
This commit is contained in:
Krzysztof Helt 2007-10-16 01:29:01 -07:00 committed by Linus Torvalds
parent 93d11f5a15
commit e92e739514
8 changed files with 2 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-s3c2410/mach-amlm5900.c
View file

@ -184,8 +184,6 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = {
.lower_margin = 0,
.lcdcon1 = 0x00008225,
.lcdcon2 = 0x0027c000,
.lcdcon4 = 0x00000002,
.lcdcon5 = 0x00000001,
};

18
arch/arm/mach-s3c2410/mach-bast.c
View file

@ -485,8 +485,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.bpp = 4,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
.lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@ -505,8 +503,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.vsync_len = 3,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
.lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@ -525,8 +521,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.vsync_len = 3,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
.lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@ -545,8 +539,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.vsync_len = 3,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
.lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@ -565,8 +557,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.vsync_len = 3,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
.lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@ -585,8 +575,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.vsync_len = 3,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
.lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@ -605,8 +593,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.vsync_len = 3,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
.lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@ -625,8 +611,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.vsync_len = 3,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
.lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@ -645,8 +629,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = {
.vsync_len = 3,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
.lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
};

10
arch/arm/mach-s3c2410/mach-h1940.c
View file

@ -138,14 +138,6 @@ static struct s3c2410fb_display h1940_lcd __initdata = {
S3C2410_LCDCON1_TFT | \
S3C2410_LCDCON1_CLKVAL(0x0C),
.lcdcon2= S3C2410_LCDCON2_VBPD(7) | \
S3C2410_LCDCON2_LINEVAL(319) | \
S3C2410_LCDCON2_VFPD(6) | \
S3C2410_LCDCON2_VSPW(0),
.lcdcon4= S3C2410_LCDCON4_MVAL(0) | \
S3C2410_LCDCON4_HSPW(3),
.lcdcon5= S3C2410_LCDCON5_FRM565 | \
S3C2410_LCDCON5_INVVLINE | \
S3C2410_LCDCON5_HWSWP,
@ -165,8 +157,6 @@ static struct s3c2410fb_display h1940_lcd __initdata = {
};
static struct s3c2410fb_mach_info h1940_fb_info __initdata = {
.fixed_syncs = 1,
.displays = &h1940_lcd,
.num_displays = 1,
.default_display = 0,

24
arch/arm/mach-s3c2410/mach-qt2410.c
View file

@ -102,14 +102,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
S3C2410_LCDCON1_TFT |
S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
.lcdcon2 = S3C2410_LCDCON2_VBPD(18) | /* 19 */
S3C2410_LCDCON2_LINEVAL(479) |
S3C2410_LCDCON2_VFPD(10) | /* 11 */
S3C2410_LCDCON2_VSPW(14), /* 15 */
.lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
S3C2410_LCDCON4_HSPW(95), /* 96 */
.lcdcon5 = S3C2410_LCDCON5_FRM565 |
S3C2410_LCDCON5_INVVLINE |
S3C2410_LCDCON5_INVVFRAME |
@ -136,14 +128,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
S3C2410_LCDCON1_TFT |
S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
.lcdcon2 = S3C2410_LCDCON2_VBPD(1) | /* 2 */
S3C2410_LCDCON2_LINEVAL(639) |/* 640 */
S3C2410_LCDCON2_VFPD(3) | /* 4 */
S3C2410_LCDCON2_VSPW(1), /* 2 */
.lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
S3C2410_LCDCON4_HSPW(7), /* 8 */
.lcdcon5 = S3C2410_LCDCON5_FRM565 |
S3C2410_LCDCON5_INVVLINE |
S3C2410_LCDCON5_INVVFRAME |
@ -169,14 +153,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {
S3C2410_LCDCON1_TFT |
S3C2410_LCDCON1_CLKVAL(0x04),
.lcdcon2 = S3C2410_LCDCON2_VBPD(1) |
S3C2410_LCDCON2_LINEVAL(319) |
S3C2410_LCDCON2_VFPD(6) |
S3C2410_LCDCON2_VSPW(3),
.lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
S3C2410_LCDCON4_HSPW(3),
.lcdcon5 = S3C2410_LCDCON5_FRM565 |
S3C2410_LCDCON5_INVVLINE |
S3C2410_LCDCON5_INVVFRAME |

10
arch/arm/mach-s3c2440/mach-rx3715.c
View file

@ -115,14 +115,6 @@ static struct s3c2410fb_display rx3715_lcdcfg __initdata = {
S3C2410_LCDCON1_TFT | \
S3C2410_LCDCON1_CLKVAL(0x0C),
.lcdcon2 = S3C2410_LCDCON2_VBPD(5) | \
S3C2410_LCDCON2_LINEVAL(319) | \
S3C2410_LCDCON2_VFPD(6) | \
S3C2410_LCDCON2_VSPW(2),
.lcdcon4 = S3C2410_LCDCON4_MVAL(0) | \
S3C2410_LCDCON4_HSPW(7),
.lcdcon5 = S3C2410_LCDCON5_INVVLINE |
S3C2410_LCDCON5_FRM565 |
S3C2410_LCDCON5_HWSWP,
@ -159,8 +151,6 @@ static struct s3c2410fb_mach_info rx3715_fb_info __initdata = {
.gpdcon_mask = 0xffc0fff0,
.gpdup = 0x0000faff,
.gpdup_mask = 0xffffffff,
.fixed_syncs = 1,
};
static struct mtd_partition rx3715_nand_part[] = {

8
arch/arm/mach-s3c2440/mach-smdk2440.c
View file

@ -109,14 +109,6 @@ static struct s3c2410fb_display smdk2440_lcd_cfg __initdata = {
S3C2410_LCDCON1_TFT |
S3C2410_LCDCON1_CLKVAL(0x04),
.lcdcon2 = S3C2410_LCDCON2_VBPD(7) |
S3C2410_LCDCON2_LINEVAL(319) |
S3C2410_LCDCON2_VFPD(6) |
S3C2410_LCDCON2_VSPW(3),
.lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
S3C2410_LCDCON4_HSPW(3),
.lcdcon5 = S3C2410_LCDCON5_FRM565 |
S3C2410_LCDCON5_INVVLINE |
S3C2410_LCDCON5_INVVFRAME |

8
drivers/video/s3c2410fb.c
View file

@ -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 */

3
include/asm-arm/arch-s3c2410/fb.h
View file

@ -45,13 +45,10 @@ struct s3c2410fb_display {
/* lcd configuration registers */
unsigned long lcdcon1;
unsigned long lcdcon2;
unsigned long lcdcon4;
unsigned long lcdcon5;
};
struct s3c2410fb_mach_info {
unsigned char fixed_syncs; /* do not update sync/border */
struct s3c2410fb_display *displays; /* attached diplays info */
unsigned num_displays; /* number of defined displays */