From patchwork Wed Oct 6 11:14:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Senthilvadivu Guruswamy X-Patchwork-Id: 235831 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 o96BFmsO017482 for ; Wed, 6 Oct 2010 11:16:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758912Ab0JFLPz (ORCPT ); Wed, 6 Oct 2010 07:15:55 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:60268 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758875Ab0JFLPU (ORCPT ); Wed, 6 Oct 2010 07:15:20 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o96BFAfM009678 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 6 Oct 2010 06:15:13 -0500 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 o96BF9EN029552; Wed, 6 Oct 2010 16:45:09 +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 o96BF9l2010427; Wed, 6 Oct 2010 16:45:09 +0530 Received: (from a0876342@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id o96BF86K010421; Wed, 6 Oct 2010 16:45:08 +0530 From: Guruswamy Senthilvadivu To: khilman@deeprootsystems.com, tomi.valkeinen@nokia.com, paul@pwsan.com, hvaibhav@ti.com, linux-omap@vger.kernel.org Cc: Senthilvadivu Guruswamy Subject: [PATCH v1 06/16] OMAP3: hwmod DSS: Build omap_device for each DSS HWIP Date: Wed, 6 Oct 2010 16:44:49 +0530 Message-Id: <1286363699-9614-7-git-send-email-svadivu@ti.com> X-Mailer: git-send-email 1.5.6.6 In-Reply-To: <1286363699-9614-6-git-send-email-svadivu@ti.com> References: <1286363699-9614-1-git-send-email-svadivu@ti.com> <1286363699-9614-2-git-send-email-svadivu@ti.com> <1286363699-9614-3-git-send-email-svadivu@ti.com> <1286363699-9614-4-git-send-email-svadivu@ti.com> <1286363699-9614-5-git-send-email-svadivu@ti.com> <1286363699-9614-6-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]); Wed, 06 Oct 2010 11:16:10 +0000 (UTC) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 0702b87..7a75310 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include "mux.h" @@ -896,9 +898,53 @@ 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, + }, +}; + void __init omap_display_init(struct omap_dss_board_info *board_data) { + struct omap_hwmod *oh; + struct omap_device *od; + int l, i; + struct omap_display_platform_data pdata; + char *oh_name[] = { + "dss_dss", + "dss_dispc", + "dss_dsi1", + "dss_rfbi", + "dss_venc" + }; + + for (i = 0; i < ARRAY_SIZE(oh_name); i++) { + l = snprintf(oh_name[i], MAX_OMAP_DSS_HWMOD_NAME_LEN, + oh_name[i]); + WARN(l >= MAX_OMAP_DSS_HWMOD_NAME_LEN, + "String buffer overflow in DSS device setup\n"); + + oh = omap_hwmod_lookup(oh_name[i]); + if (!oh) { + pr_err("Could not look up %s\n", oh_name[i]); + return ; + } + strncpy(pdata.name, oh_name[i], sizeof(oh_name[i])); + pdata.board_data = board_data; + pdata.board_data->get_last_off_on_transaction_id = NULL; + pdata.device_enable = omap_device_enable; + pdata.device_idle = omap_device_idle; + pdata.device_shutdown = omap_device_shutdown; + od = omap_device_build(oh_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; diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h index 4b71be3..84a63de 100644 --- a/arch/arm/plat-omap/include/plat/display.h +++ b/arch/arm/plat-omap/include/plat/display.h @@ -26,6 +26,8 @@ #include #include +#define MAX_OMAP_DSS_HWMOD_NAME_LEN 16 + #define DISPC_IRQ_FRAMEDONE (1 << 0) #define DISPC_IRQ_VSYNC (1 << 1) #define DISPC_IRQ_EVSYNC_EVEN (1 << 2) @@ -255,6 +257,14 @@ struct omap_dss_board_info { /* Init with the board info */ extern void omap_display_init(struct omap_dss_board_info *board_data); +struct omap_display_platform_data { + char name[MAX_OMAP_DSS_HWMOD_NAME_LEN]; + struct omap_dss_board_info *board_data; + int (*device_enable)(struct platform_device *pdev); + int (*device_shutdown)(struct platform_device *pdev); + int (*device_idle)(struct platform_device *pdev); +}; + struct omap_video_timings { /* Unit: pixels */ u16 x_res;