OMAP: DSS2: Pass platform_device as an argument in dsi functions

The DSI interface is represented as a platform device, using the DSI platform
driver(dsi.c). The current DSI driver design is capable of running only one
instance of a DSI device. On OMAP4, there are 2 very similar DSI modules which
can be represented as instances of "omapdss_dsi" platform device.

Add member "module" in "dssdev.phy.dsi" that tells us which DSI module's lanes
the panel is connected to. Modify dsi.c functions to take the device's
platform_device struct pointer, provide functions dsi_get_dsidev_from_dssdev()
and dsi_get_dsidev_from_id() take the panel's omap_dss_device and module number
respectively, and return the platform_device pointer. Currently, the dsi struct
is declared globally and is accessed when dsi data is needed. The new pdev
argument will be used later to provide the platform device's dsi related data.

Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 3302bd367449..3bf6e626f862 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -300,6 +300,7 @@ void dss_dump_regs(struct seq_file *s)
 
 void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src)
 {
+        struct platform_device *dsidev;
         int b;
         u8 start, end;
 
@@ -309,7 +310,8 @@ void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src)
                 break;
         case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
                 b = 1;
-                dsi_wait_pll_hsdiv_dispc_active();
+                dsidev = dsi_get_dsidev_from_id(0);
+                dsi_wait_pll_hsdiv_dispc_active(dsidev);
                 break;
         default:
                 BUG();
@@ -324,6 +326,7 @@ void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src)
 
 void dss_select_dsi_clk_source(enum omap_dss_clk_source clk_src)
 {
+        struct platform_device *dsidev;
         int b;
 
         switch (clk_src) {
@@ -332,7 +335,8 @@ void dss_select_dsi_clk_source(enum omap_dss_clk_source clk_src)
                 break;
         case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI:
                 b = 1;
-                dsi_wait_pll_hsdiv_dsi_active();
+                dsidev = dsi_get_dsidev_from_id(0);
+                dsi_wait_pll_hsdiv_dsi_active(dsidev);
                 break;
         default:
                 BUG();
@@ -346,6 +350,7 @@ void dss_select_dsi_clk_source(enum omap_dss_clk_source clk_src)
 void dss_select_lcd_clk_source(enum omap_channel channel,
                 enum omap_dss_clk_source clk_src)
 {
+        struct platform_device *dsidev;
         int b, ix, pos;
 
         if (!dss_has_feature(FEAT_LCD_CLK_SRC))
@@ -358,7 +363,8 @@ void dss_select_lcd_clk_source(enum omap_channel channel,
         case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
                 BUG_ON(channel != OMAP_DSS_CHANNEL_LCD);
                 b = 1;
-                dsi_wait_pll_hsdiv_dispc_active();
+                dsidev = dsi_get_dsidev_from_id(0);
+                dsi_wait_pll_hsdiv_dispc_active(dsidev);
                 break;
         default:
                 BUG();