From: Jacob Pan <jacob.jun.pan@linux.intel.com>
To: LKML <linux-kernel@vger.kernel.org>,
IIO <linux-iio@vger.kernel.org>,
Jonathan Cameron <jic23@kernel.org>,
Lee Jones <lee.jones@linaro.org>
Cc: Carlo Caione <carlo@caione.org>,
Samuel Ortiz <sameo@linux.intel.com>,
Ramakrishna Pallala <ramakrishna.pallala@intel.com>,
Todd Brandt <todd.e.brandt@linux.intel.com>,
Peter Meerwald <pmeerw@pmeerw.net>,
Rafael Wysocki <rafael.j.wysocki@intel.com>,
Hartmut Knaack <knaack.h@gmx.de>,
Jacob Pan <jacob.jun.pan@linux.intel.com>
Subject: [PATCH 2/3] mfd/axp20x: avoid irq numbering collision
Date: Tue, 11 Nov 2014 11:30:09 -0800 [thread overview]
Message-ID: <1415734210-5657-3-git-send-email-jacob.jun.pan@linux.intel.com> (raw)
In-Reply-To: <1415734210-5657-1-git-send-email-jacob.jun.pan@linux.intel.com>
IRQ numbers in axp20x devices are defined with high-order bit first
in each IRQ enable/status registers. On Intel platforms it is more
common to number IRQs with least significant bit first. Therefore,
sharing IRQ# between the two is very difficult. Since AXP288 is a
customized PMIC for Intel platform and the amount of shared IRQs are
very small, we use separate IRQ numbering. This also fixes collision
and a duplicate in WBTO interrupt.
e.g. For the 16 interrupts controlled in IRQ enabled registers 1 & 2,
on axp20x for ARM, the PMIC local IRQ numbers and register bits are
mapped as:
IRQ#: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
---------------------------------------------------------
ARM: 7 6 5 4 3 2 1 0 7 6 5 4 3 2 1 0
Intel: 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7
Signed-off-by: Todd Brandt <todd.e.brandt@linux.intel.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
drivers/mfd/axp20x.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index daf3c8d..0a8fcd9 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -183,21 +183,21 @@ static const struct regmap_irq axp20x_regmap_irqs[] = {
/* some IRQs are compatible with axp20x models */
static const struct regmap_irq axp288_regmap_irqs[] = {
- INIT_REGMAP_IRQ(AXP20X, VBUS_REMOVAL, 0, 2),
- INIT_REGMAP_IRQ(AXP20X, VBUS_PLUGIN, 0, 3),
- INIT_REGMAP_IRQ(AXP20X, VBUS_OVER_V, 0, 4),
+ INIT_REGMAP_IRQ(AXP288, VBUS_FALL, 0, 2),
+ INIT_REGMAP_IRQ(AXP288, VBUS_RISE, 0, 3),
+ INIT_REGMAP_IRQ(AXP288, OV, 0, 4),
- INIT_REGMAP_IRQ(AXP20X, CHARG_DONE, 1, 2),
- INIT_REGMAP_IRQ(AXP20X, CHARG, 1, 3),
+ INIT_REGMAP_IRQ(AXP288, DONE, 1, 2),
+ INIT_REGMAP_IRQ(AXP288, CHARGING, 1, 3),
INIT_REGMAP_IRQ(AXP288, SAFE_QUIT, 1, 4),
INIT_REGMAP_IRQ(AXP288, SAFE_ENTER, 1, 5),
- INIT_REGMAP_IRQ(AXP20X, BATT_REMOVAL, 1, 6),
- INIT_REGMAP_IRQ(AXP20X, BATT_PLUGIN, 1, 7),
+ INIT_REGMAP_IRQ(AXP288, ABSENT, 1, 6),
+ INIT_REGMAP_IRQ(AXP288, APPEND, 1, 7),
INIT_REGMAP_IRQ(AXP288, QWBTU, 2, 0),
INIT_REGMAP_IRQ(AXP288, WBTU, 2, 1),
INIT_REGMAP_IRQ(AXP288, QWBTO, 2, 2),
- INIT_REGMAP_IRQ(AXP288, WBTU, 2, 3),
+ INIT_REGMAP_IRQ(AXP288, WBTO, 2, 3),
INIT_REGMAP_IRQ(AXP288, QCBTU, 2, 4),
INIT_REGMAP_IRQ(AXP288, CBTU, 2, 5),
INIT_REGMAP_IRQ(AXP288, QCBTO, 2, 6),
@@ -215,7 +215,7 @@ static const struct regmap_irq axp288_regmap_irqs[] = {
INIT_REGMAP_IRQ(AXP288, POKS, 4, 4),
INIT_REGMAP_IRQ(AXP288, POKN, 4, 5),
INIT_REGMAP_IRQ(AXP288, POKP, 4, 6),
- INIT_REGMAP_IRQ(AXP20X, TIMER, 4, 7),
+ INIT_REGMAP_IRQ(AXP288, TIMER, 4, 7),
INIT_REGMAP_IRQ(AXP288, MV_CHNG, 5, 0),
INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG, 5, 1),
--
1.9.1
next prev parent reply other threads:[~2014-11-11 19:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-11 19:30 [PATCH 0/3] axp20x minor fixes Jacob Pan
2014-11-11 19:30 ` [PATCH 1/3] iio: adc: Add module device table for autoloading Jacob Pan
2014-11-15 16:00 ` Jonathan Cameron
2014-11-18 15:26 ` Lee Jones
2014-11-11 19:30 ` Jacob Pan [this message]
2014-11-18 15:24 ` [PATCH 2/3] mfd/axp20x: avoid irq numbering collision Lee Jones
2014-11-11 19:30 ` [PATCH 3/3] iio/axp288_adc: remove THIS_MODULE owner Jacob Pan
2014-11-15 16:00 ` Jonathan Cameron
2014-11-18 15:25 ` Lee Jones
2014-11-18 15:49 ` [GIT PULL] Immutable branch between MFD and IIO (second tag) Lee Jones
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=1415734210-5657-3-git-send-email-jacob.jun.pan@linux.intel.com \
--to=jacob.jun.pan@linux.intel.com \
--cc=carlo@caione.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lee.jones@linaro.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
--cc=rafael.j.wysocki@intel.com \
--cc=ramakrishna.pallala@intel.com \
--cc=sameo@linux.intel.com \
--cc=todd.e.brandt@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).