Merge branch 'fortglx/3.19-stable/time' of https://git.linaro.org/people/john.stultz...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / sec-irq.c

diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index f9a57869e3ece6f842ce7f99fd176d1cfea796b7..ba86a918c2dace19be14235f484f380a970d667e 100644 (file)
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -389,14 +389,22 @@ static const struct regmap_irq_chip s2mps11_irq_chip = {
        .ack_base = S2MPS11_REG_INT1,
 };
 
+#define S2MPS1X_IRQ_CHIP_COMMON_DATA           \
+       .irqs = s2mps14_irqs,                   \
+       .num_irqs = ARRAY_SIZE(s2mps14_irqs),   \
+       .num_regs = 3,                          \
+       .status_base = S2MPS14_REG_INT1,        \
+       .mask_base = S2MPS14_REG_INT1M,         \
+       .ack_base = S2MPS14_REG_INT1            \
+
+static const struct regmap_irq_chip s2mps13_irq_chip = {
+       .name = "s2mps13",
+       S2MPS1X_IRQ_CHIP_COMMON_DATA,
+};
+
 static const struct regmap_irq_chip s2mps14_irq_chip = {
        .name = "s2mps14",
-       .irqs = s2mps14_irqs,
-       .num_irqs = ARRAY_SIZE(s2mps14_irqs),
-       .num_regs = 3,
-       .status_base = S2MPS14_REG_INT1,
-       .mask_base = S2MPS14_REG_INT1M,
-       .ack_base = S2MPS14_REG_INT1,
+       S2MPS1X_IRQ_CHIP_COMMON_DATA,
 };
 
 static const struct regmap_irq_chip s2mpu02_irq_chip = {
@@ -452,6 +460,9 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)
        case S2MPS11X:
                sec_irq_chip = &s2mps11_irq_chip;
                break;
+       case S2MPS13X:
+               sec_irq_chip = &s2mps13_irq_chip;
+               break;
        case S2MPS14X:
                sec_irq_chip = &s2mps14_irq_chip;
                break;