video: tegra: dc: make SOR instance configurable

[sojka/nv-tegra/linux-3.10.git] / drivers / video / tegra / dc / dc.c

diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index b4050770eaf4afee3ff2168564505d522321d1cd..83d4992aceccf4fb2f85b9234e823e6425668850 100644 (file)
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -498,6 +498,16 @@ void tegra_dc_clk_disable(struct tegra_dc *dc)
        tegra_dvfs_set_rate(dc->clk, 0);
 }
 
+static void tegra_dc_set_sor_instance(struct tegra_dc *dc, int out_type)
+{
+       /* Fake DP should always be on SOR0. */
+       if (!strcmp(dc_or_node_names[dc->ndev->id], "/host1x/sor") ||
+               out_type == TEGRA_DC_OUT_FAKE_DP)
+               dc->sor_instance = 0;
+       else
+               dc->sor_instance = 1;
+}
+
 void tegra_dc_get(struct tegra_dc *dc)
 {
        tegra_dc_io_start(dc);
@@ -2420,6 +2430,8 @@ static int tegra_dc_set_out(struct tegra_dc *dc, struct tegra_dc_out *out)
 
        dc->out = out;
 
+       tegra_dc_set_sor_instance(dc, dc->out->type);
+
        if (dc->out->type == TEGRA_DC_OUT_HDMI &&
                        tegra_is_bl_display_initialized(dc->ndev->id)) {
                /*
@@ -3675,11 +3687,12 @@ static bool _tegra_dc_controller_enable(struct tegra_dc *dc)
 
        if (dc->out->type != TEGRA_DC_OUT_DP) {
 #if !defined(CONFIG_ARCH_TEGRA_21x_SOC)
+               int sor_num = tegra_dc_which_sor(dc);
                np_dpaux = of_find_node_by_path(
-                               dc->ndev->id ? DPAUX1_NODE : DPAUX_NODE);
+                               sor_num ? DPAUX1_NODE : DPAUX_NODE);
                if (np_dpaux || !dc->ndev->dev.of_node)
                        tegra_dpaux_pad_power(dc,
-                       dc->ndev->id ? TEGRA_DPAUX_INSTANCE_1 :
+                       sor_num ? TEGRA_DPAUX_INSTANCE_1 :
                        TEGRA_DPAUX_INSTANCE_0, false);
                of_node_put(np_dpaux);
 #endif