mfd/axp20x: avoid irq numbering collision

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>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index b2fb7f4..9c4714e 100644 (file)
--- 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),