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

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

s3c2410fb: adds pixclock to s3c2410fb_display 



This patch adds pixelclock field to the s3c2410fb_display structure and make
use of it in the driver.

The Bast machine defined 9 modes but pixclock and margin values are defined
only for the 640x480 modes so I removed other modes.

This patch also fixes wrong display type constant for the SMDK2440 board.

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 9fa7bc01

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

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = { 


	.type		= S3C2410_LCDCON1_STN4,



	.pixclock	= 680000, /* HCLK = 100MHz */

	.xres		= 160,

	.yres		= 160,

	.bpp		= 4,

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

+3 −109
Original line number Diff line number Diff line
@@ -473,25 +473,7 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 
		.width		= 640,

		.height		= 480,



		.xres		= 320,

		.yres		= 240,

		.left_margin	= 40,

		.right_margin	= 20,

		.hsync_len	= 88,

		.upper_margin	= 30,

		.lower_margin	= 32,

		.vsync_len	= 3,



		.bpp		= 4,



		.lcdcon1	= 0x00000176,

		.lcdcon5	= 0x00014b02,

	},

	{

		.type		= S3C2410_LCDCON1_TFT,

		.width		= 640,

		.height		= 480,



		.pixclock	= 33333,

		.xres		= 640,

		.yres		= 480,

		.bpp		= 4,
@@ -510,42 +492,7 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 
		.width		= 640,

		.height		= 480,



		.xres		= 800,

		.yres		= 600,

		.bpp		= 4,

		.left_margin	= 40,

		.right_margin	= 20,

		.hsync_len	= 88,

		.upper_margin	= 30,

		.lower_margin	= 32,

		.vsync_len	= 3,



		.lcdcon1	= 0x00000176,

		.lcdcon5	= 0x00014b02,

	},

	{

		.type		= S3C2410_LCDCON1_TFT,

		.width		= 640,

		.height		= 480,



		.xres		= 320,

		.yres		= 240,

		.bpp		= 8,

		.left_margin	= 40,

		.right_margin	= 20,

		.hsync_len	= 88,

		.upper_margin	= 30,

		.lower_margin	= 32,

		.vsync_len	= 3,



		.lcdcon1	= 0x00000176,

		.lcdcon5	= 0x00014b02,

	},

	{

		.type		= S3C2410_LCDCON1_TFT,

		.width		= 640,

		.height		= 480,



		.pixclock	= 33333,

		.xres		= 640,

		.yres		= 480,

		.bpp		= 8,
@@ -564,42 +511,7 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 
		.width		= 640,

		.height		= 480,



		.xres		= 800,

		.yres		= 600,

		.bpp		= 8,

		.left_margin	= 40,

		.right_margin	= 20,

		.hsync_len	= 88,

		.upper_margin	= 30,

		.lower_margin	= 32,

		.vsync_len	= 3,



		.lcdcon1	= 0x00000176,

		.lcdcon5	= 0x00014b02,

	},

	{

		.type		= S3C2410_LCDCON1_TFT,

		.width		= 640,

		.height		= 480,



		.xres		= 320,

		.yres		= 240,

		.bpp		= 16,

		.left_margin	= 40,

		.right_margin	= 20,

		.hsync_len	= 88,

		.upper_margin	= 30,

		.lower_margin	= 32,

		.vsync_len	= 3,



		.lcdcon1	= 0x00000176,

		.lcdcon5	= 0x00014b02,

	},

	{

		.type		= S3C2410_LCDCON1_TFT,

		.width		= 640,

		.height		= 480,



		.pixclock	= 33333,

		.xres		= 640,

		.yres		= 480,

		.bpp		= 16,
@@ -610,24 +522,6 @@ static struct s3c2410fb_display __initdata bast_lcd_info[] = { 
		.lower_margin	= 32,

		.vsync_len	= 3,



		.lcdcon1	= 0x00000176,

		.lcdcon5	= 0x00014b02,

	},

	{

		.type		= S3C2410_LCDCON1_TFT,

		.width		= 640,

		.height		= 480,



		.xres		= 800,

		.yres		= 600,

		.bpp		= 16,

		.left_margin	= 40,

		.right_margin	= 20,

		.hsync_len	= 88,

		.upper_margin	= 30,

		.lower_margin	= 32,

		.vsync_len	= 3,



		.lcdcon1	= 0x00000176,

		.lcdcon5	= 0x00014b02,

	},

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

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ static struct s3c2410fb_display h1940_lcd __initdata = { 
	.type =		S3C2410_LCDCON1_TFT,

	.width =	240,

	.height =	320,

	.pixclock =	260000,

	.xres =		240,

	.yres =		320,

	.bpp =		16,

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

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { 
		.width		= 640,

		.height		= 480,



		.pixclock	= 40000, /* HCLK/4 */

		.xres		= 640,

		.yres		= 480,

		.bpp		= 16,
@@ -137,6 +138,7 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { 
		.type		= S3C2410_LCDCON1_TFT,

		.width		= 480,

		.height		= 640,

		.pixclock	= 40000, /* HCLK/4 */

		.xres		= 480,

		.yres		= 640,

		.bpp		= 16,
@@ -162,6 +164,7 @@ static struct s3c2410fb_display qt2410_lcd_cfg[] __initdata = { 
		.type		= S3C2410_LCDCON1_TFT,

		.width		= 240,

		.height		= 320,

		.pixclock	= 100000, /* HCLK/10 */

		.xres		= 240,

		.yres		= 320,

		.bpp		= 16,

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

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static struct s3c2410fb_display rx3715_lcdcfg __initdata = { 
	.width		= 240,

	.height		= 320,



	.pixclock	= 260000,

	.xres		= 240,

	.yres		= 320,

	.bpp		= 16,