evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "spmi: pmic-arb: do not ack and clear peripheral interrupts in cleanup_irq"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-02 04:00:03 -08:00 • committed by Gerrit - the friendly Code Review server
commit 063de8de6b
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/spmi/spmi-pmic-arb.c
View file

@ -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", "cleanup_irq apid=%d sid=0x%x per=0x%x irq=%d\n",
apid, sid, per, id); apid, sid, per, id);
writel_relaxed(irq_mask, pa->intr + pa->ver_ops->irq_clear(apid)); 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) 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, | 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, static int qpnpint_irq_domain_dt_translate(struct irq_domain *d,
struct device_node *controller, struct device_node *controller,
const u32 *intspec, 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 = { static const struct irq_domain_ops pmic_arb_irq_domain_ops = {
.map = qpnpint_irq_domain_map, .map = qpnpint_irq_domain_map,
.xlate = qpnpint_irq_domain_dt_translate, .xlate = qpnpint_irq_domain_dt_translate,
.activate = qpnpint_irq_domain_activate,
}; };
static void spmi_pmic_arb_resume(void) static void spmi_pmic_arb_resume(void)