From: Grant Likely <grant.likely@secretlab.ca>
To: Linus Walleij <linus.walleij@stericsson.com>,
linux-kernel@vger.kernel.org
Cc: Anmar Oueja <anmar.oueja@linaro.org>,
Gabriel Fernandez <gabriel.fernandez@stericsson.com>,
stable@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>
Subject: Re: [PATCH] gpio: stmpe: pass DT node to irqdomain
Date: Sat, 02 Mar 2013 09:23:09 +0000 [thread overview]
Message-ID: <20130302092309.692CD3E17F8@localhost> (raw)
In-Reply-To: <1362139302-23048-1-git-send-email-linus.walleij@stericsson.com>
On Fri, 1 Mar 2013 13:01:42 +0100, Linus Walleij <linus.walleij@stericsson.com> wrote:
> From: Gabriel Fernandez <gabriel.fernandez@stericsson.com>
>
> 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: Gabriel Fernandez <gabriel.fernandez@stericsson.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Applied, thanks.
I've got a small branch of fixes that I need to send to Linus for v3.9,
and then I'll leave the rest of the bug fixes to you.
g.
> ---
> 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
>
--
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
next prev parent reply other threads:[~2013-03-02 9:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-01 12:01 [PATCH] gpio: stmpe: pass DT node to irqdomain Linus Walleij
2013-03-02 9:23 ` Grant Likely [this message]
2013-03-04 2:23 ` Grant Likely
2013-03-04 2:34 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130302092309.692CD3E17F8@localhost \
--to=grant.likely@secretlab.ca \
--cc=anmar.oueja@linaro.org \
--cc=gabriel.fernandez@stericsson.com \
--cc=linus.walleij@linaro.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox