5 files changed, 11 insertions, 5 deletions

diff --git a/drivers/video/tegra/Kconfig.display b/drivers/video/tegra/Kconfig.display
index 4c4f60639..0efaa0693 100644
--- a/drivers/video/tegra/Kconfig.display
+++ b/drivers/video/tegra/Kconfig.display
@@ -230,6 +230,12 @@ config TEGRA_DSI2LVDS_SN65DSI85
         help
           Say Y here to enable the DSI2LVDS TI SN65DSI85 adapter.
 
+config TEGRA_LVDS2FPDL_DS90UB947
+        bool "DS90UB947-Q1 1080p OpenLDS to FPD-Link III Serializer driver"
+        default n
+        help
+                Enable support for TI DS90UB947-Q1 LVDS-to-FPD-Link Serializer driver.
+
 config TEGRA_DP
         bool "Enable eDP panel."
         default  y
diff --git a/drivers/video/tegra/dc/Makefile b/drivers/video/tegra/dc/Makefile
index ce7045dcc..66b55b9fd 100644
--- a/drivers/video/tegra/dc/Makefile
+++ b/drivers/video/tegra/dc/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_TEGRA_HDMI2FPD_DS90UH949) += hdmi2fpd_ds90uh949.o
 obj-$(CONFIG_TEGRA_DSI2EDP_TC358767) += tc358767_dsi2edp.o
 obj-$(CONFIG_TEGRA_DSI2EDP_SN65DSI86) += sn65dsi86_dsi2edp.o
 obj-$(CONFIG_TEGRA_DSI2LVDS_SN65DSI85) += sn65dsi85_dsi2lvds.o
+obj-$(CONFIG_TEGRA_LVDS2FPDL_DS90UB947) += ds90ub947-q1.o
 obj-$(CONFIG_TEGRA_MIPI_CAL) += mipi_cal.o
 obj-$(CONFIG_TEGRA_NVHDCP) += nvhdcp.o
 ifneq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
diff --git a/drivers/video/ds90ub947-q1.c b/drivers/video/tegra/dc/ds90ub947-q1.c
index 700452fc9..6c2463fcb 100644
--- a/drivers/video/ds90ub947-q1.c
+++ b/drivers/video/tegra/dc/ds90ub947-q1.c
@@ -25,7 +25,7 @@
 #include <linux/debugfs.h>
 #include <linux/mutex.h>
 #include <linux/delay.h>
-#include "../../../display/drivers/video/tegra/dc/dsi.h"
+#include "dsi.h"
 
 #define DEV_NAME "ds90ub947-q1"
 #define DS90UB947_GENERAL_STATUS        0x0C
@@ -111,7 +111,6 @@ static int ds90ub947_init(struct ds90ub947_data *data)
                 }
         }
         mutex_unlock(&data->lock);
-        pr_info("%s: returning %d\n", __func__, ret);
         return ret;
 }
 
diff --git a/drivers/video/tegra/dc/dsi.c b/drivers/video/tegra/dc/dsi.c
index a2c815ec3..1b1f15df6 100644
--- a/drivers/video/tegra/dc/dsi.c
+++ b/drivers/video/tegra/dc/dsi.c
@@ -5880,13 +5880,13 @@ bool tegra_dc_dsi_detect(struct tegra_dc *dc)
 {
         bool    result = true;
 
-#if defined(CONFIG_DS90UB947)
+#if defined(CONFIG_TEGRA_LVDS2FPDL_DS90UB947)
         /* DrivePX2: DSI->sn65dsi85(LVDS)->ds90ub947(FPDLink) */
         struct tegra_dc_dsi_data        *dsi = tegra_dc_get_outdata(dc);
 
         if (dsi->info.dsi2lvds_bridge_enable)
                 result = ds90ub947_lvds2fpdlink3_detect(dc);
-#endif /*defined(CONFIG_DS90UB947)*/
+#endif /*defined(CONFIG_TEGRA_LVDS2FPDL_DS90UB947)*/
         return result;
 }
 
diff --git a/drivers/video/tegra/dc/dsi.h b/drivers/video/tegra/dc/dsi.h
index f2476daea..c812aacca 100644
--- a/drivers/video/tegra/dc/dsi.h
+++ b/drivers/video/tegra/dc/dsi.h
@@ -485,7 +485,7 @@ extern struct tegra_dsi_out_ops tegra_dsi2lvds_ops;
 #define tegra_dsi2lvds_ops (*(struct tegra_dsi_out_ops *)NULL)
 #endif
 
-#if defined(CONFIG_DS90UB947)
+#if defined(CONFIG_TEGRA_LVDS2FPDL_DS90UB947)
 extern bool ds90ub947_lvds2fpdlink3_detect(struct tegra_dc *dc);
 #endif