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, 23 insertions, 7 deletions

diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 3c988b65ca1..4d661a949b8 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -37,8 +37,18 @@
 
 static struct {
         struct regulator *vdds_dsi_reg;
+        struct platform_device *dsidev;
 } dpi;
 
+static struct platform_device *dpi_get_dsidev(enum omap_dss_clk_source clk)
+{
+        int dsi_module;
+
+        dsi_module = clk == OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC ? 0 : 1;
+
+        return dsi_get_dsidev_from_id(dsi_module);
+}
+
 static bool dpi_use_dsi_pll(struct omap_dss_device *dssdev)
 {
         if (dssdev->clocks.dispc.dispc_fclk_src ==
@@ -58,12 +68,12 @@ static int dpi_set_dsi_clk(struct omap_dss_device *dssdev, bool is_tft,
         struct dispc_clock_info dispc_cinfo;
         int r;
 
-        r = dsi_pll_calc_clock_div_pck(is_tft, pck_req, &dsi_cinfo,
-                        &dispc_cinfo);
+        r = dsi_pll_calc_clock_div_pck(dpi.dsidev, is_tft, pck_req,
+                        &dsi_cinfo, &dispc_cinfo);
         if (r)
                 return r;
 
-        r = dsi_pll_set_clock_div(&dsi_cinfo);
+        r = dsi_pll_set_clock_div(dpi.dsidev, &dsi_cinfo);
         if (r)
                 return r;
 
@@ -189,7 +199,7 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
 
         if (dpi_use_dsi_pll(dssdev)) {
                 dss_clk_enable(DSS_CLK_SYSCK);
-                r = dsi_pll_init(0, 1);
+                r = dsi_pll_init(dpi.dsidev, 0, 1);
                 if (r)
                         goto err3;
         }
@@ -206,7 +216,7 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
 
 err4:
         if (dpi_use_dsi_pll(dssdev))
-                dsi_pll_uninit(true);
+                dsi_pll_uninit(dpi.dsidev, true);
 err3:
         if (dpi_use_dsi_pll(dssdev))
                 dss_clk_disable(DSS_CLK_SYSCK);
@@ -227,7 +237,7 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev)
 
         if (dpi_use_dsi_pll(dssdev)) {
                 dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);
-                dsi_pll_uninit(true);
+                dsi_pll_uninit(dpi.dsidev, true);
                 dss_clk_disable(DSS_CLK_SYSCK);
         }
 
@@ -272,7 +282,7 @@ int dpi_check_timings(struct omap_dss_device *dssdev,
 
         if (dpi_use_dsi_pll(dssdev)) {
                 struct dsi_clock_info dsi_cinfo;
-                r = dsi_pll_calc_clock_div_pck(is_tft,
+                r = dsi_pll_calc_clock_div_pck(dpi.dsidev, is_tft,
                                 timings->pixel_clock * 1000,
                                 &dsi_cinfo, &dispc_cinfo);
 
@@ -319,6 +329,12 @@ int dpi_init_display(struct omap_dss_device *dssdev)
                 dpi.vdds_dsi_reg = vdds_dsi;
         }
 
+        if (dpi_use_dsi_pll(dssdev)) {
+                enum omap_dss_clk_source dispc_fclk_src =
+                        dssdev->clocks.dispc.dispc_fclk_src;
+                dpi.dsidev = dpi_get_dsidev(dispc_fclk_src);
+        }
+
         return 0;
 }