From: Graeme Gregory <gg@slimlogic.co.uk>
To: linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: sameo@linux.intel.com, balbi@ti.com, lrg@slimlogic.co.uk,
broonie@opensource.wolfsonmicro.com,
Graeme Gregory <gg@slimlogic.co.uk>
Subject: [PATCH 2/4] MFD: TWL6030: fix irq definitions
Date: Wed, 27 Apr 2011 10:39:49 +0100 [thread overview]
Message-ID: <1303897191-14792-3-git-send-email-gg@slimlogic.co.uk> (raw)
In-Reply-To: <1303897191-14792-1-git-send-email-gg@slimlogic.co.uk>
The charger fault IRQs from the twl will in future patches be handled
by a seperate IRQ handler in the charger driver than the general charger
IRQ. Give them different IRQ numbers now to allow the charger driver to
be merged in the future.
Signed-off-by: Graeme Gregory <gg@slimlogic.co.uk>
---
drivers/mfd/twl6030-irq.c | 4 ++--
include/linux/i2c/twl.h | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index dfbae34..eb3b5f8 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -76,8 +76,8 @@ static int twl6030_interrupt_mapping[24] = {
USBOTG_INTR_OFFSET, /* Bit 18 ID */
USB_PRES_INTR_OFFSET, /* Bit 19 VBUS */
CHARGER_INTR_OFFSET, /* Bit 20 CHRG_CTRL */
- CHARGER_INTR_OFFSET, /* Bit 21 EXT_CHRG */
- CHARGER_INTR_OFFSET, /* Bit 22 INT_CHRG */
+ CHARGERFAULT_INTR_OFFSET, /* Bit 21 EXT_CHRG */
+ CHARGERFAULT_INTR_OFFSET, /* Bit 22 INT_CHRG */
RSV_INTR_OFFSET, /* Bit 23 Reserved */
};
/*----------------------------------------------------------------------*/
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index f85f0ed..4323d3a 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -91,6 +91,7 @@
#define BCI_INTR_OFFSET 2
#define MADC_INTR_OFFSET 3
#define USB_INTR_OFFSET 4
+#define CHARGERFAULT_INTR_OFFSET 5
#define BCI_PRES_INTR_OFFSET 9
#define USB_PRES_INTR_OFFSET 10
#define RTC_INTR_OFFSET 11
--
1.7.4.1
next prev parent reply other threads:[~2011-04-27 9:49 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-27 9:39 [PATCH 0/4] Add support for twl6025 PMIC Graeme Gregory
2011-04-27 9:39 ` [PATCH 1/4] MFD: TWL6025: add phoenix lite support to twl6030 Graeme Gregory
2011-04-27 10:40 ` Felipe Balbi
2011-05-08 20:32 ` Liam Girdwood
2011-04-27 9:39 ` Graeme Gregory [this message]
2011-04-27 9:39 ` [PATCH 3/4] REGULATOR: TWL6025: add support to twl-regulator Graeme Gregory
2011-04-27 10:43 ` Felipe Balbi
2011-04-27 11:08 ` Mark Brown
2011-04-27 9:39 ` [PATCH 4/4] USB: TWL6025 allow different regulator name Graeme Gregory
2011-04-27 10:45 ` Felipe Balbi
2011-05-08 15:08 ` Liam Girdwood
2011-05-09 9:03 ` Felipe Balbi
2011-05-09 11:43 ` Liam Girdwood
2011-05-09 12:16 ` Felipe Balbi
2011-05-09 12:29 ` Mark Brown
2011-05-09 13:07 ` Felipe Balbi
2011-05-09 13:35 ` Mark Brown
2011-05-09 13:51 ` Felipe Balbi
2011-05-09 15:17 ` Mark Brown
2011-05-09 13:11 ` Liam Girdwood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1303897191-14792-3-git-send-email-gg@slimlogic.co.uk \
--to=gg@slimlogic.co.uk \
--cc=balbi@ti.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).