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

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

s3c2410fb: remove lcdcon3 register from s3c2410fb_display 



This patch removes unused lcdcon3 register 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 9939a481

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

+4 −7
Original line number Diff line number Diff line
@@ -180,13 +180,10 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = { 
	.left_margin	= 1 << (4 + 3),

	.right_margin	= 8 << 3,



	.regs		= {

	.lcdcon1	= 0x00008225,

	.lcdcon2	= 0x0027c000,

		.lcdcon3	= 0x00182708,

	.lcdcon4	= 0x00000002,

	.lcdcon5	= 0x00000001,

	}

};



static struct s3c2410fb_mach_info __initdata amlm5900_fb_info = {

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

+36 −63
Original line number Diff line number Diff line
@@ -479,13 +479,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 


		.bpp		= 4,



		.regs		= {

		.lcdcon1	= 0x00000176,

		.lcdcon2	= 0x1d77c7c2,

			.lcdcon3	= 0x013a7f13,

		.lcdcon4	= 0x00000057,

		.lcdcon5	= 0x00014b02,

		}

	},

	{

		.type		= S3C2410_LCDCON1_TFT,
@@ -498,13 +495,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 
		.left_margin	= 40,

		.right_margin	= 20,



		.regs		= {

		.lcdcon1	= 0x00000176,

		.lcdcon2	= 0x1d77c7c2,

			.lcdcon3	= 0x013a7f13,

		.lcdcon4	= 0x00000057,

		.lcdcon5	= 0x00014b02,

		}

	},

	{

		.type		= S3C2410_LCDCON1_TFT,
@@ -517,13 +511,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 
		.left_margin	= 40,

		.right_margin	= 20,



		.regs		= {

		.lcdcon1	= 0x00000176,

		.lcdcon2	= 0x1d77c7c2,

			.lcdcon3	= 0x013a7f13,

		.lcdcon4	= 0x00000057,

		.lcdcon5	= 0x00014b02,

		}

	},

	{

		.type		= S3C2410_LCDCON1_TFT,
@@ -536,13 +527,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 
		.left_margin	= 40,

		.right_margin	= 20,



		.regs		= {

		.lcdcon1	= 0x00000176,

		.lcdcon2	= 0x1d77c7c2,

			.lcdcon3	= 0x013a7f13,

		.lcdcon4	= 0x00000057,

		.lcdcon5	= 0x00014b02,

		}

	},

	{

		.type		= S3C2410_LCDCON1_TFT,
@@ -555,13 +543,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 
		.left_margin	= 40,

		.right_margin	= 20,



		.regs		= {

		.lcdcon1	= 0x00000176,

		.lcdcon2	= 0x1d77c7c2,

			.lcdcon3	= 0x013a7f13,

		.lcdcon4	= 0x00000057,

		.lcdcon5	= 0x00014b02,

		}

	},

	{

		.type		= S3C2410_LCDCON1_TFT,
@@ -574,13 +559,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 
		.left_margin	= 40,

		.right_margin	= 20,



		.regs		= {

		.lcdcon1	= 0x00000176,

		.lcdcon2	= 0x1d77c7c2,

			.lcdcon3	= 0x013a7f13,

		.lcdcon4	= 0x00000057,

		.lcdcon5	= 0x00014b02,

		}

	},

	{

		.type		= S3C2410_LCDCON1_TFT,
@@ -593,13 +575,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 
		.left_margin	= 40,

		.right_margin	= 20,



		.regs		= {

		.lcdcon1	= 0x00000176,

		.lcdcon2	= 0x1d77c7c2,

			.lcdcon3	= 0x013a7f13,

		.lcdcon4	= 0x00000057,

		.lcdcon5	= 0x00014b02,

		}

	},

	{

		.type		= S3C2410_LCDCON1_TFT,
@@ -612,13 +591,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 
		.left_margin	= 40,

		.right_margin	= 20,



		.regs		= {

		.lcdcon1	= 0x00000176,

		.lcdcon2	= 0x1d77c7c2,

			.lcdcon3	= 0x013a7f13,

		.lcdcon4	= 0x00000057,

		.lcdcon5	= 0x00014b02,

		}

	},

	{

		.type		= S3C2410_LCDCON1_TFT,
@@ -631,13 +607,10 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 
		.left_margin	= 40,

		.right_margin	= 20,



		.regs		= {

		.lcdcon1	= 0x00000176,

		.lcdcon2	= 0x1d77c7c2,

			.lcdcon3	= 0x013a7f13,

		.lcdcon4	= 0x00000057,

		.lcdcon5	= 0x00014b02,

		}

	},

};

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

