dc: redesign topology setup and panel selection

Current driver is cluttered with hard-coded logic with respect to
topology setup and panel selection. This makes driver very rigid and
difficult to scale. Redesign the driver such that topology setup and
panel selection is defined by device-tree. During probe, driver will
be initialized as per device-tree configuration. To achieve this
remove dependence on "nvidia,dc-or-node" property and introduce
other mandatory properties as described below.

- nvidia,dc-connector: this property points to output resource node.
                       i.e. dsi/sor0/sor1 etc.
- nvidia,active-panel: this property points to connected panel.
                       i.e. "dp-display", "hdmi-display",
                            "panel_s_4kuhd_5_46" etc.
- nvidia,dpaux:        this property points to dpaux node
- nvidia,sor-ctrlnum:  this property identifies sor instance
- nvidia,dpaux-ctrlnum: this property identifies dpaux instance

Topology setup: Since topology is described through device-tree,
                driver doesn't need to hard-code absolute paths
                for devices, i.e. /host1x/sor, /host1x/sor1 etc.
                Since head(dc), SOR, DPAUX device-tree node contains
                a property to identify instance number, driver
                doesn't hard-code logic with respect to identifying
                HW instance number.

Panel selection: Current panel selection logic is distributed across
                 various files and there is a hard-coded logic for
                 1st/2nd/3rd display. This is not scalable if number
                 of displays and panels supported increases. Clean-up
                 this logic to have two-step panel selection logic.
                 In the first-step, panel is selected based on
                 display board-id and if no panel is found then 2nd
                 step selects panel based on "nvidia,active-panel".

Example device-tree layout:

head0: nvdisplay@15200000 {
    compatible = "nvidia,tegra186-dc";
    ...
    ...
    nvidia,dc-ctrlnum = <0x0>;
    nvidia,dc-connector = <&dsi>;
    ...
};
head_1: nvdisplay@15210000 {
    compatible = "nvidia,tegra186-dc";
    ...
    nvidia,dc-ctrlnum = <0x1>;
    nvidia,dc-connector = <&sor1>;
    ...
};
head_2: nvdisplay@15220000 {
    compatible = "nvidia,tegra186-dc";
    ...
    nvidia,dc-ctrlnum = <0x2>;
    nvidia,dc-connector = <&sor0>;
    ...
};
dsi: dsi {
    compatible = "nvidia,tegra186-dsi";
    ...
    nvidia,active-panel = <&panel_s_wuxga_8_0>;
    ...
    panel_s_wuxga_8_0: panel-s-wuxga-8-0 {
        status = “okay”;
        ...
    };
    panel_s_wuxga_8_0_mods: panel-s-wuxga-8-0-mods {
        status = “disabled”;
        ...
    };
};
sor0: sor {
    compatible = "nvidia,tegra186-sor";
    ...
    nvidia,sor-ctrlnum = <0x0>;
    nvidia,dpaux = <&dpaux0>;
    nvidia,active-panel = <&sor0_hdmi_display>;
    ...
    sor0_hdmi_display: hdmi-display {
        status = “okay”;
        ...
    };
    sor0_dp_display: dp-display {
        status = “disabled”;
        ...
    };
};
sor1: sor1 {
    compatible = "nvidia,tegra186-sor";
    ...
    nvidia,sor-ctrlnum = <0x1>;
    nvidia,dpaux = <&dpaux1>;
    nvidia,active-panel = <&panel_s_edp_uhdtv>;
    ...
    sor1_dp_display: dp-display {
        status = “disabled”;
        ...
    };
    panel_s_edp_uhdtv: panel-s-edp-uhdtv-15-6 {
        status = “okay”;
        ...
    };
};
dpaux0: dpaux@155C0000 {
    compatible = "nvidia,tegra186-dpaux";
    ...
    nvidia,dpaux-ctrlnum = <0>;
    ...
};
dpaux1: dpaux@15040000 {
    compatible = "nvidia,tegra186-dpaux";
    ...
    nvidia,dpaux-ctrlnum = <1>;
    ...
};

