1 files changed, 42 insertions, 186 deletions

diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 62b5374ce43..3a688c871a4 100644
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -23,9 +23,6 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/regulator/consumer.h>
-#include <linux/export.h>
-#include <linux/platform_device.h>
-#include <linux/string.h>
 
 #include <video/omapdss.h>
 #include "dss.h"
@@ -33,43 +30,31 @@
 static struct {
         bool update_enabled;
         struct regulator *vdds_sdi_reg;
-
-        struct dss_lcd_mgr_config mgr_config;
-        struct omap_video_timings timings;
-        int datapairs;
-
-        struct omap_dss_output output;
 } sdi;
 
-static void sdi_config_lcd_manager(struct omap_dss_device *dssdev)
-{
-        struct omap_overlay_manager *mgr = dssdev->output->manager;
+static void sdi_basic_init(struct omap_dss_device *dssdev)
 
-        sdi.mgr_config.io_pad_mode = DSS_IO_PAD_MODE_BYPASS;
-
-        sdi.mgr_config.stallmode = false;
-        sdi.mgr_config.fifohandcheck = false;
+{
+        dispc_set_parallel_interface_mode(dssdev->manager->id,
+                        OMAP_DSS_PARALLELMODE_BYPASS);
 
-        sdi.mgr_config.video_port_width = 24;
-        sdi.mgr_config.lcden_sig_polarity = 1;
+        dispc_set_lcd_display_type(dssdev->manager->id,
+                        OMAP_DSS_LCD_DISPLAY_TFT);
 
-        dss_mgr_set_lcd_config(mgr, &sdi.mgr_config);
+        dispc_set_tft_data_lines(dssdev->manager->id, 24);
+        dispc_lcd_enable_signal_polarity(1);
 }
 
 int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
 {
-        struct omap_dss_output *out = dssdev->output;
-        struct omap_video_timings *t = &sdi.timings;
+        struct omap_video_timings *t = &dssdev->panel.timings;
         struct dss_clock_info dss_cinfo;
         struct dispc_clock_info dispc_cinfo;
+        u16 lck_div, pck_div;
+        unsigned long fck;
         unsigned long pck;
         int r;
 
-        if (out == NULL || out->manager == NULL) {
-                DSSERR("failed to enable display: no output/manager\n");
-                return -ENODEV;
-        }
-
         r = omap_dss_start_device(dssdev);
         if (r) {
                 DSSERR("failed to start device\n");
@@ -80,21 +65,32 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
         if (r)
                 goto err_reg_enable;
 
+        r = dss_runtime_get();
+        if (r)
+                goto err_get_dss;
+
         r = dispc_runtime_get();
         if (r)
                 goto err_get_dispc;
 
+        sdi_basic_init(dssdev);
+
         /* 15.5.9.1.2 */
-        t->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
-        t->sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
+        dssdev->panel.config |= OMAP_DSS_LCD_RF | OMAP_DSS_LCD_ONOFF;
+
+        dispc_set_pol_freq(dssdev->manager->id, dssdev->panel.config,
+                        dssdev->panel.acbi, dssdev->panel.acb);
 
-        r = dss_calc_clock_div(t->pixel_clock * 1000, &dss_cinfo, &dispc_cinfo);
+        r = dss_calc_clock_div(1, t->pixel_clock * 1000,
+                        &dss_cinfo, &dispc_cinfo);
         if (r)
                 goto err_calc_clock_div;
 
-        sdi.mgr_config.clock_info = dispc_cinfo;
+        fck = dss_cinfo.fck;
+        lck_div = dispc_cinfo.lck_div;
+        pck_div = dispc_cinfo.pck_div;
 
-        pck = dss_cinfo.fck / dispc_cinfo.lck_div / dispc_cinfo.pck_div / 1000;
+        pck = fck / lck_div / pck_div / 1000;
 
         if (pck != t->pixel_clock) {
                 DSSWARN("Could not find exact pixel clock. Requested %d kHz, "
@@ -105,46 +101,34 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
         }
 
 
-        dss_mgr_set_timings(out->manager, t);
+        dispc_set_lcd_timings(dssdev->manager->id, t);
 
         r = dss_set_clock_div(&dss_cinfo);
         if (r)
                 goto err_set_dss_clock_div;
 
-        sdi_config_lcd_manager(dssdev);
-
-        /*
-         * LCLK and PCLK divisors are located in shadow registers, and we
-         * normally write them to DISPC registers when enabling the output.
-         * However, SDI uses pck-free as source clock for its PLL, and pck-free
-         * is affected by the divisors. And as we need the PLL before enabling
-         * the output, we need to write the divisors early.
-         *
-         * It seems just writing to the DISPC register is enough, and we don't
-         * need to care about the shadow register mechanism for pck-free. The
-         * exact reason for this is unknown.
-         */
-        dispc_mgr_set_clock_div(out->manager->id, &sdi.mgr_config.clock_info);
-
-        dss_sdi_init(sdi.datapairs);
+        r = dispc_set_clock_div(dssdev->manager->id, &dispc_cinfo);
+        if (r)
+                goto err_set_dispc_clock_div;
+
+        dss_sdi_init(dssdev->phy.sdi.datapairs);
         r = dss_sdi_enable();
         if (r)
                 goto err_sdi_enable;
         mdelay(2);
 
-        r = dss_mgr_enable(out->manager);
-        if (r)
-                goto err_mgr_enable;
+        dssdev->manager->enable(dssdev->manager);
 
         return 0;
 
-err_mgr_enable:
-        dss_sdi_disable();
 err_sdi_enable:
+err_set_dispc_clock_div:
 err_set_dss_clock_div:
 err_calc_clock_div:
         dispc_runtime_put();
 err_get_dispc:
+        dss_runtime_put();
+err_get_dss:
         regulator_disable(sdi.vdds_sdi_reg);
 err_reg_enable:
         omap_dss_stop_device(dssdev);
@@ -155,13 +139,12 @@ EXPORT_SYMBOL(omapdss_sdi_display_enable);
 
 void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
 {
-        struct omap_overlay_manager *mgr = dssdev->output->manager;
-
-        dss_mgr_disable(mgr);
+        dssdev->manager->disable(dssdev->manager);
 
         dss_sdi_disable();
 
         dispc_runtime_put();
+        dss_runtime_put();
 
         regulator_disable(sdi.vdds_sdi_reg);
 
@@ -169,20 +152,7 @@ void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
 }
 EXPORT_SYMBOL(omapdss_sdi_display_disable);
 
-void omapdss_sdi_set_timings(struct omap_dss_device *dssdev,
-                struct omap_video_timings *timings)
-{
-        sdi.timings = *timings;
-}
-EXPORT_SYMBOL(omapdss_sdi_set_timings);
-
-void omapdss_sdi_set_datapairs(struct omap_dss_device *dssdev, int datapairs)
-{
-        sdi.datapairs = datapairs;
-}
-EXPORT_SYMBOL(omapdss_sdi_set_datapairs);
-
-static int __init sdi_init_display(struct omap_dss_device *dssdev)
+int sdi_init_display(struct omap_dss_device *dssdev)
 {
         DSSDBG("SDI init\n");
 
@@ -202,125 +172,11 @@ static int __init sdi_init_display(struct omap_dss_device *dssdev)
         return 0;
 }
 
-static struct omap_dss_device * __init sdi_find_dssdev(struct platform_device *pdev)
-{
-        struct omap_dss_board_info *pdata = pdev->dev.platform_data;
-        const char *def_disp_name = omapdss_get_default_display_name();
-        struct omap_dss_device *def_dssdev;
-        int i;
-
-        def_dssdev = NULL;
-
-        for (i = 0; i < pdata->num_devices; ++i) {
-                struct omap_dss_device *dssdev = pdata->devices[i];
-
-                if (dssdev->type != OMAP_DISPLAY_TYPE_SDI)
-                        continue;
-
-                if (def_dssdev == NULL)
-                        def_dssdev = dssdev;
-
-                if (def_disp_name != NULL &&
-                                strcmp(dssdev->name, def_disp_name) == 0) {
-                        def_dssdev = dssdev;
-                        break;
-                }
-        }
-
-        return def_dssdev;
-}
-
-static void __init sdi_probe_pdata(struct platform_device *sdidev)
+int sdi_init(void)
 {
-        struct omap_dss_device *plat_dssdev;
-        struct omap_dss_device *dssdev;
-        int r;
-
-        plat_dssdev = sdi_find_dssdev(sdidev);
-
-        if (!plat_dssdev)
-                return;
-
-        dssdev = dss_alloc_and_init_device(&sdidev->dev);
-        if (!dssdev)
-                return;
-
-        dss_copy_device_pdata(dssdev, plat_dssdev);
-
-        r = sdi_init_display(dssdev);
-        if (r) {
-                DSSERR("device %s init failed: %d\n", dssdev->name, r);
-                dss_put_device(dssdev);
-                return;
-        }
-
-        r = omapdss_output_set_device(&sdi.output, dssdev);
-        if (r) {
-                DSSERR("failed to connect output to new device: %s\n",
-                                dssdev->name);
-                dss_put_device(dssdev);
-                return;
-        }
-
-        r = dss_add_device(dssdev);
-        if (r) {
-                DSSERR("device %s register failed: %d\n", dssdev->name, r);
-                omapdss_output_unset_device(&sdi.output);
-                dss_put_device(dssdev);
-                return;
-        }
-}
-
-static void __init sdi_init_output(struct platform_device *pdev)
-{
-        struct omap_dss_output *out = &sdi.output;
-
-        out->pdev = pdev;
-        out->id = OMAP_DSS_OUTPUT_SDI;
-        out->type = OMAP_DISPLAY_TYPE_SDI;
-
-        dss_register_output(out);
-}
-
-static void __exit sdi_uninit_output(struct platform_device *pdev)
-{
-        struct omap_dss_output *out = &sdi.output;
-
-        dss_unregister_output(out);
-}
-
-static int __init omap_sdi_probe(struct platform_device *pdev)
-{
-        sdi_init_output(pdev);
-
-        sdi_probe_pdata(pdev);
-
         return 0;
 }
 
-static int __exit omap_sdi_remove(struct platform_device *pdev)
-{
-        dss_unregister_child_devices(&pdev->dev);
-
-        sdi_uninit_output(pdev);
-
-        return 0;
-}
-
-static struct platform_driver omap_sdi_driver = {
-        .remove         = __exit_p(omap_sdi_remove),
-        .driver         = {
-                .name   = "omapdss_sdi",
-                .owner  = THIS_MODULE,
-        },
-};
-
-int __init sdi_init_platform_driver(void)
-{
-        return platform_driver_probe(&omap_sdi_driver, omap_sdi_probe);
-}
-
-void __exit sdi_uninit_platform_driver(void)
+void sdi_exit(void)
 {
-        platform_driver_unregister(&omap_sdi_driver);
 }