+15 −21
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ static struct s3c2410_udc_mach_info h1940_udc_cfg __initdata = { 
 * Set lcd on or off

 **/

static struct s3c2410fb_display h1940_lcd __initdata = {

	.regs={

	.lcdcon1=	S3C2410_LCDCON1_TFT16BPP | \

			S3C2410_LCDCON1_TFT | \

			S3C2410_LCDCON1_CLKVAL(0x0C),
@@ -144,17 +143,12 @@ static struct s3c2410fb_display h1940_lcd __initdata = { 
			S3C2410_LCDCON2_VFPD(6) | \

			S3C2410_LCDCON2_VSPW(0),



		.lcdcon3=	S3C2410_LCDCON3_HBPD(19) | \

				S3C2410_LCDCON3_HOZVAL(239) | \

				S3C2410_LCDCON3_HFPD(7),



	.lcdcon4=	S3C2410_LCDCON4_MVAL(0) | \

			S3C2410_LCDCON4_HSPW(3),



	.lcdcon5=	S3C2410_LCDCON5_FRM565 | \

			S3C2410_LCDCON5_INVVLINE | \

			S3C2410_LCDCON5_HWSWP,

	},



	.type =		S3C2410_LCDCON1_TFT,

	.width =	240,

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

+45 −66
Original line number Diff line number Diff line
@@ -98,8 +98,6 @@ static struct s3c2410_uartcfg smdk2410_uartcfgs[] = { 
static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = {

	{

		/* Configuration for 640x480 SHARP LQ080V3DG01 */

		.regs	= {



		.lcdcon1 = S3C2410_LCDCON1_TFT16BPP |

			   S3C2410_LCDCON1_TFT |

			   S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
@@ -109,10 +107,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { 
			   S3C2410_LCDCON2_VFPD(10) |	/* 11 */

			   S3C2410_LCDCON2_VSPW(14),	/* 15 */



			.lcdcon3 = S3C2410_LCDCON3_HBPD(43) |	/* 44 */

				   S3C2410_LCDCON3_HOZVAL(639) | /* 640 */

				   S3C2410_LCDCON3_HFPD(115),	/* 116 */



		.lcdcon4 = S3C2410_LCDCON4_MVAL(0) |

			   S3C2410_LCDCON4_HSPW(95),	/* 96 */
@@ -121,7 +115,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { 
			   S3C2410_LCDCON5_INVVFRAME |

			   S3C2410_LCDCON5_PWREN |

			   S3C2410_LCDCON5_HWSWP,

		},



		.type		= S3C2410_LCDCON1_TFT,

		.width		= 640,
@@ -135,8 +128,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { 
	},

	{

		/* Configuration for 480x640 toppoly TD028TTEC1 */

		.regs	= {



		.lcdcon1 = S3C2410_LCDCON1_TFT16BPP |

			   S3C2410_LCDCON1_TFT |

			   S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
@@ -146,10 +137,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { 
			   S3C2410_LCDCON2_VFPD(3) |	/* 4 */

			   S3C2410_LCDCON2_VSPW(1),	/* 2 */



			.lcdcon3 = S3C2410_LCDCON3_HBPD(7) |	/* 8 */

				   S3C2410_LCDCON3_HOZVAL(479) | /* 479 */

				   S3C2410_LCDCON3_HFPD(23),	/* 24 */



		.lcdcon4 = S3C2410_LCDCON4_MVAL(0) |

			   S3C2410_LCDCON4_HSPW(7),	/* 8 */
@@ -158,7 +145,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { 
			   S3C2410_LCDCON5_INVVFRAME |

			   S3C2410_LCDCON5_PWREN |

			   S3C2410_LCDCON5_HWSWP,

		},



		.type		= S3C2410_LCDCON1_TFT,

		.width		= 480,
@@ -171,8 +157,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { 
	},

	{

		/* Config for 240x320 LCD */

		.regs	= {



		.lcdcon1 = S3C2410_LCDCON1_TFT16BPP |

			   S3C2410_LCDCON1_TFT |

			   S3C2410_LCDCON1_CLKVAL(0x04),
@@ -182,10 +166,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { 
			   S3C2410_LCDCON2_VFPD(6) |

			   S3C2410_LCDCON2_VSPW(3),



			.lcdcon3 = S3C2410_LCDCON3_HBPD(12) |

				   S3C2410_LCDCON3_HOZVAL(239) |

				   S3C2410_LCDCON3_HFPD(7),



		.lcdcon4 = S3C2410_LCDCON4_MVAL(0) |

			   S3C2410_LCDCON4_HSPW(3),
@@ -194,7 +174,6 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { 
			   S3C2410_LCDCON5_INVVFRAME |

			   S3C2410_LCDCON5_PWREN |

			   S3C2410_LCDCON5_HWSWP,

		},



		.type		= S3C2410_LCDCON1_TFT,

		.width		= 240,

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

+15 −21
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = { 
/* framebuffer lcd controller information */



static struct s3c2410fb_display rx3715_lcdcfg __initdata = {

	.regs	= {

	.lcdcon1 =	S3C2410_LCDCON1_TFT16BPP | \

			S3C2410_LCDCON1_TFT | \

			S3C2410_LCDCON1_CLKVAL(0x0C),
@@ -121,17 +120,12 @@ static struct s3c2410fb_display rx3715_lcdcfg __initdata = { 
			S3C2410_LCDCON2_VFPD(6) | \

			S3C2410_LCDCON2_VSPW(2),



		.lcdcon3 =	S3C2410_LCDCON3_HBPD(35) | \

				S3C2410_LCDCON3_HOZVAL(239) | \

				S3C2410_LCDCON3_HFPD(35),



	.lcdcon4 =	S3C2410_LCDCON4_MVAL(0) | \

			S3C2410_LCDCON4_HSPW(7),



	.lcdcon5 =	S3C2410_LCDCON5_INVVLINE |

			S3C2410_LCDCON5_FRM565 |

			S3C2410_LCDCON5_HWSWP,

	},



	.type		= S3C2410_LCDCON1_TFT,

	.width		= 240,