diff options
author | Archit Taneja <archit@ti.com> | 2013-09-16 11:18:30 +0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-10-09 01:02:51 +0400 |
commit | fc8df75217e1c60183b594a417bc496ab086a453 (patch) | |
tree | dd35bd6b4fdc45281db6122f9d7e055bdd6f4b36 /arch/arm/mach-omap2/display.c | |
parent | 7a59743d0ccbeade0cb130f9ceabbe51cb6d3eb7 (diff) | |
download | linux-fc8df75217e1c60183b594a417bc496ab086a453.tar.xz |
ARM: OMAP2+: display: Create omapvrfb and omapfb devices inside omap_display_init
Move omapfb and omapvrfb device creation inside the omap_display_init so that
we can correctly create the device based on the presence of omapdss within the
platform.
For example, on a kernel image supporting multiple platforms, omap_init_vrfb and
omap_init_fb will create omapvrfb and omapfb platform devices respectively on a
AM33xx platform even though it doesn't have a VRFB or DSS block.
Signed-off-by: Archit Taneja <archit@ti.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
-rw-r--r-- | arch/arm/mach-omap2/display.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 8d8ee4742f3f..fb66e5ae56ad 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -423,6 +423,20 @@ int __init omap_display_init(struct omap_dss_board_info *board_data) return r; } + /* create vrfb device */ + r = omap_init_vrfb(); + if (r < 0) { + pr_err("Unable to register omapvrfb device\n"); + return r; + } + + /* create FB device */ + r = omap_init_fb(); + if (r < 0) { + pr_err("Unable to register omapfb device\n"); + return r; + } + return 0; } |