summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorDavid Anders <x0132446@ti.com>2011-03-30 16:48:01 -0500
committerJohn Stultz <john.stultz@linaro.org>2011-04-05 13:59:03 -0700
commit18e82d2b952ab57fc1c8a69d4fa14e562f2aecf6 (patch)
treedcb4f1d4b01365ceb799ed6c2e09711e620caaeb /arch/arm/mach-omap2
parent4ce7ea0bfbb301ffb79154b6cecd2ef030db4cdf (diff)
omap4: pandaboard: fix dvi support
this patch fixes some clock issues, provides a base 720p dvi panel and adds the panda_dvi_defconfig for testing purposes. Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/board-omap4panda.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 920b7ba1c45..dcef1afda90 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -611,7 +611,7 @@ static void omap4_panda_disable_dvi(struct omap_dss_device *dssdev)
/* Using generic display panel */
static struct panel_generic_dpi_data omap4_dvi_panel = {
- .name = "generic",
+ .name = "dvi_720p",
.platform_enable = omap4_panda_enable_dvi,
.platform_disable = omap4_panda_disable_dvi,
};
@@ -639,7 +639,7 @@ int __init omap4_panda_dvi_init(void)
return r;
}
-
+#ifdef CONFIG_OMAP4_DSS_HDMI
static void omap4_panda_hdmi_mux_init(void)
{
/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
@@ -699,6 +699,12 @@ static struct omap_dss_device *omap4_panda_dss_devices[] = {
&omap4_panda_hdmi_device,
};
+#else
+static struct omap_dss_device *omap4_panda_dss_devices[] = {
+ &omap4_panda_dvi_device,
+};
+#endif
+
static struct omap_dss_board_info omap4_panda_dss_data = {
.num_devices = ARRAY_SIZE(omap4_panda_dss_devices),
.devices = omap4_panda_dss_devices,
@@ -713,7 +719,9 @@ void omap4_panda_display_init(void)
if (r)
pr_err("error initializing panda DVI\n");
+#ifdef CONFIG_OMAP4_DSS_HDMI
omap4_panda_hdmi_mux_init();
+#endif
omap_display_init(&omap4_panda_dss_data);
}