mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-23 20:01:47 -05:00
Merge tag 'renesas-pinctrl-for-v6.13-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
pinctrl: renesas: Updates for v6.13 (take two) - Use the gpiochip_populate_parent_fwspec_twocell() helper. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
@@ -2433,21 +2433,6 @@ static int rzg2l_gpio_child_to_parent_hwirq(struct gpio_chip *gc,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int rzg2l_gpio_populate_parent_fwspec(struct gpio_chip *chip,
|
||||
union gpio_irq_fwspec *gfwspec,
|
||||
unsigned int parent_hwirq,
|
||||
unsigned int parent_type)
|
||||
{
|
||||
struct irq_fwspec *fwspec = &gfwspec->fwspec;
|
||||
|
||||
fwspec->fwnode = chip->irq.parent_domain->fwnode;
|
||||
fwspec->param_count = 2;
|
||||
fwspec->param[0] = parent_hwirq;
|
||||
fwspec->param[1] = parent_type;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void rzg2l_gpio_irq_restore(struct rzg2l_pinctrl *pctrl)
|
||||
{
|
||||
struct irq_domain *domain = pctrl->gpio_chip.irq.domain;
|
||||
@@ -2649,7 +2634,7 @@ static int rzg2l_gpio_register(struct rzg2l_pinctrl *pctrl)
|
||||
girq->fwnode = dev_fwnode(pctrl->dev);
|
||||
girq->parent_domain = parent_domain;
|
||||
girq->child_to_parent_hwirq = rzg2l_gpio_child_to_parent_hwirq;
|
||||
girq->populate_parent_alloc_arg = rzg2l_gpio_populate_parent_fwspec;
|
||||
girq->populate_parent_alloc_arg = gpiochip_populate_parent_fwspec_twocell;
|
||||
girq->child_irq_domain_ops.free = rzg2l_gpio_irq_domain_free;
|
||||
girq->init_valid_mask = rzg2l_init_irq_valid_mask;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user