From bcb226a9254d30c0c44bc724c22b7a5d3fadec6a Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 7 Sep 2012 15:21:36 +0300 Subject: [PATCH] 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 --- drivers/video/omap2/dss/hdmi.c | 2 ++ drivers/video/omap2/dss/venc.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 76d100b975e..3b10e18efa2 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 b9c0a8f468d..88fa6ea77e7 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); -- 2.41.0