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

Commit 0ce242ad authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: qcom: Pass irqchip when adding gpiochip 



We need to convert all old gpio irqchips to pass the irqchip
setup along when adding the gpio_chip.

For chained irqchips this is a pretty straight-forward
conversion.

Cc: Thierry Reding <treding@nvidia.com>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Co-developed-by: default avatarLina Iyer <ilina@codeaurora.org>
Link: https://lore.kernel.org/r/20190724083828.7496-1-linus.walleij@linaro.org


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b3a2b136

drivers/pinctrl/qcom/pinctrl-msm.c

+13 −14
Original line number Diff line number Diff line
@@ -1002,6 +1002,7 @@ static bool msm_gpio_needs_valid_mask(struct msm_pinctrl *pctrl) 
static int msm_gpio_init(struct msm_pinctrl *pctrl)

{

	struct gpio_chip *chip;

	struct gpio_irq_chip *girq;

	int ret;

	unsigned ngpio = pctrl->soc->ngpios;
@@ -1027,6 +1028,18 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl) 
	pctrl->irq_chip.irq_request_resources = msm_gpio_irq_reqres;

	pctrl->irq_chip.irq_release_resources = msm_gpio_irq_relres;



	girq = &chip->irq;

	girq->chip = &pctrl->irq_chip;

	girq->parent_handler = msm_gpio_irq_handler;

	girq->num_parents = 1;

	girq->parents = devm_kcalloc(pctrl->dev, 1, sizeof(*girq->parents),

				     GFP_KERNEL);

	if (!girq->parents)

		return -ENOMEM;

	girq->default_type = IRQ_TYPE_NONE;

	girq->handler = handle_bad_irq;

	girq->parents[0] = pctrl->irq;



	ret = gpiochip_add_data(&pctrl->chip, pctrl);

	if (ret) {

		dev_err(pctrl->dev, "Failed register gpiochip\n");
@@ -1053,20 +1066,6 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl) 
		}

	}



	ret = gpiochip_irqchip_add(chip,

				   &pctrl->irq_chip,

				   0,

				   handle_edge_irq,

				   IRQ_TYPE_NONE);

	if (ret) {

		dev_err(pctrl->dev, "Failed to add irqchip to gpiochip\n");

		gpiochip_remove(&pctrl->chip);

		return -ENOSYS;

	}



	gpiochip_set_chained_irqchip(chip, &pctrl->irq_chip, pctrl->irq,

				     msm_gpio_irq_handler);



	return 0;

}