From ce4aae7286927f225f240df18f00044a4a6b4187 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Mon, 5 Nov 2012 15:14:19 +0200 Subject: [PATCH] --- yaml --- r: 340178 b: refs/heads/master c: 63d5fc0c2f748e20f38a0a0ec1c8494bddf5c288 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-generic.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 96d78ae3f3c3..6605c85d267c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86cf29dc5a595957ab02068fcd39c57009763a8b +refs/heads/master: 63d5fc0c2f748e20f38a0a0ec1c8494bddf5c288 diff --git a/trunk/arch/arm/mach-omap2/board-generic.c b/trunk/arch/arm/mach-omap2/board-generic.c index 601ecdfb1cf9..8f5f21c94e7c 100644 --- a/trunk/arch/arm/mach-omap2/board-generic.c +++ b/trunk/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