From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Hans de Goede <hdegoede@redhat.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Linus Walleij <linus.walleij@linaro.org>,
linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org
Subject: Re: [PATCH v4 3/3] pinctrl: cherryview: Pass irqchip when adding gpiochip
Date: Fri, 15 Nov 2019 12:06:57 +0200 [thread overview]
Message-ID: <20191115100657.GM32742@smile.fi.intel.com> (raw)
In-Reply-To: <20191114100804.15148-3-hdegoede@redhat.com>
On Thu, Nov 14, 2019 at 11:08:04AM +0100, Hans de Goede 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.
>
Pushed all three to my review and testing queue, thanks!
(For v5.6 I suppose due to dependencies)
> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> Changes in v2:
> - Add kerneldoc for chv_pinctrl.irq struct member
>
> Changes in v4:
> - Rebase on latest intel-pinctrl/for-next
> - Fold if (need_valid_mask) ... if (!need_valid_mask) ... into an if-else
> ---
> drivers/pinctrl/intel/pinctrl-cherryview.c | 45 +++++++++++-----------
> 1 file changed, 22 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c
> index b3f6f7726b04..60527b93a711 100644
> --- a/drivers/pinctrl/intel/pinctrl-cherryview.c
> +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
> @@ -149,6 +149,7 @@ struct chv_pin_context {
> * @chip: GPIO chip in this pin controller
> * @irqchip: IRQ chip in this pin controller
> * @regs: MMIO registers
> + * @irq: Our parent irq
> * @intr_lines: Stores mapping between 16 HW interrupt wires and GPIO
> * offset (in GPIO number space)
> * @community: Community this pinctrl instance represents
> @@ -165,6 +166,7 @@ struct chv_pinctrl {
> struct gpio_chip chip;
> struct irq_chip irqchip;
> void __iomem *regs;
> + unsigned int irq;
> unsigned int intr_lines[16];
> const struct chv_community *community;
> u32 saved_intmask;
> @@ -1617,18 +1619,26 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
> chip->add_pin_ranges = chv_gpio_add_pin_ranges;
> chip->parent = pctrl->dev;
> chip->base = -1;
> - if (need_valid_mask)
> - chip->irq.init_valid_mask = chv_init_irq_valid_mask;
> -
> - ret = devm_gpiochip_add_data(pctrl->dev, chip, pctrl);
> - if (ret) {
> - dev_err(pctrl->dev, "Failed to register gpiochip\n");
> - return ret;
> - }
>
> - chv_gpio_irq_init_hw(chip);
> + pctrl->irq = irq;
> + pctrl->irqchip.name = "chv-gpio";
> + pctrl->irqchip.irq_startup = chv_gpio_irq_startup;
> + pctrl->irqchip.irq_ack = chv_gpio_irq_ack;
> + pctrl->irqchip.irq_mask = chv_gpio_irq_mask;
> + pctrl->irqchip.irq_unmask = chv_gpio_irq_unmask;
> + pctrl->irqchip.irq_set_type = chv_gpio_irq_type;
> + pctrl->irqchip.flags = IRQCHIP_SKIP_SET_WAKE;
>
> - if (!need_valid_mask) {
> + chip->irq.chip = &pctrl->irqchip;
> + chip->irq.init_hw = chv_gpio_irq_init_hw;
> + chip->irq.parent_handler = chv_gpio_irq_handler;
> + chip->irq.num_parents = 1;
> + chip->irq.parents = &pctrl->irq;
> + chip->irq.default_type = IRQ_TYPE_NONE;
> + chip->irq.handler = handle_bad_irq;
> + if (need_valid_mask) {
> + chip->irq.init_valid_mask = chv_init_irq_valid_mask;
> + } else {
> irq_base = devm_irq_alloc_descs(pctrl->dev, -1, 0,
> community->npins, NUMA_NO_NODE);
> if (irq_base < 0) {
> @@ -1637,18 +1647,9 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
> }
> }
>
> - pctrl->irqchip.name = "chv-gpio";
> - pctrl->irqchip.irq_startup = chv_gpio_irq_startup;
> - pctrl->irqchip.irq_ack = chv_gpio_irq_ack;
> - pctrl->irqchip.irq_mask = chv_gpio_irq_mask;
> - pctrl->irqchip.irq_unmask = chv_gpio_irq_unmask;
> - pctrl->irqchip.irq_set_type = chv_gpio_irq_type;
> - pctrl->irqchip.flags = IRQCHIP_SKIP_SET_WAKE;
> -
> - ret = gpiochip_irqchip_add(chip, &pctrl->irqchip, 0,
> - handle_bad_irq, IRQ_TYPE_NONE);
> + ret = devm_gpiochip_add_data(pctrl->dev, chip, pctrl);
> if (ret) {
> - dev_err(pctrl->dev, "failed to add IRQ chip\n");
> + dev_err(pctrl->dev, "Failed to register gpiochip\n");
> return ret;
> }
>
> @@ -1662,8 +1663,6 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
> }
> }
>
> - gpiochip_set_chained_irqchip(chip, &pctrl->irqchip, irq,
> - chv_gpio_irq_handler);
> return 0;
> }
>
> --
> 2.23.0
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2019-11-15 10:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-14 10:08 [PATCH v4 1/3] pinctrl: cherryview: Split out irq hw-init into a separate helper function Hans de Goede
2019-11-14 10:08 ` [PATCH v4 2/3] pinctrl: cherryview: Add GPIO <-> pin mapping ranges via callback Hans de Goede
2019-11-21 13:40 ` Linus Walleij
2019-11-14 10:08 ` [PATCH v4 3/3] pinctrl: cherryview: Pass irqchip when adding gpiochip Hans de Goede
2019-11-15 10:06 ` Andy Shevchenko [this message]
2019-11-21 13:44 ` Linus Walleij
2019-11-21 13:37 ` [PATCH v4 1/3] pinctrl: cherryview: Split out irq hw-init into a separate helper function 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=20191115100657.GM32742@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=hdegoede@redhat.com \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=mika.westerberg@linux.intel.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).