diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-05 08:14:19 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-11-07 16:33:49 -0500 |
commit | 63d5fc0c2f748e20f38a0a0ec1c8494bddf5c288 (patch) | |
tree | cae97ec1002e038333dd9102a13811ee7a35e743 /arch/arm/mach-omap2/board-generic.c | |
parent | 86cf29dc5a595957ab02068fcd39c57009763a8b (diff) |
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/mach-omap2/board-generic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 10 |
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 @@ | |||
21 | 21 | ||
22 | #include "common.h" | 22 | #include "common.h" |
23 | #include "common-board-devices.h" | 23 | #include "common-board-devices.h" |
24 | #include "dss-common.h" | ||
24 | 25 | ||
25 | #if !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)) | 26 | #if !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)) |
26 | #define intc_of_init NULL | 27 | #define intc_of_init NULL |
@@ -40,6 +41,15 @@ static void __init omap_generic_init(void) | |||
40 | omap_sdrc_init(NULL, NULL); | 41 | omap_sdrc_init(NULL, NULL); |
41 | 42 | ||
42 | of_platform_populate(NULL, omap_dt_match_table, NULL, NULL); | 43 | of_platform_populate(NULL, omap_dt_match_table, NULL, NULL); |
44 | |||
45 | /* | ||
46 | * HACK: call display setup code for selected boards to enable omapdss. | ||
47 | * This will be removed when omapdss supports DT. | ||
48 | */ | ||
49 | if (of_machine_is_compatible("ti,omap4-panda")) | ||
50 | omap4_panda_display_init_of(); | ||
51 | else if (of_machine_is_compatible("ti,omap4-sdp")) | ||
52 | omap_4430sdp_display_init_of(); | ||
43 | } | 53 | } |
44 | 54 | ||
45 | #ifdef CONFIG_SOC_OMAP2420 | 55 | #ifdef CONFIG_SOC_OMAP2420 |