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

Commit 79d3c41a authored by Thomas Abraham's avatar Thomas Abraham Committed by Florian Tobias Schandinat
Browse files

ARM: Samsung: Rework platform data of s3c-fb driver 



For all the Samsung SoC based boards which have the platform data for
s3c-fb driver, the 'default_win' element in the platform data is removed
and the lcd panel video timing values are moved out of individual window
configuration data.

Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: JeongHyeon Kim <jhkim@insignal.co.kr>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kwangwoo Lee <kwangwoo.lee@gmail.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Peter Korsgaard <jacmet@sunsite.dk>
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Maurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent 884924be

arch/arm/mach-exynos/mach-nuri.c

+15 −11
Original line number Diff line number Diff line
@@ -214,7 +214,15 @@ static struct platform_device nuri_gpio_keys = { 


/* Frame Buffer */

static struct s3c_fb_pd_win nuri_fb_win0 = {

	.win_mode = {

	.max_bpp	= 24,

	.default_bpp	= 16,

	.xres		= 1024,

	.yres		= 600,

	.virtual_x	= 1024,

	.virtual_y	= 2 * 600,

};



static struct fb_videomode nuri_lcd_timing = {

	.left_margin	= 64,

	.right_margin	= 16,

	.upper_margin	= 64,
@@ -224,15 +232,11 @@ static struct s3c_fb_pd_win nuri_fb_win0 = { 
	.xres		= 1024,

	.yres		= 600,

	.refresh	= 60,

	},

	.max_bpp	= 24,

	.default_bpp	= 16,

	.virtual_x	= 1024,

	.virtual_y	= 2 * 600,

};



static struct s3c_fb_platdata nuri_fb_pdata __initdata = {

	.win[0]		= &nuri_fb_win0,

	.vtiming	= &nuri_lcd_timing,

	.vidcon0	= VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB |

			  VIDCON0_CLKSEL_LCD,

	.vidcon1	= VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,

arch/arm/mach-exynos/mach-origen.c

+14 −10
Original line number Diff line number Diff line
@@ -584,7 +584,13 @@ static struct platform_device origen_lcd_hv070wsa = { 
};



static struct s3c_fb_pd_win origen_fb_win0 = {

	.win_mode = {

	.xres			= 1024,

	.yres			= 600,

	.max_bpp		= 32,

	.default_bpp		= 24,

};



static struct fb_videomode origen_lcd_timing = {

	.left_margin	= 64,

	.right_margin	= 16,

	.upper_margin	= 64,
@@ -593,13 +599,11 @@ static struct s3c_fb_pd_win origen_fb_win0 = { 
	.vsync_len	= 3,

	.xres		= 1024,

	.yres		= 600,

	},

	.max_bpp		= 32,

	.default_bpp		= 24,

};



static struct s3c_fb_platdata origen_lcd_pdata __initdata = {

	.win[0]		= &origen_fb_win0,

	.vtiming	= &origen_lcd_timing,

	.vidcon0	= VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,

	.vidcon1	= VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |

				VIDCON1_INV_VCLK,

arch/arm/mach-exynos/mach-smdkv310.c

+16 −12
Original line number Diff line number Diff line
@@ -161,7 +161,13 @@ static struct platform_device smdkv310_lcd_lte480wv = { 
};



static struct s3c_fb_pd_win smdkv310_fb_win0 = {

	.win_mode = {

	.max_bpp	= 32,

	.default_bpp	= 24,

	.xres		= 800,

	.yres		= 480,

};



static struct fb_videomode smdkv310_lcd_timing = {

	.left_margin	= 13,

	.right_margin	= 8,

	.upper_margin	= 7,
@@ -170,13 +176,11 @@ static struct s3c_fb_pd_win smdkv310_fb_win0 = { 
	.vsync_len	= 1,

	.xres		= 800,

	.yres		= 480,

	},

	.max_bpp		= 32,

	.default_bpp		= 24,

};



static struct s3c_fb_platdata smdkv310_lcd0_pdata __initdata = {

	.win[0]		= &smdkv310_fb_win0,

	.vtiming	= &smdkv310_lcd_timing,

	.vidcon0	= VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,

	.vidcon1	= VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,

	.setup_gpio	= exynos4_fimd0_gpio_setup_24bpp,

arch/arm/mach-exynos/mach-universal_c210.c

+15 −11
Original line number Diff line number Diff line
@@ -812,7 +812,15 @@ static struct i2c_board_info i2c1_devs[] __initdata = { 


/* Frame Buffer */

static struct s3c_fb_pd_win universal_fb_win0 = {

	.win_mode = {

	.max_bpp	= 32,

	.default_bpp	= 16,

	.xres		= 480,

	.yres		= 800,

	.virtual_x	= 480,

	.virtual_y	= 2 * 800,

};



static struct fb_videomode universal_lcd_timing = {

	.left_margin	= 16,

	.right_margin	= 16,

	.upper_margin	= 2,
@@ -822,15 +830,11 @@ static struct s3c_fb_pd_win universal_fb_win0 = { 
	.xres		= 480,

	.yres		= 800,

	.refresh	= 55,

	},

	.max_bpp	= 32,

	.default_bpp	= 16,

	.virtual_x	= 480,

	.virtual_y	= 2 * 800,

};



static struct s3c_fb_platdata universal_lcd_pdata __initdata = {

	.win[0]		= &universal_fb_win0,

	.vtiming	= &universal_lcd_timing,

	.vidcon0	= VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB |

			  VIDCON0_CLKSEL_LCD,

	.vidcon1	= VIDCON1_INV_VCLK | VIDCON1_INV_VDEN

arch/arm/mach-s3c24xx/mach-smdk2416.c

+15 −12
Original line number Diff line number Diff line
@@ -148,8 +148,14 @@ static struct s3c24xx_hsudc_platdata smdk2416_hsudc_platdata = { 


static struct s3c_fb_pd_win smdk2416_fb_win[] = {

	[0] = {

		/* think this is the same as the smdk6410 */

		.win_mode	= {

		.default_bpp	= 16,

		.max_bpp	= 32,

		.xres           = 800,

		.yres           = 480,

	},

};



static struct fb_videomode smdk2416_lcd_timing = {

	.pixclock	= 41094,

	.left_margin	= 8,

	.right_margin	= 13,
@@ -159,10 +165,6 @@ static struct s3c_fb_pd_win smdk2416_fb_win[] = { 
	.vsync_len	= 1,

	.xres           = 800,

	.yres           = 480,

		},

		.default_bpp	= 16,

		.max_bpp	= 32,

	},

};



static void s3c2416_fb_gpio_setup_24bpp(void)
@@ -187,6 +189,7 @@ static void s3c2416_fb_gpio_setup_24bpp(void) 


static struct s3c_fb_platdata smdk2416_fb_platdata = {

	.win[0]		= &smdk2416_fb_win[0],

	.vtiming	= &smdk2416_lcd_timing,

	.setup_gpio	= s3c2416_fb_gpio_setup_24bpp,

	.vidcon0	= VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,

	.vidcon1	= VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,