Merge tag 'pm-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[cascardo/linux.git] / drivers / gpu / drm / omapdrm / displays / connector-analog-tv.c

diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 8511c64..3485d1e 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -14,9 +14,10 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 
-#include <video/omapdss.h>
 #include <video/omap-panel-data.h>
 
+#include "../dss/omapdss.h"
+
 struct panel_drv_data {
        struct omap_dss_device dssdev;
        struct omap_dss_device *in;
@@ -25,7 +26,6 @@ struct panel_drv_data {
 
        struct omap_video_timings timings;
 
-       enum omap_dss_venc_type connector_type;
        bool invert_polarity;
 };
 
@@ -45,10 +45,6 @@ static const struct omap_video_timings tvc_pal_timings = {
 
 static const struct of_device_id tvc_of_match[];
 
-struct tvc_of_data {
-       enum omap_dss_venc_type connector_type;
-};
-
 #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
 
 static int tvc_connect(struct omap_dss_device *dssdev)
@@ -99,7 +95,7 @@ static int tvc_enable(struct omap_dss_device *dssdev)
        in->ops.atv->set_timings(in, &ddata->timings);
 
        if (!ddata->dev->of_node) {
-               in->ops.atv->set_type(in, ddata->connector_type);
+               in->ops.atv->set_type(in, OMAP_DSS_VENC_TYPE_COMPOSITE);
 
                in->ops.atv->invert_vid_out_polarity(in,
                        ddata->invert_polarity);
@@ -207,7 +203,6 @@ static int tvc_probe_pdata(struct platform_device *pdev)
 
        ddata->in = in;
 
-       ddata->connector_type = pdata->connector_type;
        ddata->invert_polarity = pdata->invert_polarity;
 
        dssdev = &ddata->dssdev;