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 'for-linus' of git://opensource.wolfsonmicro.com/regulator
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-cm-t35.c
diff --git
a/arch/arm/mach-omap2/board-cm-t35.c
b/arch/arm/mach-omap2/board-cm-t35.c
index
3af8aab
..
6e0f0d2
100644
(file)
--- a/
arch/arm/mach-omap2/board-cm-t35.c
+++ b/
arch/arm/mach-omap2/board-cm-t35.c
@@
-43,6
+43,7
@@
#include <plat/usb.h>
#include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h>
#include <plat/usb.h>
#include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h>
+#include <video/omap-panel-dvi.h>
#include <plat/mcspi.h>
#include <mach/hardware.h>
#include <plat/mcspi.h>
#include <mach/hardware.h>
@@
-242,8
+243,7
@@
static struct omap_dss_device cm_t35_lcd_device = {
.phy.dpi.data_lines = 18,
};
.phy.dpi.data_lines = 18,
};
-static struct panel_generic_dpi_data dvi_panel = {
- .name = "generic",
+static struct panel_dvi_platform_data dvi_panel = {
.platform_enable = cm_t35_panel_enable_dvi,
.platform_disable = cm_t35_panel_disable_dvi,
};
.platform_enable = cm_t35_panel_enable_dvi,
.platform_disable = cm_t35_panel_disable_dvi,
};
@@
-251,7
+251,7
@@
static struct panel_generic_dpi_data dvi_panel = {
static struct omap_dss_device cm_t35_dvi_device = {
.name = "dvi",
.type = OMAP_DISPLAY_TYPE_DPI,
static struct omap_dss_device cm_t35_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,
};
@@
-634,7
+634,7
@@
static void __init cm_t3730_init(void)
}
MACHINE_START(CM_T35, "Compulab CM-T35")
}
MACHINE_START(CM_T35, "Compulab CM-T35")
- .
boot_params = 0x80000
100,
+ .
atag_offset = 0x
100,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = cm_t35_init_early,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = cm_t35_init_early,
@@
-644,7
+644,7
@@
MACHINE_START(CM_T35, "Compulab CM-T35")
MACHINE_END
MACHINE_START(CM_T3730, "Compulab CM-T3730")
MACHINE_END
MACHINE_START(CM_T3730, "Compulab CM-T3730")
- .
boot_params = 0x80000
100,
+ .
atag_offset = 0x
100,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = cm_t35_init_early,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = cm_t35_init_early,