From patchwork Thu Mar 31 22:09:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 680251 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 p2VM9rjq018880 for ; Thu, 31 Mar 2011 22:09:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759373Ab1CaWJw (ORCPT ); Thu, 31 Mar 2011 18:09:52 -0400 Received: from na3sys009aog115.obsmtp.com ([74.125.149.238]:51451 "EHLO na3sys009aog115.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759365Ab1CaWJv (ORCPT ); Thu, 31 Mar 2011 18:09:51 -0400 Received: from source ([209.85.210.179]) (using TLSv1) by na3sys009aob115.postini.com ([74.125.148.12]) with SMTP ID DSNKTZT7rgfNwy8zhyo/QHHCCjY6WMjiJk6H@postini.com; Thu, 31 Mar 2011 15:09:51 PDT Received: by iym7 with SMTP id 7so2819271iym.10 for ; Thu, 31 Mar 2011 15:09:48 -0700 (PDT) Received: by 10.43.60.82 with SMTP id wr18mr3731343icb.359.1301609388211; Thu, 31 Mar 2011 15:09:48 -0700 (PDT) Received: from localhost (c-24-18-179-55.hsd1.wa.comcast.net [24.18.179.55]) by mx.google.com with ESMTPS id 13sm999237ibo.8.2011.03.31.15.09.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 31 Mar 2011 15:09:47 -0700 (PDT) From: Kevin Hilman To: Tony Lindgren Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Subject: Re: [PATCH 06/10] omap2+: Remove gptimer_wakekup for now Organization: Texas Instruments, Inc. References: <20110328221501.4046.41079.stgit@baageli.muru.com> <20110328222142.4046.4677.stgit@baageli.muru.com> Date: Thu, 31 Mar 2011 15:09:45 -0700 In-Reply-To: <20110328222142.4046.4677.stgit@baageli.muru.com> (Tony Lindgren's message of "Mon, 28 Mar 2011 15:21:43 -0700") Message-ID: <87zkob6ixi.fsf@ti.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) MIME-Version: 1.0 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 31 Mar 2011 22:09:53 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c index a5a83b3..eccf117 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c @@ -171,8 +171,8 @@ void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds) tick_rate = clk_get_rate(omap_dm_timer_get_fclk(gptimer_wakeup)); cycles = tick_rate * seconds + tick_rate * milliseconds / 1000; - omap_dm_timer_stop(gptimer_wakeup); - omap_dm_timer_set_load_start(gptimer_wakeup, 0, 0xffffffff - cycles); + __omap_dm_timer_load_start(gptimer_wakeup->io_base, OMAP_TIMER_CTRL_ST, + 0xffffffff - cycles, 1); pr_info("PM: Resume timer in %u.%03u secs" " (%d ticks at %d ticks/sec.)\n", diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index c21e99f..52100b2 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c @@ -76,7 +76,7 @@ static struct omap_dm_timer *gptimer; static struct clock_event_device clockevent_gpt; static u8 __initdata gptimer_id = 1; static u8 __initdata inited; -struct omap_dm_timer *gptimer_wakeup; +struct omap_dm_timer *gptimer_wakeup = &clkev; static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id) {