Revert "video: tegra: dsi: enable dsi for dc1"

This reverts commit f06603035d81ffd82d7fa0b060508690e5b00a70.

Change-Id: I8da869f0b1186ddea7da3011802ec24799035c10
Signed-off-by: Tow Wang <toww@nvidia.com>
Reviewed-on: http://git-master/r/1183084
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Tested-by: Mitch Luban <mluban@nvidia.com>

1 files changed, 5 insertions, 15 deletions

diff --git a/drivers/video/tegra/dc/dsi.c b/drivers/video/tegra/dc/dsi.c
index 5b6cac8c6..3155b8c0b 100644
--- a/drivers/video/tegra/dc/dsi.c
+++ b/drivers/video/tegra/dc/dsi.c
@@ -5122,21 +5122,11 @@ static int _tegra_dc_dsi_init(struct tegra_dc *dc)
                 dsi_fixed_clk = NULL;
 #endif
 
+        /* TO DO - check out which clock is needed here for T186
+         * Temporarily passing the nvdisplay head0 clock
+         */
 #ifdef CONFIG_TEGRA_NVDISPLAY
-        {
-                #define CLK_NAME_MAX_LEN        13
-                char disp_clk_name[CLK_NAME_MAX_LEN];
-                int     ctrl_num;
-
-                ctrl_num = tegra_dc_get_head(dc);
-                if (0 > ctrl_num)
-                        ctrl_num = 0;
-                snprintf(disp_clk_name, CLK_NAME_MAX_LEN, "nvdisplay_p%c",
-                        '0' + ctrl_num);
-                dc_clk = tegra_disp_clk_get(&dc->ndev->dev, disp_clk_name);
-
-                #undef  CLK_NAME_MAX_LEN
-        }
+        dc_clk = tegra_disp_clk_get(&dc->ndev->dev, "nvdisplay_p0");
 #else
         dc_clk = clk_get_sys(dev_name(&dc->ndev->dev), NULL);
 #endif
@@ -5836,7 +5826,7 @@ static long tegra_dc_dsi_setup_clk(struct tegra_dc *dc, struct clk *clk)
 #ifdef CONFIG_TEGRA_NVDISPLAY
         if (clk == dc->clk) {
                 base_clk = tegra_disp_clk_get(&dc->ndev->dev,
-                        dc->out->parent_clk ? dc->out->parent_clk : "pll_d");
+                                "pll_d");
         } else {
                 if (dc->pdata->default_out->dsi->dsi_instance) {
                         parent_clk = tegra_disp_clk_get(&dc->ndev->dev,