From patchwork Wed Sep 15 05:26:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: charu@ti.com X-Patchwork-Id: 181812 X-Patchwork-Delegate: khilman@deeprootsystems.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 o8F5R0U6012796 for ; Wed, 15 Sep 2010 05:27:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753269Ab0IOF1J (ORCPT ); Wed, 15 Sep 2010 01:27:09 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:52217 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298Ab0IOF07 (ORCPT ); Wed, 15 Sep 2010 01:26:59 -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 o8F5Qqh1010598 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 15 Sep 2010 00:26:54 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o8F5QibZ017898; Wed, 15 Sep 2010 10:56:50 +0530 (IST) From: "Varadarajan, Charulatha" To: tony@atomide.com, wim@iguana.be, linux-watchdog@vger.kernel.org Cc: khilman@deeprootsystems.com, paul@pwsan.com, b-cousson@ti.com, rnayak@ti.com, p-basak2@ti.com, linux-omap@vger.kernel.org, "Varadarajan, Charulatha" Subject: [PATCH v5 5/6] OMAP2PLUS: WDT: use omap_device_build for device registration Date: Wed, 15 Sep 2010 10:56:42 +0530 Message-Id: <1284528403-6494-6-git-send-email-charu@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1284528403-6494-1-git-send-email-charu@ti.com> References: <1284528403-6494-1-git-send-email-charu@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, 15 Sep 2010 05:27:11 +0000 (UTC) diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index d1920be..6885f4f 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -28,6 +29,8 @@ #include #include #include +#include +#include /*-------------------------------------------------------------------------*/ @@ -236,37 +239,58 @@ static inline void omap_init_uwire(void) {} #if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE) -static struct resource wdt_resources[] = { +struct omap_device_pm_latency omap2_wdt_latency[] = { + [0] = { + .deactivate_func = omap_device_idle_hwmods, + .activate_func = omap_device_enable_hwmods, + .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, + }, +}; + +static void omap2_init_wdt(void) +{ + int id = -1; + struct omap_device *od; + struct omap_hwmod *oh; + char *oh_name = "wd_timer2"; + char *name = "omap_wdt"; + + oh = omap_hwmod_lookup(oh_name); + if (!oh) { + pr_err("Could not look up %s\n", oh_name); + return; + } + + od = omap_device_build(name, id, oh, NULL, 0, + omap2_wdt_latency, + ARRAY_SIZE(omap2_wdt_latency), 0); + WARN(IS_ERR(od), "Cant build omap_device for %s:%s.\n", + name, oh->name); + return; +} + +static struct resource omap1_wdt_resources[] = { { + .start = 0xfffeb000, + .end = 0xfffeb07F, .flags = IORESOURCE_MEM, }, }; -static struct platform_device omap_wdt_device = { +static struct platform_device omap1_wdt_device = { .name = "omap_wdt", .id = -1, - .num_resources = ARRAY_SIZE(wdt_resources), - .resource = wdt_resources, + .num_resources = ARRAY_SIZE(omap1_wdt_resources), + .resource = omap1_wdt_resources, }; static void omap_init_wdt(void) { - if (cpu_is_omap16xx()) - wdt_resources[0].start = 0xfffeb000; - else if (cpu_is_omap2420()) - wdt_resources[0].start = 0x48022000; /* WDT2 */ - else if (cpu_is_omap2430()) - wdt_resources[0].start = 0x49016000; /* WDT2 */ - else if (cpu_is_omap343x()) - wdt_resources[0].start = 0x48314000; /* WDT2 */ - else if (cpu_is_omap44xx()) - wdt_resources[0].start = 0x4a314000; - else - return; - - wdt_resources[0].end = wdt_resources[0].start + 0x4f; - - (void) platform_device_register(&omap_wdt_device); + if (cpu_class_is_omap2()) + omap2_init_wdt(); + else if (cpu_is_omap16xx()) + (void) platform_device_register(&omap1_wdt_device); + return; } #else static inline void omap_init_wdt(void) {}