Commit 7542766e authored by Robert Marko's avatar Robert Marko Committed by Linus Walleij

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

Commit 6c846d02 ("gpio: Don't fiddle with irqchips marked as
immutable") added a warning to indicate if the gpiolib is altering the
internals of irqchips.

Following this change the following warning is now observed for the SPMI
PMIC pinctrl driver:
gpio gpiochip1: (200f000.spmi:pmic@0:gpio@c000): not an immutable chip, please consider fixing it!

Fix this by making the irqchip in the SPMI PMIC pinctrl driver immutable.
Signed-off-by: default avatarRobert Marko <robimarko@gmail.com>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Tested-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20220624195112.894916-1-robimarko@gmail.comSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent d4c0b614
...@@ -171,7 +171,6 @@ struct pmic_gpio_state { ...@@ -171,7 +171,6 @@ struct pmic_gpio_state {
struct regmap *map; struct regmap *map;
struct pinctrl_dev *ctrl; struct pinctrl_dev *ctrl;
struct gpio_chip chip; struct gpio_chip chip;
struct irq_chip irq;
u8 usid; u8 usid;
u8 pid_base; u8 pid_base;
}; };
...@@ -988,6 +987,17 @@ static void *pmic_gpio_populate_parent_fwspec(struct gpio_chip *chip, ...@@ -988,6 +987,17 @@ static void *pmic_gpio_populate_parent_fwspec(struct gpio_chip *chip,
return fwspec; 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) static int pmic_gpio_probe(struct platform_device *pdev)
{ {
struct irq_domain *parent_domain; struct irq_domain *parent_domain;
...@@ -1081,16 +1091,8 @@ static int pmic_gpio_probe(struct platform_device *pdev) ...@@ -1081,16 +1091,8 @@ static int pmic_gpio_probe(struct platform_device *pdev)
if (!parent_domain) if (!parent_domain)
return -ENXIO; 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; girq = &state->chip.irq;
girq->chip = &state->irq; gpio_irq_chip_set_chip(girq, &spmi_gpio_irq_chip);
girq->default_type = IRQ_TYPE_NONE; girq->default_type = IRQ_TYPE_NONE;
girq->handler = handle_level_irq; girq->handler = handle_level_irq;
girq->fwnode = of_node_to_fwnode(state->dev->of_node); girq->fwnode = of_node_to_fwnode(state->dev->of_node);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment