OMAP2, 3: DSS2: DSS: create platform_driver, move init, exit to driver

Hwmod adaptation design requires each of the DSS HW IP to be a platform driver.
So a platform_driver of DSS is created and init exit methods are moved from core.c
to its driver probe,remove. pdev member has to be maintained by its own drivers.

DSS platform driver is registered from inside omap_dss_probe, in the order desired.

Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index ee56859c52ce..e399ca22e514 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -517,15 +517,9 @@ static int omap_dss_probe(struct platform_device *pdev)
         core.ctx_id = dss_get_ctx_id();
         DSSDBG("initial ctx id %u\n", core.ctx_id);
 
-#ifdef CONFIG_FB_OMAP_BOOTLOADER_INIT
-        /* DISPC_CONTROL */
-        if (omap_readl(0x48050440) & 1) /* LCD enabled? */
-                skip_init = 1;
-#endif
-
-        r = dss_init(skip_init);
+        r = dss_init_platform_driver();
         if (r) {
-                DSSERR("Failed to initialize DSS\n");
+                DSSERR("Failed to initialize DSS platform driver\n");
                 goto err_dss;
         }
 
@@ -553,6 +547,11 @@ static int omap_dss_probe(struct platform_device *pdev)
                 goto err_venc;
         }
 
+#ifdef CONFIG_FB_OMAP_BOOTLOADER_INIT
+        /* DISPC_CONTROL */
+        if (omap_readl(0x48050440) & 1) /* LCD enabled? */
+                skip_init = 1;
+#endif
         if (cpu_is_omap34xx()) {
                 r = sdi_init(skip_init);
                 if (r) {
@@ -610,7 +609,7 @@ err_dispc:
 err_dpi:
         rfbi_exit();
 err_rfbi:
-        dss_exit();
+        dss_uninit_platform_driver();
 err_dss:
         dss_clk_disable_all_no_ctx();
         dss_put_clocks();
@@ -635,7 +634,7 @@ static int omap_dss_remove(struct platform_device *pdev)
                 sdi_exit();
         }
 
-        dss_exit();
+        dss_uninit_platform_driver();
 
         /*
          * As part of hwmod changes, DSS is not the only controller of dss