Merge "spmi: pmic-arb: do not ack and clear peripheral interrupts in cleanup_irq" (69595738) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/spmi/spmi-pmic-arb.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -491,16 +491,6 @@ static void cleanup_irq(struct spmi_pmic_arb *pmic_arb, u16 apid, int id)
		dev_err_ratelimited(&pmic_arb->spmic->dev, "%s apid=%d sid=0x%x per=0x%x irq=%d\n",
		__func__, apid, sid, per, id);
		writel_relaxed(irq_mask, pmic_arb->ver_ops->irq_clear(pmic_arb, apid));

		if (pmic_arb_write_cmd(pmic_arb->spmic, SPMI_CMD_EXT_WRITEL, sid,
		(per << 8) + QPNPINT_REG_LATCHED_CLR, &irq_mask, 1))
		dev_err_ratelimited(&pmic_arb->spmic->dev, "failed to ack irq_mask = 0x%x for ppid = %x\n",
		irq_mask, ppid);

		if (pmic_arb_write_cmd(pmic_arb->spmic, SPMI_CMD_EXT_WRITEL, sid,
		(per << 8) + QPNPINT_REG_EN_CLR, &irq_mask, 1))
		dev_err_ratelimited(&pmic_arb->spmic->dev, "failed to ack irq_mask = 0x%x for ppid = %x\n",
		irq_mask, ppid);
		}

		static void periph_interrupt(struct spmi_pmic_arb *pmic_arb, u16 apid)
		@@ -667,6 +657,7 @@ static int qpnpint_irq_domain_activate(struct irq_domain *domain,
		u16 apid = hwirq_to_apid(d->hwirq);
		u16 sid = hwirq_to_sid(d->hwirq);
		u16 irq = hwirq_to_irq(d->hwirq);
		u8 buf;

		if (pmic_arb->apid_data[apid].irq_ee != pmic_arb->ee) {
		dev_err(&pmic_arb->spmic->dev, "failed to xlate sid = %#x, periph = %#x, irq = %u: ee=%u but owner=%u\n",
		@@ -675,6 +666,10 @@ static int qpnpint_irq_domain_activate(struct irq_domain *domain,
		return -ENODEV;
		}

		buf = BIT(irq);
		qpnpint_spmi_write(d, QPNPINT_REG_EN_CLR, &buf, 1);
		qpnpint_spmi_write(d, QPNPINT_REG_LATCHED_CLR, &buf, 1);

		return 0;
		}