From patchwork Wed Sep 19 08:30:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 1476301 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 62FCF3FE4F for ; Wed, 19 Sep 2012 08:32:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755147Ab2ISIbs (ORCPT ); Wed, 19 Sep 2012 04:31:48 -0400 Received: from na3sys009aog128.obsmtp.com ([74.125.149.141]:42934 "EHLO na3sys009aog128.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753349Ab2ISIbK (ORCPT ); Wed, 19 Sep 2012 04:31:10 -0400 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]) (using TLSv1) by na3sys009aob128.postini.com ([74.125.148.12]) with SMTP ID DSNKUFmCzRmPlNqLHarsy1CVU+7EF2niD0A5@postini.com; Wed, 19 Sep 2012 01:31:10 PDT Received: by lagy9 with SMTP id y9so510619lag.19 for ; Wed, 19 Sep 2012 01:31:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=ff9niWh15WaoyGXUtJhBEDJXy9o6UtpPGjGYueDk4Wg=; b=DC/08KSPUCJvSCxnmtlAxIBTEYvenaOUGJapuQK5cwDmn5LXMyIywqp7TRilbdnnWy vALavKYDp9aEff4sgXGBp5MnArxjnySCkbgkJfhs4fKsLYjWYGOrdWCIAd900z1hDpFv POb+eOoIb0ylosw2aVQhalAttGL7nSzLpRc8xa/P6L2ry4ZpoYRfHw92GDqOc/laTLl2 lnnbzbIqHfifeQz8IlRGnrc8yX4K3KUkG2DC/M0wAgSMszJ1i2kUTw6C69zujZDcZO5B ZntaSTcwUL4sRr9Szey+M52d6GVg2wPxTlSYdPwajOh/BOHy7gcYleAekyOSqkQz5tc/ ibSw== Received: by 10.112.51.228 with SMTP id n4mr794717lbo.55.1348043467696; Wed, 19 Sep 2012 01:31:07 -0700 (PDT) Received: from localhost.localdomain (a91-156-160-115.elisa-laajakaista.fi. [91.156.160.115]) by mx.google.com with ESMTPS id r8sm589958lba.15.2012.09.19.01.31.06 (version=SSLv3 cipher=OTHER); Wed, 19 Sep 2012 01:31:06 -0700 (PDT) From: Tomi Valkeinen To: archit@ti.com, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: Tomi Valkeinen Subject: [PATCH 4/8] OMAPDSS: explicitely initialize dssdev->channel for new displays Date: Wed, 19 Sep 2012 11:30:34 +0300 Message-Id: <1348043438-2624-5-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348043438-2624-1-git-send-email-tomi.valkeinen@ti.com> References: <1348043438-2624-1-git-send-email-tomi.valkeinen@ti.com> X-Gm-Message-State: ALoCoQmevqzgxlWuKVcOq35I/WvYJK9+91Y6wXKsgtWUfL4poZRnaciulw7WYJp6r05tgyTRbhlV Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org 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 76d100b..3b10e18 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 b9c0a8f..88fa6ea 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);