diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-02 04:00:03 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-02 04:00:03 -0800 |
| commit | 063de8de6b591e4eadcb402f80d42767a97f549c (patch) | |
| tree | 92f6cd20e87f12e73afc44d9dff9527658c46e19 | |
| parent | 154a46eb53125b1831a5edea9dd5ba480fb23a40 (diff) | |
| parent | fc4171dde4fd08be1d4dfc6c576773243e4b3307 (diff) | |
Merge "spmi: pmic-arb: do not ack and clear peripheral interrupts in cleanup_irq"
| -rw-r--r-- | drivers/spmi/spmi-pmic-arb.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index 6c8154d126b2..a5bfeab596ac 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -533,18 +533,6 @@ static void cleanup_irq(struct spmi_pmic_arb *pa, u16 apid, int id) "cleanup_irq apid=%d sid=0x%x per=0x%x irq=%d\n", apid, sid, per, id); writel_relaxed(irq_mask, pa->intr + pa->ver_ops->irq_clear(apid)); - - if (pmic_arb_write_cmd(pa->spmic, SPMI_CMD_EXT_WRITEL, sid, - (per << 8) + QPNPINT_REG_LATCHED_CLR, &irq_mask, 1)) - dev_err_ratelimited(&pa->spmic->dev, - "failed to ack irq_mask = 0x%x for ppid = %x\n", - irq_mask, ppid); - - if (pmic_arb_write_cmd(pa->spmic, SPMI_CMD_EXT_WRITEL, sid, - (per << 8) + QPNPINT_REG_EN_CLR, &irq_mask, 1)) - dev_err_ratelimited(&pa->spmic->dev, - "failed to ack irq_mask = 0x%x for ppid = %x\n", - irq_mask, ppid); } static void periph_interrupt(struct spmi_pmic_arb *pa, u16 apid, bool show) @@ -721,6 +709,17 @@ static struct irq_chip pmic_arb_irqchip = { | IRQCHIP_SKIP_SET_WAKE, }; +static void qpnpint_irq_domain_activate(struct irq_domain *domain, + struct irq_data *d) +{ + u8 irq = HWIRQ_IRQ(d->hwirq); + u8 buf; + + buf = BIT(irq); + qpnpint_spmi_write(d, QPNPINT_REG_EN_CLR, &buf, 1); + qpnpint_spmi_write(d, QPNPINT_REG_LATCHED_CLR, &buf, 1); +} + static int qpnpint_irq_domain_dt_translate(struct irq_domain *d, struct device_node *controller, const u32 *intspec, @@ -1186,6 +1185,7 @@ static const struct pmic_arb_ver_ops pmic_arb_v5 = { static const struct irq_domain_ops pmic_arb_irq_domain_ops = { .map = qpnpint_irq_domain_map, .xlate = qpnpint_irq_domain_dt_translate, + .activate = qpnpint_irq_domain_activate, }; static void spmi_pmic_arb_resume(void) |