summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-11-05 15:14:19 +0200
committerTony Lindgren <tony@atomide.com>2012-11-07 13:33:49 -0800
commit63d5fc0c2f748e20f38a0a0ec1c8494bddf5c288 (patch)
treecae97ec1002e038333dd9102a13811ee7a35e743 /arch/arm
parent86cf29dc5a595957ab02068fcd39c57009763a8b (diff)
downloadtalos-obmc-linux-63d5fc0c2f748e20f38a0a0ec1c8494bddf5c288.tar.gz
talos-obmc-linux-63d5fc0c2f748e20f38a0a0ec1c8494bddf5c288.zip
OMAP: board-generic: enable DSS for panda & sdp boards
Call the non-DT omapdss setup code from board-generic if the board is omap4-panda or omap4-sdp. This will give us working omapdss for those boards when using DT kernel. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/board-generic.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 601ecdfb1cf9..8f5f21c94e7c 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -21,6 +21,7 @@
#include "common.h"
#include "common-board-devices.h"
+#include "dss-common.h"
#if !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))
#define intc_of_init NULL
@@ -40,6 +41,15 @@ static void __init omap_generic_init(void)
omap_sdrc_init(NULL, NULL);
of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
+
+ /*
+ * HACK: call display setup code for selected boards to enable omapdss.
+ * This will be removed when omapdss supports DT.
+ */
+ if (of_machine_is_compatible("ti,omap4-panda"))
+ omap4_panda_display_init_of();
+ else if (of_machine_is_compatible("ti,omap4-sdp"))
+ omap_4430sdp_display_init_of();
}
#ifdef CONFIG_SOC_OMAP2420
OpenPOWER on IntegriCloud