Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e92e7395 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files

s3c2410fb: remove lcdcon2 and lcdcon3 register fields 



This patch removes unused lcdcon2 and lcdcon3 register value
from the s3c2410fb_display structure.

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 93d11f5a

arch/arm/mach-s3c2410/mach-amlm5900.c

+0 −2
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = { 
	.lower_margin	= 0,



	.lcdcon1	= 0x00008225,

	.lcdcon2	= 0x0027c000,

	.lcdcon4	= 0x00000002,

	.lcdcon5	= 0x00000001,

};

arch/arm/mach-s3c2410/mach-bast.c

+0 −18
Original line number Diff line number Diff line
@@ -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,

	},

};

arch/arm/mach-s3c2410/mach-h1940.c

+0 −10
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-s3c2410/mach-qt2410.c

+0 −24
Original line number Diff line number Diff line
@@ -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 |

arch/arm/mach-s3c2440/mach-rx3715.c

+0 −10
Original line number Diff line number Diff line
@@ -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[] = {