aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2016-05-30 06:21:06 -0400
committerPeter Ujfalusi <peter.ujfalusi@ti.com>2016-06-03 09:06:30 -0400
commite2e1d8f67192ee77294afa3ab3e6a42bc274ba5f (patch)
treeddb2f1d67366169eb4cbd71194ee1c0bed541405 /drivers/gpu/drm/omapdrm
parent66da14f75b256e5b283d4dd0426bf076f616ff87 (diff)
drm/omap: 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>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
-rw-r--r--drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
index 8511c648a15c..d963b4a9cfc0 100644
--- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
@@ -25,7 +25,6 @@ struct panel_drv_data {
25 25
26 struct omap_video_timings timings; 26 struct omap_video_timings timings;
27 27
28 enum omap_dss_venc_type connector_type;
29 bool invert_polarity; 28 bool invert_polarity;
30}; 29};
31 30
@@ -45,10 +44,6 @@ static const struct omap_video_timings tvc_pal_timings = {
45 44
46static const struct of_device_id tvc_of_match[]; 45static const struct of_device_id tvc_of_match[];
47 46
48struct tvc_of_data {
49 enum omap_dss_venc_type connector_type;
50};
51
52#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev) 47#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
53 48
54static int tvc_connect(struct omap_dss_device *dssdev) 49static int tvc_connect(struct omap_dss_device *dssdev)
@@ -99,7 +94,7 @@ static int tvc_enable(struct omap_dss_device *dssdev)
99 in->ops.atv->set_timings(in, &ddata->timings); 94 in->ops.atv->set_timings(in, &ddata->timings);
100 95
101 if (!ddata->dev->of_node) { 96 if (!ddata->dev->of_node) {
102 in->ops.atv->set_type(in, ddata->connector_type); 97 in->ops.atv->set_type(in, OMAP_DSS_VENC_TYPE_COMPOSITE);
103 98
104 in->ops.atv->invert_vid_out_polarity(in, 99 in->ops.atv->invert_vid_out_polarity(in,
105 ddata->invert_polarity); 100 ddata->invert_polarity);
@@ -207,7 +202,6 @@ static int tvc_probe_pdata(struct platform_device *pdev)
207 202
208 ddata->in = in; 203 ddata->in = in;
209 204
210 ddata->connector_type = pdata->connector_type;
211 ddata->invert_polarity = pdata->invert_polarity; 205 ddata->invert_polarity = pdata->invert_polarity;
212 206
213 dssdev = &ddata->dssdev; 207 dssdev = &ddata->dssdev;