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-s3c64xx/mach-crag6410.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-s3c64xx/mach-crag6410.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index e20bf5835365..c1ef57edd42d 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
@@ -151,26 +151,29 @@ static struct platform_device crag6410_lcd_powerdev = { | |||
151 | 151 | ||
152 | /* 640x480 URT */ | 152 | /* 640x480 URT */ |
153 | static struct s3c_fb_pd_win crag6410_fb_win0 = { | 153 | static struct s3c_fb_pd_win crag6410_fb_win0 = { |
154 | /* this is to ensure we use win0 */ | ||
155 | .win_mode = { | ||
156 | .left_margin = 150, | ||
157 | .right_margin = 80, | ||
158 | .upper_margin = 40, | ||
159 | .lower_margin = 5, | ||
160 | .hsync_len = 40, | ||
161 | .vsync_len = 5, | ||
162 | .xres = 640, | ||
163 | .yres = 480, | ||
164 | }, | ||
165 | .max_bpp = 32, | 154 | .max_bpp = 32, |
166 | .default_bpp = 16, | 155 | .default_bpp = 16, |
156 | .xres = 640, | ||
157 | .yres = 480, | ||
167 | .virtual_y = 480 * 2, | 158 | .virtual_y = 480 * 2, |
168 | .virtual_x = 640, | 159 | .virtual_x = 640, |
169 | }; | 160 | }; |
170 | 161 | ||
162 | static struct fb_videomode crag6410_lcd_timing = { | ||
163 | .left_margin = 150, | ||
164 | .right_margin = 80, | ||
165 | .upper_margin = 40, | ||
166 | .lower_margin = 5, | ||
167 | .hsync_len = 40, | ||
168 | .vsync_len = 5, | ||
169 | .xres = 640, | ||
170 | .yres = 480, | ||
171 | }; | ||
172 | |||
171 | /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */ | 173 | /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */ |
172 | static struct s3c_fb_platdata crag6410_lcd_pdata __initdata = { | 174 | static struct s3c_fb_platdata crag6410_lcd_pdata __initdata = { |
173 | .setup_gpio = s3c64xx_fb_gpio_setup_24bpp, | 175 | .setup_gpio = s3c64xx_fb_gpio_setup_24bpp, |
176 | .vtiming = &crag6410_lcd_timing, | ||
174 | .win[0] = &crag6410_fb_win0, | 177 | .win[0] = &crag6410_fb_win0, |
175 | .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB, | 178 | .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB, |
176 | .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC, | 179 | .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC, |