diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-07 14:21:36 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-18 15:15:03 +0200 |
| commit | bcb226a9254d30c0c44bc724c22b7a5d3fadec6a (patch) | |
| tree | f6ca667ec088ee1c0c16fbb86ee104c161bffc1b /drivers/video | |
| parent | OMAPDSS: register only one display device per output (diff) | |
| download | linux-bcb226a9254d30c0c44bc724c22b7a5d3fadec6a.tar.xz linux-bcb226a9254d30c0c44bc724c22b7a5d3fadec6a.zip | |
OMAPDSS: explicitely initialize dssdev->channel for new displays
HDMI and VENC outputs always use the DIGIT output from DISPC. The dssdev
struct contains "channel" field which is used to specify the DISPC
output for the display, but this was not used for HDMI and VENC.
This patch fills the channel field explicitely for HDMI and VENC
displays so that we can always rely on the channel field.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 2 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/venc.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 76d100b975e0..3b10e18efa22 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -946,6 +946,8 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev) hdmi.ls_oe_gpio = priv->ls_oe_gpio; hdmi.hpd_gpio = priv->hpd_gpio; + dssdev->channel = OMAP_DSS_CHANNEL_DIGIT; + r = hdmi_init_display(dssdev); if (r) { DSSERR("device %s init failed: %d\n", dssdev->name, r); diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index b9c0a8f468d2..88fa6ea77e74 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -773,6 +773,8 @@ static void __init venc_probe_pdata(struct platform_device *pdev) if (!dssdev) return; + dssdev->channel = OMAP_DSS_CHANNEL_DIGIT; + r = venc_init_display(dssdev); if (r) { DSSERR("device %s init failed: %d\n", dssdev->name, r); |