diff options
| author | Archit Taneja <archit@ti.com> | 2013-09-16 09:18:31 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-10-08 23:03:07 +0200 |
| commit | 576e5bda70a5442381ee31285edada114d692132 (patch) | |
| tree | 5965e5e712098280045afdfdce02169d64163747 /arch/arm/mach-omap2/display.c | |
| parent | ARM: OMAP2+: display: Create omapvrfb and omapfb devices inside omap_display_... (diff) | |
| download | linux-576e5bda70a5442381ee31285edada114d692132.tar.xz linux-576e5bda70a5442381ee31285edada114d692132.zip | |
ARM: OMAP2+: display: Create omap_vout device inside omap_display_init
Move omap_vout 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_vout
will create a omapdrm platform device on a AM33xx platform even though it
doesn't have a 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 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index fb66e5ae56ad..a4e536b11ec9 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -437,6 +437,13 @@ int __init omap_display_init(struct omap_dss_board_info *board_data) return r; } + /* create V4L2 display device */ + r = omap_init_vout(); + if (r < 0) { + pr_err("Unable to register omap_vout device\n"); + return r; + } + return 0; } |