Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index ee07a3c..b64adf7 100644 (file)
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -35,12 +35,16 @@ static struct {
        struct regulator *vdds_sdi_reg;
 } sdi;
 
-static void sdi_basic_init(void)
+static void sdi_basic_init(struct omap_dss_device *dssdev)
+
 {
-       dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_BYPASS);
+       dispc_set_parallel_interface_mode(dssdev->manager->id,
+                       OMAP_DSS_PARALLELMODE_BYPASS);
+
+       dispc_set_lcd_display_type(dssdev->manager->id,
+                       OMAP_DSS_LCD_DISPLAY_TFT);
 
-       dispc_set_lcd_display_type(OMAP_DSS_LCD_DISPLAY_TFT);
-       dispc_set_tft_data_lines(24);
+       dispc_set_tft_data_lines(dssdev->manager->id, 24);
        dispc_lcd_enable_signal_polarity(1);
 }
 
@@ -68,20 +72,20 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
        if (!sdi.skip_init)
                dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
 
-       sdi_basic_init();
+       sdi_basic_init(dssdev);
 
        /* 15.5.9.1.2 */
        dssdev->panel.config |= OMAP_DSS_LCD_RF | OMAP_DSS_LCD_ONOFF;
 
-       dispc_set_pol_freq(dssdev->panel.config, dssdev->panel.acbi,
-                       dssdev->panel.acb);
+       dispc_set_pol_freq(dssdev->manager->id, dssdev->panel.config,
+                       dssdev->panel.acbi, dssdev->panel.acb);
 
        if (!sdi.skip_init) {
                r = dss_calc_clock_div(1, t->pixel_clock * 1000,
                                &dss_cinfo, &dispc_cinfo);
        } else {
                r = dss_get_clock_div(&dss_cinfo);
-               r = dispc_get_clock_div(&dispc_cinfo);
+               r = dispc_get_clock_div(dssdev->manager->id, &dispc_cinfo);
        }
 
        if (r)
@@ -102,13 +106,13 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
        }
 
 
-       dispc_set_lcd_timings(t);
+       dispc_set_lcd_timings(dssdev->manager->id, t);
 
        r = dss_set_clock_div(&dss_cinfo);
        if (r)
                goto err2;
 
-       r = dispc_set_clock_div(&dispc_cinfo);
+       r = dispc_set_clock_div(dssdev->manager->id, &dispc_cinfo);
        if (r)
                goto err2;