From: Zhou Yanjie <zhouyanjie@zoho.com>
To: Linus Walleij <linus.walleij@linaro.org>, linux-gpio@vger.kernel.org
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Paul Cercueil <paul@crapouillou.net>,
Thierry Reding <thierry.reding@gmail.com>
Subject: Re: [PATCH] pinctrl: ingenic: Pass irqchip when adding gpiochip
Date: Wed, 2 Oct 2019 19:49:34 +0800 [thread overview]
Message-ID: <5D948ECE.2050007@zoho.com> (raw)
In-Reply-To: <20191001133209.17164-1-linus.walleij@linaro.org>
On 2019年10月01日 21:32, Linus Walleij wrote:
> We need to convert all old gpio irqchips to pass the irqchip
> setup along when adding the gpio_chip. For more info see
> drivers/gpio/TODO.
>
> For chained irqchips this is a pretty straight-forward
> conversion.
Acked-by: Zhou Yanjie <zhouyanjie@zoho.com>
>
> Cc: Zhou Yanjie <zhouyanjie@zoho.com>
> Cc: Paul Cercueil <paul@crapouillou.net>
> Cc: Thierry Reding <thierry.reding@gmail.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> drivers/pinctrl/pinctrl-ingenic.c | 22 ++++++++++++++--------
> 1 file changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
> index 6e2683016c1f..06cae38f6daf 100644
> --- a/drivers/pinctrl/pinctrl-ingenic.c
> +++ b/drivers/pinctrl/pinctrl-ingenic.c
> @@ -1940,6 +1940,7 @@ static int __init ingenic_gpio_probe(struct ingenic_pinctrl *jzpc,
> {
> struct ingenic_gpio_chip *jzgc;
> struct device *dev = jzpc->dev;
> + struct gpio_irq_chip *girq;
> unsigned int bank;
> int err;
>
> @@ -1982,10 +1983,6 @@ static int __init ingenic_gpio_probe(struct ingenic_pinctrl *jzpc,
> jzgc->gc.free = gpiochip_generic_free;
> }
>
> - err = devm_gpiochip_add_data(dev, &jzgc->gc, jzgc);
> - if (err)
> - return err;
> -
> jzgc->irq = irq_of_parse_and_map(node, 0);
> if (!jzgc->irq)
> return -EINVAL;
> @@ -2000,13 +1997,22 @@ static int __init ingenic_gpio_probe(struct ingenic_pinctrl *jzpc,
> jzgc->irq_chip.irq_set_wake = ingenic_gpio_irq_set_wake;
> jzgc->irq_chip.flags = IRQCHIP_MASK_ON_SUSPEND;
>
> - err = gpiochip_irqchip_add(&jzgc->gc, &jzgc->irq_chip, 0,
> - handle_level_irq, IRQ_TYPE_NONE);
> + girq = &jzgc->gc.irq;
> + girq->chip = &jzgc->irq_chip;
> + girq->parent_handler = ingenic_gpio_irq_handler;
> + girq->num_parents = 1;
> + girq->parents = devm_kcalloc(dev, 1, sizeof(*girq->parents),
> + GFP_KERNEL);
> + if (!girq->parents)
> + return -ENOMEM;
> + girq->parents[0] = jzgc->irq;
> + girq->default_type = IRQ_TYPE_NONE;
> + girq->handler = handle_level_irq;
> +
> + err = devm_gpiochip_add_data(dev, &jzgc->gc, jzgc);
> if (err)
> return err;
>
> - gpiochip_set_chained_irqchip(&jzgc->gc, &jzgc->irq_chip,
> - jzgc->irq, ingenic_gpio_irq_handler);
> return 0;
> }
>
next prev parent reply other threads:[~2019-10-02 11:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 13:32 [PATCH] pinctrl: ingenic: Pass irqchip when adding gpiochip Linus Walleij
2019-10-02 11:49 ` Zhou Yanjie [this message]
2019-10-06 0:11 ` Paul Cercueil
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=5D948ECE.2050007@zoho.com \
--to=zhouyanjie@zoho.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=paul@crapouillou.net \
--cc=thierry.reding@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).