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/rfbi.c | |
parent | 484dc404d233696ef65a8e676f9d4fe563b091ee (diff) | |
download | op-kernel-dev-81b87f515f6abbbe4eef42835065db9d0831ef35.zip op-kernel-dev-81b87f515f6abbbe4eef42835065db9d0831ef35.tar.gz |
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/rfbi.c')
-rw-r--r-- | drivers/video/omap2/dss/rfbi.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c index 38d9b8e..58e5172 100644 --- a/drivers/video/omap2/dss/rfbi.c +++ b/drivers/video/omap2/dss/rfbi.c @@ -116,6 +116,8 @@ static struct { int pixel_size; int data_lines; struct rfbi_timings intf_timings; + + struct omap_dss_output output; } rfbi; static inline void rfbi_write_reg(const struct rfbi_reg idx, u32 val) @@ -1002,6 +1004,24 @@ static void __init rfbi_probe_pdata(struct platform_device *rfbidev) } } +static void __init rfbi_init_output(struct platform_device *pdev) +{ + struct omap_dss_output *out = &rfbi.output; + + out->pdev = pdev; + out->id = OMAP_DSS_OUTPUT_DBI; + out->type = OMAP_DISPLAY_TYPE_DBI; + + dss_register_output(out); +} + +static void __exit rfbi_uninit_output(struct platform_device *pdev) +{ + struct omap_dss_output *out = &rfbi.output; + + dss_unregister_output(out); +} + /* RFBI HW IP initialisation */ static int __init omap_rfbihw_probe(struct platform_device *pdev) { @@ -1053,6 +1073,8 @@ static int __init omap_rfbihw_probe(struct platform_device *pdev) dss_debugfs_create_file("rfbi", rfbi_dump_regs); + rfbi_init_output(pdev); + rfbi_probe_pdata(pdev); return 0; @@ -1065,7 +1087,11 @@ err_runtime_get: static int __exit omap_rfbihw_remove(struct platform_device *pdev) { dss_unregister_child_devices(&pdev->dev); + + rfbi_uninit_output(pdev); + pm_runtime_disable(&pdev->dev); + return 0; } |