Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[pandora-kernel.git] / drivers / video / omap2 / dss / core.c

diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index acefe50..1aa2ed1 100644 (file)
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -191,12 +191,6 @@ static int omap_dss_probe(struct platform_device *pdev)
                goto err_rfbi;
        }
 
-       r = dpi_init();
-       if (r) {
-               DSSERR("Failed to initialize dpi\n");
-               goto err_dpi;
-       }
-
        r = dispc_init_platform_driver();
        if (r) {
                DSSERR("Failed to initialize dispc platform driver\n");
@@ -209,18 +203,16 @@ static int omap_dss_probe(struct platform_device *pdev)
                goto err_venc;
        }
 
-       if (cpu_is_omap34xx()) {
-               r = sdi_init();
-               if (r) {
-                       DSSERR("Failed to initialize SDI\n");
-                       goto err_sdi;
-               }
+       r = dsi_init_platform_driver();
+       if (r) {
+               DSSERR("Failed to initialize DSI platform driver\n");
+               goto err_dsi;
+       }
 
-               r = dsi_init_platform_driver();
-               if (r) {
-                       DSSERR("Failed to initialize DSI platform driver\n");
-                       goto err_dsi;
-               }
+       r = hdmi_init_platform_driver();
+       if (r) {
+               DSSERR("Failed to initialize hdmi\n");
+               goto err_hdmi;
        }
 
        r = dss_initialize_debugfs();
@@ -252,18 +244,14 @@ static int omap_dss_probe(struct platform_device *pdev)
 err_register:
        dss_uninitialize_debugfs();
 err_debugfs:
-       if (cpu_is_omap34xx())
-               dsi_uninit_platform_driver();
+       hdmi_uninit_platform_driver();
+err_hdmi:
+       dsi_uninit_platform_driver();
 err_dsi:
-       if (cpu_is_omap34xx())
-               sdi_exit();
-err_sdi:
        venc_uninit_platform_driver();
 err_venc:
        dispc_uninit_platform_driver();
 err_dispc:
-       dpi_exit();
-err_dpi:
        rfbi_uninit_platform_driver();
 err_rfbi:
        dss_uninit_platform_driver();
@@ -281,13 +269,9 @@ static int omap_dss_remove(struct platform_device *pdev)
 
        venc_uninit_platform_driver();
        dispc_uninit_platform_driver();
-       dpi_exit();
        rfbi_uninit_platform_driver();
-       if (cpu_is_omap34xx()) {
-               dsi_uninit_platform_driver();
-               sdi_exit();
-       }
-
+       dsi_uninit_platform_driver();
+       hdmi_uninit_platform_driver();
        dss_uninit_platform_driver();
 
        dss_uninit_overlays(pdev);