OMAPDSS: combine omap_dss_output into omap_dss_device

We currently have omap_dss_device, which represents an external display
device, sometimes an external encoder, sometimes a panel. Then we have
omap_dss_output, which represents DSS's output encoder.

In the future with new display device model, we construct a video
pipeline from the display blocks. To accomplish this, all the blocks
need to be presented by the same entity.

Thus, this patch combines omap_dss_output into omap_dss_device. Some of
the fields in omap_dss_output are already found in omap_dss_device, but
some are not. This means we'll have DSS output specific fields in
omap_dss_device, which is not very nice. However, it is easier to just
keep those output specific fields there for now, and after transition to
new display device model is made, they can be cleaned up easier than
could be done now.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 30ff0e0d4629..35836eb73a62 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -117,7 +117,7 @@ static struct {
         int data_lines;
         struct rfbi_timings intf_timings;
 
-        struct omap_dss_output output;
+        struct omap_dss_device output;
 } rfbi;
 
 static inline void rfbi_write_reg(const struct rfbi_reg idx, u32 val)
@@ -890,7 +890,7 @@ static void rfbi_config_lcd_manager(struct omap_dss_device *dssdev)
 
 int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev)
 {
-        struct omap_dss_output *out = &rfbi.output;
+        struct omap_dss_device *out = &rfbi.output;
         int r;
 
         if (out == NULL || out->manager == NULL) {
@@ -925,7 +925,7 @@ EXPORT_SYMBOL(omapdss_rfbi_display_enable);
 
 void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev)
 {
-        struct omap_dss_output *out = &rfbi.output;
+        struct omap_dss_device *out = &rfbi.output;
 
         dss_mgr_unregister_framedone_handler(out->manager,
                         framedone_callback, NULL);
@@ -1013,11 +1013,11 @@ static int rfbi_probe_pdata(struct platform_device *rfbidev)
 
 static void rfbi_init_output(struct platform_device *pdev)
 {
-        struct omap_dss_output *out = &rfbi.output;
+        struct omap_dss_device *out = &rfbi.output;
 
-        out->pdev = pdev;
+        out->dev = &pdev->dev;
         out->id = OMAP_DSS_OUTPUT_DBI;
-        out->type = OMAP_DISPLAY_TYPE_DBI;
+        out->output_type = OMAP_DISPLAY_TYPE_DBI;
         out->name = "rfbi.0";
         out->dispc_channel = OMAP_DSS_CHANNEL_LCD;
 
@@ -1026,7 +1026,7 @@ static void rfbi_init_output(struct platform_device *pdev)
 
 static void __exit rfbi_uninit_output(struct platform_device *pdev)
 {
-        struct omap_dss_output *out = &rfbi.output;
+        struct omap_dss_device *out = &rfbi.output;
 
         dss_unregister_output(out);
 }