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: 1476311 Return-Path: X-Original-To: patchwork-linux-omap@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 821E73FE65 for ; Wed, 19 Sep 2012 08:32:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755160Ab2ISIbs (ORCPT ); Wed, 19 Sep 2012 04:31:48 -0400 Received: from na3sys009aog127.obsmtp.com ([74.125.149.107]:55195 "EHLO na3sys009aog127.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753487Ab2ISIbK (ORCPT ); Wed, 19 Sep 2012 04:31:10 -0400 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]) (using TLSv1) by na3sys009aob127.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 y9so510620lag.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=mDtuBd73VJmshAUF+sBDNinnIn3kSQhgod6AnzHMGGFCfHlC5Dkct7RVKI/01yZxWm cTKl5j2YfkU0N9ywA3r9Q8nhurDcguJmZAL+zHipNi82AOQxpWkLwCatAqWIrRVbn0uw cJ2e0zT+ySEWIb96y6aK1yCpuyfxVS0oQl2FENNoWLbuA524nRwrufODNo7QXgVlgITG jTb7TA/mAjZgXzJKpcJhdoEC5hvQ/PLxpa6LmgMLcDvMBYKKyAuxzxiZag3QyySCRD7A 6wStC1n1iF22K7s62vBm3506kio405fZrCGuBwvqUnhxa0KOQIC5Y2H6DYkMZqVRFnPL t6GA== 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: ALoCoQmZKpCG2NJcZPvNU1qammjZxkXobSrORnH41owom1C2m3tAXZkIW6tefEoOPZvsDq+rjIDs Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@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);