TDS-757
TDS-1544
TDS-1631

Change-Id: I0007eb56e4ccfbfa58491792cc8233ffaedeedfb
Signed-off-by: Ujwal Patel <ujwalp@nvidia.com>
Reviewed-on: http://git-master/r/1319184
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 5 insertions, 12 deletions

diff --git a/drivers/video/tegra/dc/dsi.c b/drivers/video/tegra/dc/dsi.c
index 67076eb85..bb6050ba3 100644
--- a/drivers/video/tegra/dc/dsi.c
+++ b/drivers/video/tegra/dc/dsi.c
@@ -2359,13 +2359,12 @@ static void tegra_dsi_pad_enable(struct tegra_dc_dsi_data *dsi)
         }
 }
 
-#if defined(CONFIG_ARCH_TEGRA_210_SOC) || defined(CONFIG_TEGRA_NVDISPLAY)
-static void tegra_dsi_mipi_calibration_21x(struct tegra_dc_dsi_data *dsi)
+static void tegra_dsi_mipi_calibration(struct tegra_dc_dsi_data *dsi)
 {
         u32 val = 0;
 #if !defined(CONFIG_TEGRA_NVDISPLAY)
         struct clk *clk72mhz = NULL;
-        struct device_node *np_dsi = of_find_node_by_path(DSI_NODE);
+        struct device_node *np_dsi = tegra_dc_get_conn_np(dsi->dc);
         clk72mhz = tegra_disp_of_clk_get_by_name(np_dsi, "clk72mhz");
         if (IS_ERR_OR_NULL(clk72mhz)) {
                 dev_err(&dsi->dc->ndev->dev, "dsi: can't get clk72mhz clock\n");
@@ -2400,7 +2399,6 @@ static void tegra_dsi_mipi_calibration_21x(struct tegra_dc_dsi_data *dsi)
         clk_put(clk72mhz);
 #endif
 }
-#endif
 
 static void tegra_dsi_pad_calibration(struct tegra_dc_dsi_data *dsi)
 {
@@ -2410,7 +2408,7 @@ static void tegra_dsi_pad_calibration(struct tegra_dc_dsi_data *dsi)
                 tegra_dsi_pad_disable(dsi);
 
         if (dsi->info.controller_vs == DSI_VS_1)
-                tegra_dsi_mipi_calibration_21x(dsi);
+                tegra_dsi_mipi_calibration(dsi);
 }
 
 #if !defined(CONFIG_TEGRA_NVDISPLAY) && !defined(CONFIG_ARCH_TEGRA_210_SOC)
@@ -4359,8 +4357,7 @@ static int _tegra_dc_dsi_init(struct tegra_dc *dc)
 #else
         char *dsi_fixed_clk_name = "pll_p_out3";
 #endif
-        struct device_node *np_dsi =
-                of_find_node_by_path(DSI_NODE);
+        struct device_node *np_dsi = tegra_dc_get_conn_np(dc);
 
         if (!np_dsi || !of_device_is_available(np_dsi)) {
                 dev_err(&dc->ndev->dev, "dsi not available\n");
@@ -4368,10 +4365,8 @@ static int _tegra_dc_dsi_init(struct tegra_dc *dc)
         }
 
         dsi = kzalloc(sizeof(*dsi), GFP_KERNEL);
-        if (!dsi) {
-                of_node_put(np_dsi);
+        if (!dsi)
                 return -ENOMEM;
-        }
 
         dsi->max_instances = is_simple_dsi(dc->out->dsi) ? 1 : MAX_DSI_INSTANCE;
         dsi_instance = (int)dc->out->dsi->dsi_instance;
@@ -4520,7 +4515,6 @@ static int _tegra_dc_dsi_init(struct tegra_dc *dc)
                 goto err_dc_clk_put;
         }
 
-        of_node_put(np_dsi);
         return 0;
 
 err_dc_clk_put:
@@ -4539,7 +4533,6 @@ err_dsi_clk_put:
 err_free_dsi:
         kfree(dsi);
 
-        of_node_put(np_dsi);
         return err;
 }