Skip to content

Commit

Permalink
spmi: pmic-arb: revert "validate type when mapping IRQ"
Browse files Browse the repository at this point in the history
Validation of the IRQ type was added to spmi pmic-arb, however spmi-mpp
in device tree still uses IRQ_TYPE_NONE. This commit caused the
spmi-mpp probe to fail since platform_irq_count() would return 0.
Correct this by backing out the previous patch.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Fixes: 135ef21 ("spmi: pmic-arb: validate type when mapping IRQ")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Brian Masney authored and Linus Walleij committed Feb 9, 2019
1 parent 5d643ed commit 25655c7
Showing 1 changed file with 7 additions and 14 deletions.
21 changes: 7 additions & 14 deletions drivers/spmi/spmi-pmic-arb.c
Original file line number Diff line number Diff line change
Expand Up @@ -740,9 +740,9 @@ static int qpnpint_irq_domain_translate(struct irq_domain *d,
}


static int qpnpint_irq_domain_map(struct spmi_pmic_arb *pmic_arb,
struct irq_domain *domain, unsigned int virq,
irq_hw_number_t hwirq, unsigned int type)
static void qpnpint_irq_domain_map(struct spmi_pmic_arb *pmic_arb,
struct irq_domain *domain, unsigned int virq,
irq_hw_number_t hwirq, unsigned int type)
{
irq_flow_handler_t handler;

Expand All @@ -751,15 +751,11 @@ static int qpnpint_irq_domain_map(struct spmi_pmic_arb *pmic_arb,

if (type & IRQ_TYPE_EDGE_BOTH)
handler = handle_edge_irq;
else if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
handler = handle_level_irq;
else
return -EINVAL;
handler = handle_level_irq;

irq_domain_set_info(domain, virq, hwirq, &pmic_arb_irqchip, pmic_arb,
handler, NULL, NULL);

return 0;
}

static int qpnpint_irq_domain_alloc(struct irq_domain *domain,
Expand All @@ -776,12 +772,9 @@ static int qpnpint_irq_domain_alloc(struct irq_domain *domain,
if (ret)
return ret;

for (i = 0; i < nr_irqs; i++) {
ret = qpnpint_irq_domain_map(pmic_arb, domain, virq + i,
hwirq + i, type);
if (ret)
return ret;
}
for (i = 0; i < nr_irqs; i++)
qpnpint_irq_domain_map(pmic_arb, domain, virq + i, hwirq + i,
type);

return 0;
}
Expand Down

0 comments on commit 25655c7

Please sign in to comment.