diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-30 18:30:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-30 18:30:01 -0400 |
commit | acff987d94cbdb4049f3706bed1f1792f8ef6837 (patch) | |
tree | 36bded977aab5d80cf9aeb5467f83dd554a25d01 /arch/arm/mach-omap2/board-omap3evm.c | |
parent | ce949717b559709423c1ef716a9db16d1dcadaed (diff) | |
parent | b57287ba497b63a0d87a058631bbddfed9392e9f (diff) |
Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
* 'fbdev-next' of git://github.com/schandinat/linux-2.6: (270 commits)
video: platinumfb: Add __devexit_p at necessary place
drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data
drivers/video: fsl-diu-fb: merge diu_hw into fsl_diu_data
drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported
drivers/video: fsl-diu-fb: remove unused panel operating mode support
drivers/video: fsl-diu-fb: use an enum for the AOI index
drivers/video: fsl-diu-fb: add several new video modes
drivers/video: fsl-diu-fb: remove broken screen blanking support
drivers/video: fsl-diu-fb: move some definitions out of the header file
drivers/video: fsl-diu-fb: fix some ioctls
video: da8xx-fb: Increased resolution configuration of revised LCDC IP
OMAPDSS: picodlp: add missing #include <linux/module.h>
fb: fix au1100fb bitrot.
mx3fb: fix NULL pointer dereference in screen blanking.
video: irq: Remove IRQF_DISABLED
smscufx: change edid data to u8 instead of char
OMAPDSS: DISPC: zorder support for DSS overlays
OMAPDSS: DISPC: VIDEO3 pipeline support
OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting
video/omap: fix build dependencies
...
Fix up conflicts in:
- drivers/staging/xgifb/XGI_main_26.c
Changes to XGIfb_pan_var()
- drivers/video/omap/{lcd_apollon.c,lcd_ldp.c,lcd_overo.c}
Removed (or in the case of apollon.c, merged into the generic
DSS panel in drivers/video/omap2/displays/panel-generic-dpi.c)
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 15c69a0c1ce5..0d5a9e46a6af 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <plat/common.h> | 45 | #include <plat/common.h> |
46 | #include <plat/mcspi.h> | 46 | #include <plat/mcspi.h> |
47 | #include <video/omapdss.h> | 47 | #include <video/omapdss.h> |
48 | #include <video/omap-panel-generic-dpi.h> | 48 | #include <video/omap-panel-dvi.h> |
49 | 49 | ||
50 | #include "mux.h" | 50 | #include "mux.h" |
51 | #include "sdram-micron-mt46h32m32lf-6.h" | 51 | #include "sdram-micron-mt46h32m32lf-6.h" |
@@ -247,8 +247,7 @@ static void omap3_evm_disable_dvi(struct omap_dss_device *dssdev) | |||
247 | dvi_enabled = 0; | 247 | dvi_enabled = 0; |
248 | } | 248 | } |
249 | 249 | ||
250 | static struct panel_generic_dpi_data dvi_panel = { | 250 | static struct panel_dvi_platform_data dvi_panel = { |
251 | .name = "generic", | ||
252 | .platform_enable = omap3_evm_enable_dvi, | 251 | .platform_enable = omap3_evm_enable_dvi, |
253 | .platform_disable = omap3_evm_disable_dvi, | 252 | .platform_disable = omap3_evm_disable_dvi, |
254 | }; | 253 | }; |
@@ -256,7 +255,7 @@ static struct panel_generic_dpi_data dvi_panel = { | |||
256 | static struct omap_dss_device omap3_evm_dvi_device = { | 255 | static struct omap_dss_device omap3_evm_dvi_device = { |
257 | .name = "dvi", | 256 | .name = "dvi", |
258 | .type = OMAP_DISPLAY_TYPE_DPI, | 257 | .type = OMAP_DISPLAY_TYPE_DPI, |
259 | .driver_name = "generic_dpi_panel", | 258 | .driver_name = "dvi", |
260 | .data = &dvi_panel, | 259 | .data = &dvi_panel, |
261 | .phy.dpi.data_lines = 24, | 260 | .phy.dpi.data_lines = 24, |
262 | }; | 261 | }; |