Commit 4a2d4e2d authored by Linus Walleij's avatar Linus Walleij
Browse files

Revert "pinctrl: qcom: spmi-gpio: make the irqchip immutable" 



This reverts commit 7542766e.

It was noted during follow-up that the approach is incorrect.

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

drivers/pinctrl/qcom/pinctrl-spmi-gpio.c

+10 −12
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ struct pmic_gpio_state { 
	struct regmap	*map;

	struct pinctrl_dev *ctrl;

	struct gpio_chip chip;

	struct irq_chip irq;

	u8 usid;

	u8 pid_base;

};
@@ -987,17 +988,6 @@ static void *pmic_gpio_populate_parent_fwspec(struct gpio_chip *chip, 
	return fwspec;

}



static const struct irq_chip spmi_gpio_irq_chip = {

	.name		= "spmi-gpio",

	.irq_ack	= irq_chip_ack_parent,

	.irq_mask	= irq_chip_mask_parent,

	.irq_unmask	= irq_chip_unmask_parent,

	.irq_set_type	= irq_chip_set_type_parent,

	.irq_set_wake	= irq_chip_set_wake_parent,

	.flags		= IRQCHIP_IMMUTABLE | IRQCHIP_MASK_ON_SUSPEND,

	GPIOCHIP_IRQ_RESOURCE_HELPERS,

};



static int pmic_gpio_probe(struct platform_device *pdev)

{

	struct irq_domain *parent_domain;
@@ -1091,8 +1081,16 @@ static int pmic_gpio_probe(struct platform_device *pdev) 
	if (!parent_domain)

		return -ENXIO;



	state->irq.name = "spmi-gpio",

	state->irq.irq_ack = irq_chip_ack_parent,

	state->irq.irq_mask = irq_chip_mask_parent,

	state->irq.irq_unmask = irq_chip_unmask_parent,

	state->irq.irq_set_type = irq_chip_set_type_parent,

	state->irq.irq_set_wake = irq_chip_set_wake_parent,

	state->irq.flags = IRQCHIP_MASK_ON_SUSPEND,



	girq = &state->chip.irq;

	gpio_irq_chip_set_chip(girq, &spmi_gpio_irq_chip);

	girq->chip = &state->irq;

	girq->default_type = IRQ_TYPE_NONE;

	girq->handler = handle_level_irq;

	girq->fwnode = of_node_to_fwnode(state->dev->of_node);