diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-01 19:57:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-01 19:57:51 -0400 |
commit | 804ce9866d56130032c9c8afc90a1297b7deed56 (patch) | |
tree | 6dd70984f411d2a3624d3f8db7facc3d6396b9ad /arch/arm/mach-s3c64xx/mach-hmt.c | |
parent | f5e7e844a571124ffc117d4696787d6afc4fc5ae (diff) | |
parent | c895305e806b4346006d3cfba2b432d52268ecd3 (diff) |
Merge tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6
Pull fbdev updates from Florian Tobias Schandinat:
- driver for AUO-K1900 and AUO-K1901 epaper controller
- large updates for OMAP (e.g. decouple HDMI audio and video)
- some updates for Exynos and SH Mobile
- various other small fixes and cleanups
* tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6: (130 commits)
video: bfin_adv7393fb: Fix cleanup code
video: exynos_dp: reduce delay time when configuring video setting
video: exynos_dp: move sw reset prioir to enabling sw defined function
video: exynos_dp: use devm_ functions
fb: handle NULL pointers in framebuffer release
OMAPDSS: HDMI: OMAP4: Update IRQ flags for the HPD IRQ request
OMAPDSS: Apply VENC timings even if panel is disabled
OMAPDSS: VENC/DISPC: Delay dividing Y resolution for managers connected to VENC
OMAPDSS: DISPC: Support rotation through TILER
OMAPDSS: VRFB: remove compiler warnings when CONFIG_BUG=n
OMAPFB: remove compiler warnings when CONFIG_BUG=n
OMAPDSS: remove compiler warnings when CONFIG_BUG=n
OMAPDSS: DISPC: fix usage of dispc_ovl_set_accu_uv
OMAPDSS: use DSI_FIFO_BUG workaround only for manual update displays
OMAPDSS: DSI: Support command mode interleaving during video mode blanking periods
OMAPDSS: DISPC: Update Accumulator configuration for chroma plane
drivers/video: fsl-diu-fb: don't initialize the THRESHOLDS registers
video: exynos mipi dsi: support reverse panel type
video: exynos mipi dsi: Properly interpret the interrupt source flags
video: exynos mipi dsi: Avoid races in probe()
...
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-hmt.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-hmt.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c index 1bf6b9da20fc..689088162f77 100644 --- a/arch/arm/mach-s3c64xx/mach-hmt.c +++ b/arch/arm/mach-s3c64xx/mach-hmt.c | |||
@@ -129,23 +129,27 @@ static struct platform_device hmt_backlight_device = { | |||
129 | }; | 129 | }; |
130 | 130 | ||
131 | static struct s3c_fb_pd_win hmt_fb_win0 = { | 131 | static struct s3c_fb_pd_win hmt_fb_win0 = { |
132 | .win_mode = { | ||
133 | .left_margin = 8, | ||
134 | .right_margin = 13, | ||
135 | .upper_margin = 7, | ||
136 | .lower_margin = 5, | ||
137 | .hsync_len = 3, | ||
138 | .vsync_len = 1, | ||
139 | .xres = 800, | ||
140 | .yres = 480, | ||
141 | }, | ||
142 | .max_bpp = 32, | 132 | .max_bpp = 32, |
143 | .default_bpp = 16, | 133 | .default_bpp = 16, |
134 | .xres = 800, | ||
135 | .yres = 480, | ||
136 | }; | ||
137 | |||
138 | static struct fb_videomode hmt_lcd_timing = { | ||
139 | .left_margin = 8, | ||
140 | .right_margin = 13, | ||
141 | .upper_margin = 7, | ||
142 | .lower_margin = 5, | ||
143 | .hsync_len = 3, | ||
144 | .vsync_len = 1, | ||
145 | .xres = 800, | ||
146 | .yres = 480, | ||
144 | }; | 147 | }; |
145 | 148 | ||
146 | /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */ | 149 | /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */ |
147 | static struct s3c_fb_platdata hmt_lcd_pdata __initdata = { | 150 | static struct s3c_fb_platdata hmt_lcd_pdata __initdata = { |
148 | .setup_gpio = s3c64xx_fb_gpio_setup_24bpp, | 151 | .setup_gpio = s3c64xx_fb_gpio_setup_24bpp, |
152 | .vtiming = &hmt_lcd_timing, | ||
149 | .win[0] = &hmt_fb_win0, | 153 | .win[0] = &hmt_fb_win0, |
150 | .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB, | 154 | .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB, |
151 | .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC, | 155 | .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC, |