drm/tegra: sor: Remove tegra186-sor1 support

It turns out that SOR1 is just another instance of the same block as the
SOR0, so there is no need to distinguish them.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 9cf008d7c67b9a5938d08667dea96834bbce3c81..4e46524f22e3124f17cc27787d0674d38bf8a3dc 100644 (file)
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -3680,23 +3680,6 @@ static const u8 tegra186_sor_pre_emphasis[4][4][4] = {
 };
 
 static const struct tegra_sor_soc tegra186_sor = {
-       .supports_edp = false,
-       .supports_lvds = false,
-       .supports_hdmi = false,
-       .supports_dp = true,
-
-       .regs = &tegra186_sor_regs,
-       .has_nvdisplay = true,
-
-       .xbar_cfg = tegra124_sor_xbar_cfg,
-       .lane_map = tegra124_sor_lane_map,
-       .voltage_swing = tegra186_sor_voltage_swing,
-       .pre_emphasis = tegra186_sor_pre_emphasis,
-       .post_cursor = tegra124_sor_post_cursor,
-       .tx_pu = tegra124_sor_tx_pu,
-};
-
-static const struct tegra_sor_soc tegra186_sor1 = {
        .supports_edp = false,
        .supports_lvds = false,
        .supports_hdmi = true,
@@ -3747,7 +3730,6 @@ static const struct tegra_sor_soc tegra194_sor = {
 
 static const struct of_device_id tegra_sor_of_match[] = {
        { .compatible = "nvidia,tegra194-sor", .data = &tegra194_sor },
-       { .compatible = "nvidia,tegra186-sor1", .data = &tegra186_sor1 },
        { .compatible = "nvidia,tegra186-sor", .data = &tegra186_sor },
        { .compatible = "nvidia,tegra210-sor1", .data = &tegra210_sor1 },
        { .compatible = "nvidia,tegra210-sor", .data = &tegra210_sor },