diff options
| author | Alexandre Belloni <[email protected]> | 2016-01-11 20:19:40 +0100 |
|---|---|---|
| committer | Alexandre Belloni <[email protected]> | 2016-01-11 20:19:40 +0100 |
| commit | c60faa3afad0e926e63a39894489b64e9a8165df (patch) | |
| tree | d170dd472ae265d0572daadb5669d7b3bb514e64 /drivers/mfd/sec-irq.c | |
| parent | afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc (diff) | |
| parent | a65e5efa7c5faa8c320fe56cc351d47fcd006749 (diff) | |
Merge tag 'ib-mfd-regulator-rtc-v4.5' into rtc-next
Immutable branch between MFD, Regulator and RTC for the v4.5 merge window
Diffstat (limited to 'drivers/mfd/sec-irq.c')
| -rw-r--r-- | drivers/mfd/sec-irq.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c index 806fa8dbb22d..d77de431cc50 100644 --- a/drivers/mfd/sec-irq.c +++ b/drivers/mfd/sec-irq.c @@ -407,6 +407,11 @@ static const struct regmap_irq_chip s2mps14_irq_chip = { S2MPS1X_IRQ_CHIP_COMMON_DATA, }; +static const struct regmap_irq_chip s2mps15_irq_chip = { + .name = "s2mps15", + S2MPS1X_IRQ_CHIP_COMMON_DATA, +}; + static const struct regmap_irq_chip s2mpu02_irq_chip = { .name = "s2mpu02", .irqs = s2mpu02_irqs, @@ -466,6 +471,9 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) case S2MPS14X: sec_irq_chip = &s2mps14_irq_chip; break; + case S2MPS15X: + sec_irq_chip = &s2mps15_irq_chip; + break; case S2MPU02: sec_irq_chip = &s2mpu02_irq_chip; break; |