Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9afd9b70 authored by Gabriel Fernandez's avatar Gabriel Fernandez Committed by Linus Walleij
Browse files

gpio: stmpe: pass DT node to irqdomain 



The irq domain was implemented but the device tree
node was not transmitted to irq_domain_add_simple().

Cc: stable@vger.kernel.org
Signed-off-by: default avatarGabriel Fernandez <gabriel.fernandez@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2ab3a749

drivers/gpio/gpio-stmpe.c

+11 −4
Original line number Diff line number Diff line
@@ -307,11 +307,15 @@ static const struct irq_domain_ops stmpe_gpio_irq_simple_ops = { 
	.xlate = irq_domain_xlate_twocell,

};



static int stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio)

static int stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio,

		struct device_node *np)

{

	int base = stmpe_gpio->irq_base;

	int base = 0;



	stmpe_gpio->domain = irq_domain_add_simple(NULL,

	if (!np)

		base = stmpe_gpio->irq_base;



	stmpe_gpio->domain = irq_domain_add_simple(np,

				stmpe_gpio->chip.ngpio, base,

				&stmpe_gpio_irq_simple_ops, stmpe_gpio);

	if (!stmpe_gpio->domain) {
@@ -346,6 +350,9 @@ static int stmpe_gpio_probe(struct platform_device *pdev) 
	stmpe_gpio->chip = template_chip;

	stmpe_gpio->chip.ngpio = stmpe->num_gpios;

	stmpe_gpio->chip.dev = &pdev->dev;

#ifdef CONFIG_OF

	stmpe_gpio->chip.of_node = np;

#endif

	stmpe_gpio->chip.base = pdata ? pdata->gpio_base : -1;



	if (pdata)
@@ -366,7 +373,7 @@ static int stmpe_gpio_probe(struct platform_device *pdev) 
		goto out_free;



	if (irq >= 0) {

		ret = stmpe_gpio_irq_init(stmpe_gpio);

		ret = stmpe_gpio_irq_init(stmpe_gpio, np);

		if (ret)

			goto out_disable;