From patchwork Tue Feb 28 21:46:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 6981 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5044A23E4A for ; Tue, 28 Feb 2012 21:46:20 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 123B1A18025 for ; Tue, 28 Feb 2012 21:46:19 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so2021488iag.11 for ; Tue, 28 Feb 2012 13:46:19 -0800 (PST) Received: from mr.google.com ([10.50.95.230]) by 10.50.95.230 with SMTP id dn6mr4111683igb.0.1330465579912 (num_hops = 1); Tue, 28 Feb 2012 13:46:19 -0800 (PST) Received: by 10.50.95.230 with SMTP id dn6mr3342978igb.0.1330465579865; Tue, 28 Feb 2012 13:46:19 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.11.10 with SMTP id r10csp17716ibr; Tue, 28 Feb 2012 13:46:19 -0800 (PST) Received: by 10.216.133.93 with SMTP id p71mr5503286wei.10.1330465578733; Tue, 28 Feb 2012 13:46:18 -0800 (PST) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id y6si5702983wix.16.2012.02.28.13.46.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Feb 2012 13:46:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mail-ww0-f50.google.com designates 74.125.82.50 as permitted sender) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of mail-ww0-f50.google.com designates 74.125.82.50 as permitted sender) smtp.mail= Received: by wgbds12 with SMTP id ds12so2335423wgb.31 for ; Tue, 28 Feb 2012 13:46:18 -0800 (PST) Received-SPF: pass (google.com: domain of designates 10.180.107.6 as permitted sender) client-ip=10.180.107.6; Received: from mr.google.com ([10.180.107.6]) by 10.180.107.6 with SMTP id gy6mr24910343wib.16.1330465578192 (num_hops = 1); Tue, 28 Feb 2012 13:46:18 -0800 (PST) MIME-Version: 1.0 Received: by 10.180.107.6 with SMTP id gy6mr19672764wib.16.1330465578132; Tue, 28 Feb 2012 13:46:18 -0800 (PST) Received: from localhost.localdomain (AToulouse-159-1-63-219.w92-134.abo.wanadoo.fr. [92.134.214.219]) by mx.google.com with ESMTPS id dw7sm31483074wib.4.2012.02.28.13.46.16 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Feb 2012 13:46:17 -0800 (PST) From: daniel.lezcano@linaro.org To: sameo@linux.intel.com Cc: linus.walleij@stericsson.com, linux-arm-kernel@lists.infradead.org, rickard.andersson@stericsson.com, patches@linaro.org, linaro-dev@lists.linaro.org Subject: [PATCH 4/5] mfd : ux500 - check the prcmu has pending irq Date: Tue, 28 Feb 2012 22:46:08 +0100 Message-Id: <1330465569-567-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1330465569-567-1-git-send-email-daniel.lezcano@linaro.org> References: <1330465569-567-1-git-send-email-daniel.lezcano@linaro.org> X-Gm-Message-State: ALoCoQnCWyg0/xCwPtEX4+/OTkZX6OBzUWnNlDx4ePKQD92fk+lMGns8Q1i+jPYVY6meOMt0cfgv From: Daniel Lezcano This patch allows to check if there are some pending irqs on the prcmu. Signed-off-by: Daniel Lezcano --- drivers/mfd/db8500-prcmu.c | 20 ++++++++++++++++++++ include/linux/mfd/db8500-prcmu.h | 1 + include/linux/mfd/dbx500-prcmu.h | 8 ++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index 97341aa..4e27db8 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -884,6 +884,26 @@ bool db8500_prcmu_gic_pending_irq(void) } /* + * This function checks if there are pending interrupt on the + * prcmu which has been delegated to monitor the irqs with the + * db8500_prcmu_copy_gic_settings function. + */ +bool db8500_prcmu_pending_irq(void) +{ + u32 it, im; + int i; + + for (i = 0; i < PRCMU_GIC_NUMBER_REGS - 1; i++) { + it = readl(PRCM_ARMITVAL31TO0 + i * 4); + im = readl(PRCM_ARMITMSK31TO0 + i * 4); + if (it & im) + return true; /* There is a pending interrupt */ + } + + return false; +} + +/* * This function copies the gic SPI settings to the prcmu in order to * monitor them and abort/finish the retention/off sequence or state. */ diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h index a591585..926bdb3 100644 --- a/include/linux/mfd/db8500-prcmu.h +++ b/include/linux/mfd/db8500-prcmu.h @@ -584,6 +584,7 @@ int db8500_prcmu_gic_decouple(void); int db8500_prcmu_gic_recouple(void); int db8500_prcmu_copy_gic_settings(void); bool db8500_prcmu_gic_pending_irq(void); +bool db8500_prcmu_pending_irq(void); void db8500_prcmu_enable_wakeups(u32 wakeups); int db8500_prcmu_set_epod(u16 epod_id, u8 epod_state); int db8500_prcmu_request_clock(u8 clock, bool enable); diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h index f8429ca..5c72c07 100644 --- a/include/linux/mfd/dbx500-prcmu.h +++ b/include/linux/mfd/dbx500-prcmu.h @@ -313,6 +313,14 @@ static inline int prcmu_copy_gic_settings(void) return db8500_prcmu_copy_gic_settings(); } +static inline bool prcmu_pending_irq(void) +{ + if (cpu_is_u5500()) + return -EINVAL; + else + return db8500_prcmu_pending_irq(); +} + static inline int prcmu_set_epod(u16 epod_id, u8 epod_state) { if (cpu_is_u5500())