[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1362139302-23048-1-git-send-email-linus.walleij@stericsson.com>
Date: Fri, 1 Mar 2013 13:01:42 +0100
From: Linus Walleij <linus.walleij@...ricsson.com>
To: Grant Likely <grant.likely@...retlab.ca>,
<linux-kernel@...r.kernel.org>
Cc: Anmar Oueja <anmar.oueja@...aro.org>,
Gabriel Fernandez <gabriel.fernandez@...ricsson.com>,
<stable@...r.kernel.org>, Linus Walleij <linus.walleij@...aro.org>
Subject: [PATCH] gpio: stmpe: pass DT node to irqdomain
From: Gabriel Fernandez <gabriel.fernandez@...ricsson.com>
The irq domain was implemented but the device tree
node was not transmitted to irq_domain_add_simple().
Cc: stable@...r.kernel.org
Signed-off-by: Gabriel Fernandez <gabriel.fernandez@...ricsson.com>
Signed-off-by: Linus Walleij <linus.walleij@...aro.org>
---
drivers/gpio/gpio-stmpe.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c
index 770476a..73b691c 100644
--- a/drivers/gpio/gpio-stmpe.c
+++ b/drivers/gpio/gpio-stmpe.c
@@ -309,9 +309,11 @@ static const struct irq_domain_ops stmpe_gpio_irq_simple_ops = {
static int stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio)
{
- int base = stmpe_gpio->irq_base;
+ int base = 0;
+ if (!stmpe_gpio->chip.of_node)
+ base = stmpe_gpio->irq_base;
- stmpe_gpio->domain = irq_domain_add_simple(NULL,
+ stmpe_gpio->domain = irq_domain_add_simple(stmpe_gpio->chip.of_node,
stmpe_gpio->chip.ngpio, base,
&stmpe_gpio_irq_simple_ops, stmpe_gpio);
if (!stmpe_gpio->domain) {
@@ -346,6 +348,7 @@ 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;
+ stmpe_gpio->chip.of_node = np;
stmpe_gpio->chip.base = pdata ? pdata->gpio_base : -1;
if (pdata)
--
1.7.11.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists