diff options
author | Thomas Abraham <thomas.abraham@linaro.org> | 2012-03-24 12:28:48 -0400 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-04-09 12:11:24 -0400 |
commit | 79d3c41ae444fb064cc8aab7cb249f577d6e0aae (patch) | |
tree | 3bb1e422478e9d0eb6065e56f7f9cafdb0a6d7e0 /arch/arm/mach-exynos/mach-origen.c | |
parent | 884924be2a3368a3ac96587f347f9973c80140f6 (diff) |
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: Jingoo 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: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'arch/arm/mach-exynos/mach-origen.c')
-rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index 878d4c99142d..0968ebaa01f5 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c | |||
@@ -584,22 +584,26 @@ static struct platform_device origen_lcd_hv070wsa = { | |||
584 | }; | 584 | }; |
585 | 585 | ||
586 | static struct s3c_fb_pd_win origen_fb_win0 = { | 586 | static struct s3c_fb_pd_win origen_fb_win0 = { |
587 | .win_mode = { | 587 | .xres = 1024, |
588 | .left_margin = 64, | 588 | .yres = 600, |
589 | .right_margin = 16, | ||
590 | .upper_margin = 64, | ||
591 | .lower_margin = 16, | ||
592 | .hsync_len = 48, | ||
593 | .vsync_len = 3, | ||
594 | .xres = 1024, | ||
595 | .yres = 600, | ||
596 | }, | ||
597 | .max_bpp = 32, | 589 | .max_bpp = 32, |
598 | .default_bpp = 24, | 590 | .default_bpp = 24, |
599 | }; | 591 | }; |
600 | 592 | ||
593 | static struct fb_videomode origen_lcd_timing = { | ||
594 | .left_margin = 64, | ||
595 | .right_margin = 16, | ||
596 | .upper_margin = 64, | ||
597 | .lower_margin = 16, | ||
598 | .hsync_len = 48, | ||
599 | .vsync_len = 3, | ||
600 | .xres = 1024, | ||
601 | .yres = 600, | ||
602 | }; | ||
603 | |||
601 | static struct s3c_fb_platdata origen_lcd_pdata __initdata = { | 604 | static struct s3c_fb_platdata origen_lcd_pdata __initdata = { |
602 | .win[0] = &origen_fb_win0, | 605 | .win[0] = &origen_fb_win0, |
606 | .vtiming = &origen_lcd_timing, | ||
603 | .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB, | 607 | .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB, |
604 | .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC | | 608 | .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC | |
605 | VIDCON1_INV_VCLK, | 609 | VIDCON1_INV_VCLK, |