Commit 171865da authored by Nobuhiro Iwamatsu's avatar Nobuhiro Iwamatsu Committed by Bartosz Golaszewski
Browse files

gpio: visconti: Fix fwnode of GPIO IRQ 



The fwnode of GPIO IRQ must be set to its own fwnode, not the fwnode of the
parent IRQ. Therefore, this sets own fwnode instead of the parent IRQ fwnode to
GPIO IRQ's.

Fixes: 2ad74f40 ("gpio: visconti: Add Toshiba Visconti GPIO support")
Signed-off-by: default avatarNobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent 2d3535ed

drivers/gpio/gpio-visconti.c

+2 −5
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ static int visconti_gpio_probe(struct platform_device *pdev) 
	struct gpio_irq_chip *girq;

	struct irq_domain *parent;

	struct device_node *irq_parent;

	struct fwnode_handle *fwnode;

	int ret;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -150,14 +149,12 @@ static int visconti_gpio_probe(struct platform_device *pdev) 
	}



	parent = irq_find_host(irq_parent);

	of_node_put(irq_parent);

	if (!parent) {

		dev_err(dev, "No IRQ parent domain\n");

		return -ENODEV;

	}



	fwnode = of_node_to_fwnode(irq_parent);

	of_node_put(irq_parent);



	ret = bgpio_init(&priv->gpio_chip, dev, 4,

			 priv->base + GPIO_IDATA,

			 priv->base + GPIO_OSET,
@@ -180,7 +177,7 @@ static int visconti_gpio_probe(struct platform_device *pdev) 


	girq = &priv->gpio_chip.irq;

	girq->chip = irq_chip;

	girq->fwnode = fwnode;

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

	girq->parent_domain = parent;

	girq->child_to_parent_hwirq = visconti_gpio_child_to_parent_hwirq;

	girq->populate_parent_alloc_arg = visconti_gpio_populate_parent_fwspec;