summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl-starfive.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2022-03-14 10:23:22 +0100
committerThomas Gleixner <tglx@linutronix.de>2022-03-14 10:23:22 +0100
commitf0fae8a0edd445d042ee94153f127e8939fcf3d3 (patch)
treee0fda9e211750c5ecc1838403bb2bb2fa59a9ed8 /drivers/pinctrl/pinctrl-starfive.c
parentff8dcfebe08dfb2524041116d4afce53ffe0b015 (diff)
parentde26a7424331493311c08625a700cf45d1eaf151 (diff)
downloadlinux-f0fae8a0edd445d042ee94153f127e8939fcf3d3.tar.bz2
Merge tag 'irqchip-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull irqchip updates from Marc Zyngier: - Add support for the STM32MP13 variant - Move parent device away from struct irq_chip - Remove all instances of non-const strings assigned to struct irq_chip::name, enabling a nice cleanup for VIC and GIC) - Simplify the Qualcomm PDC driver - A bunch of SiFive PLIC cleanups - Add support for a new variant of the Meson GPIO block - Add support for the irqchip side of the Apple M1 PMU - Add support for the Apple M1 Pro/Max AICv2 irqchip - Add support for the Qualcomm MPM wakeup gadget - Move the Xilinx driver over to the generic irqdomain handling - Tiny speedup for IPIs on GICv3 systems - The usual odd cleanups Link: https://lore.kernel.org/all/20220313105142.704579-1-maz@kernel.org
Diffstat (limited to 'drivers/pinctrl/pinctrl-starfive.c')
-rw-r--r--drivers/pinctrl/pinctrl-starfive.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-starfive.c b/drivers/pinctrl/pinctrl-starfive.c
index 0b912152a405..5be9866c2b3c 100644
--- a/drivers/pinctrl/pinctrl-starfive.c
+++ b/drivers/pinctrl/pinctrl-starfive.c
@@ -1307,7 +1307,6 @@ static int starfive_probe(struct platform_device *pdev)
sfp->gc.base = -1;
sfp->gc.ngpio = NR_GPIOS;
- starfive_irq_chip.parent_device = dev;
starfive_irq_chip.name = sfp->gc.label;
sfp->gc.irq.chip = &starfive_irq_chip;
@@ -1330,6 +1329,8 @@ static int starfive_probe(struct platform_device *pdev)
if (ret)
return dev_err_probe(dev, ret, "could not register gpiochip\n");
+ irq_domain_set_pm_device(sfp->gc.irq.domain, dev);
+
out_pinctrl_enable:
return pinctrl_enable(sfp->pctl);
}