From patchwork Mon Jan 3 12:50:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Senthilvadivu Guruswamy X-Patchwork-Id: 447391 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 p03CpTWD027044 for ; Mon, 3 Jan 2011 12:51:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754768Ab1ACMv1 (ORCPT ); Mon, 3 Jan 2011 07:51:27 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:53102 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754670Ab1ACMvZ (ORCPT ); Mon, 3 Jan 2011 07:51:25 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id p03CpHJm031782 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 3 Jan 2011 06:51:20 -0600 Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id p03CpDli021522; Mon, 3 Jan 2011 18:21:14 +0530 (IST) Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by linfarm476.india.ti.com (8.12.11/8.12.11) with ESMTP id p03CpC0G027045; Mon, 3 Jan 2011 18:21:12 +0530 Received: (from a0876342@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id p03CpCBW027043; Mon, 3 Jan 2011 18:21:12 +0530 From: Guruswamy Senthilvadivu To: tomi.valkeinen@nokia.com, paul@pwsan.com, khilman@deeprootsystems.com, v-hiremath@ti.com, a0919096@ti.com, linux-omap@vger.kernel.org Cc: Senthilvadivu Guruswamy Subject: [PATCH v3 07/17] OMAP2, 3: DSS2: Build omap_device for each DSS HWIP Date: Mon, 3 Jan 2011 18:20:59 +0530 Message-Id: <1294059069-26737-8-git-send-email-svadivu@ti.com> X-Mailer: git-send-email 1.5.6.6 In-Reply-To: <1294059069-26737-1-git-send-email-svadivu@ti.com> References: <1294059069-26737-1-git-send-email-svadivu@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]); Mon, 03 Jan 2011 12:51:29 +0000 (UTC) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 27d1505..d2e87a5 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -938,10 +938,60 @@ static struct platform_device omap_display_device = { }, }; +static struct omap_device_pm_latency omap_dss_latency[] = { + [0] = { + .deactivate_func = omap_device_idle_hwmods, + .activate_func = omap_device_enable_hwmods, + }, +}; + int __init omap_display_init(struct omap_dss_board_info *board_data) { int r = 0; + struct omap_hwmod *oh; + struct omap_device *od; + int i; + struct omap_display_platform_data pdata; + char *omap2_oh_name[] = { "dss_dss", "dss_dispc", "dss_rfbi", + "dss_venc" }; + char *omap3_oh_name[] = { "dss_dss", "dss_dispc", "dss_rfbi", + "dss_venc", "dss_dsi1" }; + char *omap2_dev_name[] = { "omap_dss", "omap_dispc", "omap_rfbi", + "omap_venc" }; + char *omap3_dev_name[] = { "omap_dss", "omap_dispc", "omap_rfbi", + "omap_venc", "omap_dsi1" }; + char *(*oh_name)[]; + char *(*dev_name)[]; + int oh_count; + + if (cpu_is_omap24xx()) { + oh_name = &omap2_oh_name; + dev_name = &omap2_dev_name; + oh_count = ARRAY_SIZE(omap2_oh_name); + } else { + oh_name = &omap3_oh_name; + dev_name = &omap3_dev_name; + oh_count = ARRAY_SIZE(omap3_oh_name); + } + + pdata.board_data = board_data; + pdata.board_data->get_last_off_on_transaction_id = NULL; + + for (i = 0; i < oh_count; i++) { + oh = omap_hwmod_lookup((*oh_name)[i]); + if (!oh) { + pr_err("Could not look up %s\n", (*oh_name)[i]); + return r; + } + od = omap_device_build((*dev_name)[i], -1, oh, &pdata, + sizeof(struct omap_display_platform_data), + omap_dss_latency, + ARRAY_SIZE(omap_dss_latency), 0); + + WARN((IS_ERR(od)), "Could not build omap_device for %s\n", + (*oh_name)[i]); + } omap_display_device.dev.platform_data = board_data; r = platform_device_register(&omap_display_device); diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h index 871bbae..23afd6d 100644 --- a/arch/arm/plat-omap/include/plat/display.h +++ b/arch/arm/plat-omap/include/plat/display.h @@ -26,6 +26,7 @@ #include #include + #define DISPC_IRQ_FRAMEDONE (1 << 0) #define DISPC_IRQ_VSYNC (1 << 1) #define DISPC_IRQ_EVSYNC_EVEN (1 << 2) @@ -224,6 +225,11 @@ struct omap_dss_board_info { /* Init with the board info */ extern int omap_display_init(struct omap_dss_board_info *board_data); +struct omap_display_platform_data { + struct omap_dss_board_info *board_data; + /* TODO: Additional members to be added when PM is considered */ +}; + struct omap_video_timings { /* Unit: pixels */ u16 x_res;