git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-omap3evm.c
diff --git
a/arch/arm/mach-omap2/board-omap3evm.c
b/arch/arm/mach-omap2/board-omap3evm.c
index
c452b3f
..
0d5a9e4
100644
(file)
--- a/
arch/arm/mach-omap2/board-omap3evm.c
+++ b/
arch/arm/mach-omap2/board-omap3evm.c
@@
-45,7
+45,7
@@
#include <plat/common.h>
#include <plat/mcspi.h>
#include <video/omapdss.h>
#include <plat/common.h>
#include <plat/mcspi.h>
#include <video/omapdss.h>
-#include <video/omap-panel-
generic-dp
i.h>
+#include <video/omap-panel-
dv
i.h>
#include "mux.h"
#include "sdram-micron-mt46h32m32lf-6.h"
#include "mux.h"
#include "sdram-micron-mt46h32m32lf-6.h"
@@
-247,8
+247,7
@@
static void omap3_evm_disable_dvi(struct omap_dss_device *dssdev)
dvi_enabled = 0;
}
dvi_enabled = 0;
}
-static struct panel_generic_dpi_data dvi_panel = {
- .name = "generic",
+static struct panel_dvi_platform_data dvi_panel = {
.platform_enable = omap3_evm_enable_dvi,
.platform_disable = omap3_evm_disable_dvi,
};
.platform_enable = omap3_evm_enable_dvi,
.platform_disable = omap3_evm_disable_dvi,
};
@@
-256,7
+255,7
@@
static struct panel_generic_dpi_data dvi_panel = {
static struct omap_dss_device omap3_evm_dvi_device = {
.name = "dvi",
.type = OMAP_DISPLAY_TYPE_DPI,
static struct omap_dss_device omap3_evm_dvi_device = {
.name = "dvi",
.type = OMAP_DISPLAY_TYPE_DPI,
- .driver_name = "
generic_dpi_panel
",
+ .driver_name = "
dvi
",
.data = &dvi_panel,
.phy.dpi.data_lines = 24,
};
.data = &dvi_panel,
.phy.dpi.data_lines = 24,
};
@@
-681,7
+680,7
@@
static void __init omap3_evm_init(void)
MACHINE_START(OMAP3EVM, "OMAP3 EVM")
/* Maintainer: Syed Mohammed Khasim - Texas Instruments */
MACHINE_START(OMAP3EVM, "OMAP3 EVM")
/* Maintainer: Syed Mohammed Khasim - Texas Instruments */
- .
boot_params = 0x80000
100,
+ .
atag_offset = 0x
100,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = omap3_evm_init_early,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = omap3_evm_init_early,