Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ff46085 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: pinctrl: msm: fix GIC warning for IRQ_TYPE_NONE"

parents ebd3b473 6806db5d

drivers/pinctrl/qcom/pinctrl-msm.c

+6 −1
Original line number Diff line number Diff line
@@ -1028,11 +1028,12 @@ static int msm_gpio_domain_alloc(struct irq_domain *domain, unsigned int virq, 


	parent.fwspec.param_count = 2;

	parent.fwspec.param[0] = GPIO_NO_WAKE_IRQ;

	parent.fwspec.param[1] = type;

	ret = of_irq_domain_map(fwspec, &parent.fwspec);

	if (ret == -ENOMEM)

		return ret;



	/* Set something other than IRQ_TYPE_NONE to avoid GIC complaint. */

	parent.fwspec.param[1] = IRQ_TYPE_EDGE_RISING;

	parent.fwspec.fwnode = domain->parent->fwnode;



	ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, &parent);
@@ -1054,6 +1055,10 @@ static int msm_gpio_to_irq(struct gpio_chip *chip, unsigned int offset) 


	fwspec.fwnode = of_node_to_fwnode(chip->of_node);

	fwspec.param[0] = offset;

	/*

	 * Since we don't know the trigger type, let's create it with

	 * IRQ_TYPE_NONE and let the driver override it in request_irq.

	 */

	fwspec.param[1] = IRQ_TYPE_NONE;

	fwspec.param_count = 2;