Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / video / omap2 / dss / dpi.c

diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 960e977a8bf0f39ff8dce42c0893fc9604ea8081..75fb0a5154304a92bbe5b0164a1257064436d2ec 100644 (file)
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -40,8 +40,9 @@ static struct {
 } dpi;
 
 #ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
-static int dpi_set_dsi_clk(bool is_tft, unsigned long pck_req,
-               unsigned long *fck, int *lck_div, int *pck_div)
+static int dpi_set_dsi_clk(struct omap_dss_device *dssdev, bool is_tft,
+               unsigned long pck_req, unsigned long *fck, int *lck_div,
+               int *pck_div)
 {
        struct dsi_clock_info dsi_cinfo;
        struct dispc_clock_info dispc_cinfo;
@@ -58,7 +59,7 @@ static int dpi_set_dsi_clk(bool is_tft, unsigned long pck_req,
 
        dss_select_dispc_clk_source(DSS_SRC_DSI1_PLL_FCLK);
 
-       r = dispc_set_clock_div(&dispc_cinfo);
+       r = dispc_set_clock_div(dssdev->manager->id, &dispc_cinfo);
        if (r)
                return r;
 
@@ -69,8 +70,9 @@ static int dpi_set_dsi_clk(bool is_tft, unsigned long pck_req,
        return 0;
 }
 #else
-static int dpi_set_dispc_clk(bool is_tft, unsigned long pck_req,
-               unsigned long *fck, int *lck_div, int *pck_div)
+static int dpi_set_dispc_clk(struct omap_dss_device *dssdev, bool is_tft,
+               unsigned long pck_req, unsigned long *fck, int *lck_div,
+               int *pck_div)
 {
        struct dss_clock_info dss_cinfo;
        struct dispc_clock_info dispc_cinfo;
@@ -84,7 +86,7 @@ static int dpi_set_dispc_clk(bool is_tft, unsigned long pck_req,
        if (r)
                return r;
 
-       r = dispc_set_clock_div(&dispc_cinfo);
+       r = dispc_set_clock_div(dssdev->manager->id, &dispc_cinfo);
        if (r)
                return r;
 
@@ -107,17 +109,17 @@ static int dpi_set_mode(struct omap_dss_device *dssdev)
 
        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
 
-       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);
 
        is_tft = (dssdev->panel.config & OMAP_DSS_LCD_TFT) != 0;
 
 #ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
-       r = dpi_set_dsi_clk(is_tft, t->pixel_clock * 1000,
-                       &fck, &lck_div, &pck_div);
+       r = dpi_set_dsi_clk(dssdev, is_tft, t->pixel_clock * 1000, &fck,
+                       &lck_div, &pck_div);
 #else
-       r = dpi_set_dispc_clk(is_tft, t->pixel_clock * 1000,
-                       &fck, &lck_div, &pck_div);
+       r = dpi_set_dispc_clk(dssdev, is_tft, t->pixel_clock * 1000, &fck,
+                       &lck_div, &pck_div);
 #endif
        if (r)
                goto err0;
@@ -132,7 +134,7 @@ static int dpi_set_mode(struct omap_dss_device *dssdev)
                t->pixel_clock = pck;
        }
 
-       dispc_set_lcd_timings(t);
+       dispc_set_lcd_timings(dssdev->manager->id, t);
 
 err0:
        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
@@ -145,10 +147,12 @@ static int dpi_basic_init(struct omap_dss_device *dssdev)
 
        is_tft = (dssdev->panel.config & OMAP_DSS_LCD_TFT) != 0;
 
-       dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_BYPASS);
-       dispc_set_lcd_display_type(is_tft ? OMAP_DSS_LCD_DISPLAY_TFT :
-                       OMAP_DSS_LCD_DISPLAY_STN);
-       dispc_set_tft_data_lines(dssdev->phy.dpi.data_lines);
+       dispc_set_parallel_interface_mode(dssdev->manager->id,
+                       OMAP_DSS_PARALLELMODE_BYPASS);
+       dispc_set_lcd_display_type(dssdev->manager->id, is_tft ?
+                       OMAP_DSS_LCD_DISPLAY_TFT : OMAP_DSS_LCD_DISPLAY_STN);
+       dispc_set_tft_data_lines(dssdev->manager->id,
+                       dssdev->phy.dpi.data_lines);
 
        return 0;
 }
@@ -234,7 +238,7 @@ void dpi_set_timings(struct omap_dss_device *dssdev,
        dssdev->panel.timings = *timings;
        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
                dpi_set_mode(dssdev);
-               dispc_go(OMAP_DSS_CHANNEL_LCD);
+               dispc_go(dssdev->manager->id);
        }
 }
 EXPORT_SYMBOL(dpi_set_timings);