OMAPDSS: alloc dssdevs dynamically

We currently create omap_dss_devices statically in board files, and use
those devices directly in the omapdss driver. This model prevents us
from having the platform data (which the dssdevs in board files
practically are) as read-only, and it's also different than what we will
use with device tree.

This patch changes the model to be in line with DT model: we allocate
the dssdevs dynamically, and initialize them according to the data in
the board file's dssdev (basically we memcopy the dssdev fields).

The allocation and registration is done in the following steps in the
output drivers:

- Use dss_alloc_and_init_device to allocate and initialize the device.
  The function uses kalloc and device_initialize to accomplish this.
- Call dss_copy_device_pdata to copy the data from the board file's
  dssdev
- Use dss_add_device to register the device.

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

1 files changed, 12 insertions, 3 deletions

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 3b10e18efa22..23daf7dcf54a 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -931,15 +931,22 @@ static struct omap_dss_device * __init hdmi_find_dssdev(struct platform_device *
 
 static void __init hdmi_probe_pdata(struct platform_device *pdev)
 {
+        struct omap_dss_device *plat_dssdev;
         struct omap_dss_device *dssdev;
         struct omap_dss_hdmi_data *priv;
         int r;
 
-        dssdev = hdmi_find_dssdev(pdev);
+        plat_dssdev = hdmi_find_dssdev(pdev);
 
+        if (!plat_dssdev)
+                return;
+
+        dssdev = dss_alloc_and_init_device(&pdev->dev);
         if (!dssdev)
                 return;
 
+        dss_copy_device_pdata(dssdev, plat_dssdev);
+
         priv = dssdev->data;
 
         hdmi.ct_cp_hpd_gpio = priv->ct_cp_hpd_gpio;
@@ -951,12 +958,14 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev)
         r = hdmi_init_display(dssdev);
         if (r) {
                 DSSERR("device %s init failed: %d\n", dssdev->name, r);
+                dss_put_device(dssdev);
                 return;
         }
 
-        r = omap_dss_register_device(dssdev, &pdev->dev);
+        r = dss_add_device(dssdev);
         if (r) {
                 DSSERR("device %s register failed: %d\n", dssdev->name, r);
+                dss_put_device(dssdev);
                 return;
         }
 }
@@ -1020,7 +1029,7 @@ static int __exit omapdss_hdmihw_remove(struct platform_device *pdev)
 {
         device_for_each_child(&pdev->dev, NULL, hdmi_remove_child);
 
-        omap_dss_unregister_child_devices(&pdev->dev);
+        dss_unregister_child_devices(&pdev->dev);
 
         hdmi_panel_exit();