diff options
author | Archit Taneja <archit@ti.com> | 2012-09-26 16:30:49 +0530 |
---|---|---|
committer | Archit Taneja <archit@ti.com> | 2012-09-26 16:30:49 +0530 |
commit | 81b87f515f6abbbe4eef42835065db9d0831ef35 (patch) | |
tree | 3eebf0e10cd70425bb80c60202236f8a2ce96a38 /drivers/video/omap2/dss/dpi.c | |
parent | 484dc404d233696ef65a8e676f9d4fe563b091ee (diff) |
OMAPDSS: outputs: Create and register output instances
Add output structs to output driver's private data. Register output instances by
having an init function in the probes of the platform device drivers for
different outputs. The *_init_output for each output registers the output and
fill up the output's plaform device, type and id fields. The *_uninit_output
functions unregister the output.
In the probe of each interface driver, the output entities are initialized
before the *_probe_pdata() functions intentionally. This is done to ensure that
the output entity is prepared before the panels connected to the output are
registered. We need the output entities to be ready because OMAPDSS will try
to make connections between overlays, managers, outputs and devices during the
panel's probe.
Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dpi.c')
-rw-r--r-- | drivers/video/omap2/dss/dpi.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index f6800e19bbcb..ee1fa1e1a015 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -44,6 +44,8 @@ static struct { struct omap_video_timings timings; struct dss_lcd_mgr_config mgr_config; int data_lines; + + struct omap_dss_output output; } dpi; static struct platform_device *dpi_get_dsidev(enum omap_dss_clk_source clk) @@ -436,10 +438,30 @@ static void __init dpi_probe_pdata(struct platform_device *dpidev) } } +static void __init dpi_init_output(struct platform_device *pdev) +{ + struct omap_dss_output *out = &dpi.output; + + out->pdev = pdev; + out->id = OMAP_DSS_OUTPUT_DPI; + out->type = OMAP_DISPLAY_TYPE_DPI; + + dss_register_output(out); +} + +static void __exit dpi_uninit_output(struct platform_device *pdev) +{ + struct omap_dss_output *out = &dpi.output; + + dss_unregister_output(out); +} + static int __init omap_dpi_probe(struct platform_device *pdev) { mutex_init(&dpi.lock); + dpi_init_output(pdev); + dpi_probe_pdata(pdev); return 0; @@ -449,6 +471,8 @@ static int __exit omap_dpi_remove(struct platform_device *pdev) { dss_unregister_child_devices(&pdev->dev); + dpi_uninit_output(pdev); + return 0; } |