From patchwork Thu Apr 17 00:03:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 4004761 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F0E51BFF02 for ; Thu, 17 Apr 2014 00:06:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 334E72028D for ; Thu, 17 Apr 2014 00:06:34 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E54B20272 for ; Thu, 17 Apr 2014 00:06:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WaZof-0002vn-R6; Thu, 17 Apr 2014 00:04:33 +0000 Received: from arroyo.ext.ti.com ([192.94.94.40]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WaZnz-0002YP-82 for linux-arm-kernel@lists.infradead.org; Thu, 17 Apr 2014 00:03:52 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s3H03TCt022964; Wed, 16 Apr 2014 19:03:29 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3H03TpZ031318; Wed, 16 Apr 2014 19:03:29 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Wed, 16 Apr 2014 19:03:29 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3H03TgZ019363; Wed, 16 Apr 2014 19:03:29 -0500 Received: from joel-laptop.itg.ti.com (j-172-22-137-46.vpn.ti.com [172.22.137.46]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id s3H03St25127; Wed, 16 Apr 2014 19:03:28 -0500 (CDT) From: Joel Fernandes To: Tony Lindgren Subject: [PATCH 4/9] ARM: OMAP: dmtimer: Add function to check if timer is running Date: Wed, 16 Apr 2014 19:03:14 -0500 Message-ID: <1397692999-7800-4-git-send-email-joelf@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397692999-7800-1-git-send-email-joelf@ti.com> References: <1397692999-7800-1-git-send-email-joelf@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140416_170351_382241_A56B033B X-CRM114-Status: GOOD ( 12.85 ) X-Spam-Score: -5.7 (-----) Cc: Joel Fernandes , Linux OMAP List , Rajendra Nayak , Linux Kernel Mailing List , Linux ARM Kernel List X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Inorder to move non-DM timer specific code that modifies the "idlect" mask on OMAP1, from dmtimer code, to OMAP1 specific timer initialization code, we introduce a new function that can possibly be reused for other purposes in the future. The function just checks if a timer is running based on the timer ID which should be same as pdev->id. This allows us to cleanly separate the timer vs non-timer bits and keep the timer bits in the dmtimer code. Signed-off-by: Joel Fernandes --- arch/arm/plat-omap/dmtimer.c | 29 +++++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/dmtimer.h | 2 ++ 2 files changed, 31 insertions(+) diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 4debb3d..86b2641 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -187,6 +187,35 @@ int omap_dm_timer_reserve_systimer(int id) return 0; } +/* + * Check if a timer is running based on timer_id, used for OMAP1 currently. + */ +int omap_dm_timer_is_running(int timer_id) +{ + int i = 1, ret = 0; + struct omap_dm_timer *timer = NULL; + unsigned long flags; + + spin_lock_irqsave(&dm_timer_lock, flags); + list_for_each_entry(timer, &omap_timer_list, node) { + if (i == timer_id) { + u32 l; + l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG); + if (l & OMAP_TIMER_CTRL_ST) { + ret = 1; + goto done; + } else { + goto done; + } + } + i++; + } +done: + spin_unlock_irqrestore(&dm_timer_lock, flags); + return ret; +} +EXPORT_SYMBOL_GPL(omap_dm_timer_is_running); + static struct omap_dm_timer *_omap_dm_timer_request(int req_type, void *data) { struct omap_dm_timer *timer = NULL, *t; diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h index 2861b15..41df0a6 100644 --- a/arch/arm/plat-omap/include/plat/dmtimer.h +++ b/arch/arm/plat-omap/include/plat/dmtimer.h @@ -135,6 +135,8 @@ void omap_dm_timer_disable(struct omap_dm_timer *timer); int omap_dm_timer_get_irq(struct omap_dm_timer *timer); +int omap_dm_timer_is_running(int timer_id); + u32 omap_dm_timer_modify_idlect_mask(u32 inputmask); struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer);