Commit 005358c8 authored by Tomi Valkeinen's avatar Tomi Valkeinen

OMAPDSS: analog-tv-connector: compile fix

connector-analog-tv.c uses omap_dss_pal_timings, defined in omapdss's
venc.c, for default timings. omap_dss_pal_timings only exists when VENC
is enabled in the kernel config, so disabling VENC breaks
omap_dss_pal_timings connector-analog-tv compilation.

Instead of adding dependency to VENC, add internal default timings to
the connector driver, because the connector driver should not depend on
VENC, and it can be used with any other analog TV encoder.
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 7808e329
...@@ -28,6 +28,20 @@ struct panel_drv_data { ...@@ -28,6 +28,20 @@ struct panel_drv_data {
bool invert_polarity; bool invert_polarity;
}; };
static const struct omap_video_timings tvc_pal_timings = {
.x_res = 720,
.y_res = 574,
.pixel_clock = 13500,
.hsw = 64,
.hfp = 12,
.hbp = 68,
.vsw = 5,
.vfp = 5,
.vbp = 41,
.interlace = true,
};
#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev) #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
static int tvc_connect(struct omap_dss_device *dssdev) static int tvc_connect(struct omap_dss_device *dssdev)
...@@ -212,14 +226,14 @@ static int tvc_probe(struct platform_device *pdev) ...@@ -212,14 +226,14 @@ static int tvc_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
ddata->timings = omap_dss_pal_timings; ddata->timings = tvc_pal_timings;
dssdev = &ddata->dssdev; dssdev = &ddata->dssdev;
dssdev->driver = &tvc_driver; dssdev->driver = &tvc_driver;
dssdev->dev = &pdev->dev; dssdev->dev = &pdev->dev;
dssdev->type = OMAP_DISPLAY_TYPE_VENC; dssdev->type = OMAP_DISPLAY_TYPE_VENC;
dssdev->owner = THIS_MODULE; dssdev->owner = THIS_MODULE;
dssdev->panel.timings = omap_dss_pal_timings; dssdev->panel.timings = tvc_pal_timings;
r = omapdss_register_display(dssdev); r = omapdss_register_display(dssdev);
if (r) { if (r) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment