omapfb: connector-analog-tv: Support only Composite type in legacy boot

In legacy mode (non DT mode) support only composite connector type. The
only user for this is rx51, using composite type.
Dropping the connector_type selection via pdata will allow cleanups in
omapdss (drm vs fbdev).

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
index 8511c648a15c21cd5d7239e804ca1088c3e189bf..d963b4a9cfc024c9f55db4b4786a058874ae4939 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
@@ -25,7 +25,6 @@ struct panel_drv_data {
 
        struct omap_video_timings timings;
 
-       enum omap_dss_venc_type connector_type;
        bool invert_polarity;
 };
 
@@ -45,10 +44,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 +94,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 +202,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;