From patchwork Mon Mar 1 10:53:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 46535 Return-Path: <3xJyLSwAACTglnW-fchoraiiafYaliojm.Wig@groups.bounces.google.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-yw0-f148.google.com (mail-yw0-f148.google.com [209.85.211.148]) by ozlabs.org (Postfix) with ESMTP id 47C7EB7D01 for ; Mon, 1 Mar 2010 21:53:58 +1100 (EST) Received: by ywh12 with SMTP id 12sf4242719ywh.11 for ; Mon, 01 Mar 2010 02:53:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:x-beenthere:received:received:received :received:received-spf:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version:to :x-sa-exim-connect-ip:x-sa-exim-mail-from:x-sa-exim-scanned :x-ptx-original-recipient:x-original-authentication-results :x-original-sender:reply-to:precedence:mailing-list:list-id :list-post:list-help:list-archive:x-thread-url:x-message-url:sender :list-subscribe:list-unsubscribe:content-type :content-transfer-encoding; bh=RB22vq1s9ZSI8d7Vjj32OkZFKaI8aihKQEhi66Icstg=; b=b3bGp4Vx4SZDTBvKRKVOOeLj6LjI7eAl3aZhvQiyQEGAoDyBux/6abmfANRvQPNJm8 Xg7k9K46SGBuliVa77HKlDDPfDQN4+PYg1ebdWdEYbhXVNFpOGa8dit7wzT0UntCVznA ubVSasZ0/bL6bwpEuTFhFoNZPomf3EmsnkgTQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references:mime-version:x-sa-exim-connect-ip :x-sa-exim-mail-from:x-sa-exim-scanned:x-ptx-original-recipient :x-original-authentication-results:x-original-sender:reply-to :precedence:mailing-list:list-id:list-post:list-help:list-archive :x-thread-url:x-message-url:sender:list-subscribe:list-unsubscribe :content-type:content-transfer-encoding; b=ViVxmY6X0XNDLijZElCPxTaZOeNuc1hZRjkH3/NDeAUBM7bWVr1xX/96oz7jjrSCFm YAiQVgohnTZmKr4N+ior31v3k728O3awovsLHQ5in4aQ1idIzACpnu3oOcMqbVT1Xo8L aBBVMSlrZGk0UUimyb4YxAEynPj7Lv0TEuqdE= Received: by 10.91.91.20 with SMTP id t20mr552235agl.2.1267440836201; Mon, 01 Mar 2010 02:53:56 -0800 (PST) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.87.42.37 with SMTP id u37ls765291fgj.1.p; Mon, 01 Mar 2010 02:53:55 -0800 (PST) Received: by 10.87.16.31 with SMTP id t31mr143175fgi.23.1267440835160; Mon, 01 Mar 2010 02:53:55 -0800 (PST) Received: by 10.87.16.31 with SMTP id t31mr143174fgi.23.1267440835142; Mon, 01 Mar 2010 02:53:55 -0800 (PST) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gmr-mx.google.com with ESMTP id 12si398723fxm.12.2010.03.01.02.53.55; Mon, 01 Mar 2010 02:53:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of ukl@pengutronix.de designates 92.198.50.35 as permitted sender) client-ip=92.198.50.35; Received: from octopus.hi.pengutronix.de ([2001:6f8:1178:2:215:17ff:fe12:23b0]) by metis.ext.pengutronix.de with esmtp (Exim 4.69) (envelope-from ) id 1Nm3G6-0005Gf-Cm; Mon, 01 Mar 2010 11:53:54 +0100 Received: from ukl by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1Nm3G6-0004gh-9M; Mon, 01 Mar 2010 11:53:54 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com Cc: Alessandro Zummo , Paul Gortmaker , Andrew Morton , Valentin Longchamp , Sascha Hauer , Samuel Ortiz Subject: [rtc-linux] [PATCH 4/6] mfd/mc13783: new function reading irq mask and status register Date: Mon, 1 Mar 2010 11:53:43 +0100 Message-Id: <1267440825-14694-4-git-send-email-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1267440825-14694-1-git-send-email-u.kleine-koenig@pengutronix.de> References: <1267440825-14694-1-git-send-email-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 To: linux-kernel@vger.kernel.org X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: rtc-linux@googlegroups.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of ukl@pengutronix.de designates 92.198.50.35 as permitted sender) smtp.mail=ukl@pengutronix.de X-Original-Sender: u.kleine-koenig@pengutronix.de Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: X-Thread-Url: http://groups.google.com/group/rtc-linux/t/27422cec32a1b315 X-Message-Url: http://groups.google.com/group/rtc-linux/msg/56d50baf04bf8fef Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , The driver for the mc13783 rtc needs to know if the TODA irq is pending. Instead of tracking in the rtc driver if the irq is enabled provide that information, too. Signed-off-by: Uwe Kleine-König --- drivers/mfd/mc13783-core.c | 35 +++++++++++++++++++++++++++++++++++ include/linux/mfd/mc13783.h | 2 ++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/drivers/mfd/mc13783-core.c b/drivers/mfd/mc13783-core.c index f89d12d..2a5334a 100644 --- a/drivers/mfd/mc13783-core.c +++ b/drivers/mfd/mc13783-core.c @@ -269,6 +269,41 @@ int mc13783_irq_unmask(struct mc13783 *mc13783, int irq) } EXPORT_SYMBOL(mc13783_irq_unmask); +int mc13783_irq_status(struct mc13783 *mc13783, int irq, + int *enabled, int *pending) +{ + int ret; + unsigned int offmask = irq < 24 ? MC13783_IRQMASK0 : MC13783_IRQMASK1; + unsigned int offstat = irq < 24 ? MC13783_IRQSTAT0 : MC13783_IRQSTAT1; + u32 irqbit = 1 << (irq < 24 ? irq : irq - 24); + + if (irq < 0 || irq >= MC13783_NUM_IRQ) + return -EINVAL; + + if (enabled) { + u32 mask; + + ret = mc13783_reg_read(mc13783, offmask, &mask); + if (ret) + return ret; + + *enabled = mask & irqbit; + } + + if (pending) { + u32 stat; + + ret = mc13783_reg_read(mc13783, offstat, &stat); + if (ret) + return ret; + + *pending = stat & irqbit; + } + + return 0; +} +EXPORT_SYMBOL(mc13783_irq_status); + int mc13783_irq_ack(struct mc13783 *mc13783, int irq) { unsigned int offstat = irq < 24 ? MC13783_IRQSTAT0 : MC13783_IRQSTAT1; diff --git a/include/linux/mfd/mc13783.h b/include/linux/mfd/mc13783.h index 05619f0..9d1dbc9 100644 --- a/include/linux/mfd/mc13783.h +++ b/include/linux/mfd/mc13783.h @@ -29,6 +29,8 @@ int mc13783_irq_free(struct mc13783 *mc13783, int irq, void *dev); int mc13783_irq_mask(struct mc13783 *mc13783, int irq); int mc13783_irq_unmask(struct mc13783 *mc13783, int irq); +int mc13783_irq_status(struct mc13783 *mc13783, int irq, + int *enabled, int *pending); int mc13783_irq_ack(struct mc13783 *mc13783, int irq); static inline int mc13783_mask(struct mc13783 *mc13783, int irq) __deprecated;