From patchwork Wed Jan 5 17:44:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 454401 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p05HiZQc019757 for ; Wed, 5 Jan 2011 17:44:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752188Ab1AERoe (ORCPT ); Wed, 5 Jan 2011 12:44:34 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:46512 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751978Ab1AERod (ORCPT ); Wed, 5 Jan 2011 12:44:33 -0500 Received: from dlep33.itg.ti.com ([157.170.170.112]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id p05HiSGH032311 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 5 Jan 2011 11:44:28 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id p05HiQHt002973; Wed, 5 Jan 2011 11:44:26 -0600 (CST) Received: from localhost (h83-8.vpn.ti.com [172.24.83.8]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id p05HiNf16018; Wed, 5 Jan 2011 11:44:23 -0600 (CST) From: Sumit Semwal To: tomi.valkeinen@nokia.com, paul@pwsan.com, khilman@deeprootsystems.com, hvaibhav@ti.com, linux-omap@vger.kernel.org Cc: Sumit Semwal Subject: [PATCH 3/3] OMAP4: DSS2: Add hwmod device names for OMAP4. Date: Wed, 5 Jan 2011 23:14:04 +0530 Message-Id: <1294249444-11951-4-git-send-email-sumit.semwal@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1294249444-11951-1-git-send-email-sumit.semwal@ti.com> References: <1294249444-11951-1-git-send-email-sumit.semwal@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 05 Jan 2011 17:44:36 +0000 (UTC) diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 276b800..918956e 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -51,20 +51,27 @@ int __init omap_display_init(struct omap_dss_board_info struct omap_device *od; int i; struct omap_display_platform_data pdata; - char *oh_name[] = { "dss_dss", /* omap2,3 */ - "dss_dispc", /* omap2,3 */ - "dss_rfbi", /* omap2,3 */ - "dss_venc", /* omap2,3 */ - "dss_dsi1" }; /* omap3 */ + char *oh_name[] = { "dss_dss", /* omap2,3,4 */ + "dss_dispc", /* omap2,3,4 */ + "dss_rfbi", /* omap2,3,4 */ + "dss_venc", /* omap2,3,4 */ + "dss_dsi1", /* omap3,4 */ + "dss_dsi2", /* omap4 */ + "dss_hdmi", /* omap4 */ + }; + char *dev_name[] = { "omap_dss", "omap_dispc", "omap_rfbi", "omap_venc", "omap_dsi1" }; int oh_count; if (cpu_is_omap24xx()) { - oh_count = ARRAY_SIZE(oh_name) - 1; - /* last hwmod dev in oh_name is not available for omap2 */ - } else { + oh_count = ARRAY_SIZE(oh_name) - 3; + /* last 3 hwmod dev in oh_name not available for omap2 */ + } else if (cpu_is_omap44xx()) { oh_count = ARRAY_SIZE(oh_name); + } else { + oh_count = ARRAY_SIZE(oh_name) - 2; + /* last 2 hwmod dev in oh_name not available for omap3 */ } pdata.board_data = board_data;