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

Commit daf695fc authored by Maurus Cuelenaere's avatar Maurus Cuelenaere Committed by Linus Torvalds
Browse files

arm: samsung: remove pixclock from several boards 



Since "s3c-fb: Automatically calculate pixel clock when none is given",
there's no need for manually calculating the pixel clock anymore so remove
these lines and add the correct refresh rate where appropriately.

Signed-off-by: default avatarMaurus Cuelenaere <mcuelenaere@gmail.com>
Cc: Pawel Osciak <p.osciak@samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: InKi Dae <inki.dae@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2bb567a3

arch/arm/mach-s3c64xx/mach-anw6410.c

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ static struct platform_device anw6410_lcd_powerdev = { 
static struct s3c_fb_pd_win anw6410_fb_win0 = {

	/* this is to ensure we use win0 */

	.win_mode	= {

		.pixclock	= 41094,

		.left_margin	= 8,

		.right_margin	= 13,

		.upper_margin	= 7,

arch/arm/mach-s3c64xx/mach-hmt.c

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ static struct platform_device hmt_backlight_device = { 


static struct s3c_fb_pd_win hmt_fb_win0 = {

	.win_mode	= {

		.pixclock	= 41094,

		.left_margin	= 8,

		.right_margin	= 13,

		.upper_margin	= 7,

arch/arm/mach-s3c64xx/mach-smartq5.c

+1 −2
Original line number Diff line number Diff line
@@ -134,8 +134,6 @@ static struct platform_device smartq5_buttons_device = { 


static struct s3c_fb_pd_win smartq5_fb_win0 = {

	.win_mode	= {

		.pixclock	= 1000000000000ULL /

				((40+1+216+800)*(10+1+35+480)*80),

		.left_margin	= 40,

		.right_margin	= 216,

		.upper_margin	= 10,
@@ -144,6 +142,7 @@ static struct s3c_fb_pd_win smartq5_fb_win0 = { 
		.vsync_len	= 1,

		.xres		= 800,

		.yres		= 480,

		.refresh	= 80,

	},

	.max_bpp	= 32,

	.default_bpp	= 16,

arch/arm/mach-s3c64xx/mach-smartq7.c

+1 −2
Original line number Diff line number Diff line
@@ -150,8 +150,6 @@ static struct platform_device smartq7_buttons_device = { 


static struct s3c_fb_pd_win smartq7_fb_win0 = {

	.win_mode	= {

		.pixclock	= 1000000000000ULL /

				((3+10+5+800)*(1+3+20+480)*80),

		.left_margin	= 3,

		.right_margin	= 5,

		.upper_margin	= 1,
@@ -160,6 +158,7 @@ static struct s3c_fb_pd_win smartq7_fb_win0 = { 
		.vsync_len	= 3,

		.xres		= 800,

		.yres		= 480,

		.refresh	= 80,

	},

	.max_bpp	= 32,

	.default_bpp	= 16,

arch/arm/mach-s3c64xx/mach-smdk6410.c

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ static struct platform_device smdk6410_lcd_powerdev = { 
static struct s3c_fb_pd_win smdk6410_fb_win0 = {

	/* this is to ensure we use win0 */

	.win_mode	= {

		.pixclock	= 41094,

		.left_margin	= 8,

		.right_margin	= 13,

		.upper_margin	= 7,