* [PATCH] gpio: sifive: To get gpio irq offset from device tree data
@ 2020-11-09 7:57 Greentime Hu
2020-11-10 9:54 ` Bartosz Golaszewski
0 siblings, 1 reply; 2+ messages in thread
From: Greentime Hu @ 2020-11-09 7:57 UTC (permalink / raw)
To: greentime.hu, linux-kernel, linus.walleij, bgolaszewski,
linux-gpio, linux-riscv, palmer, paul.walmsley, andy.shevchenko,
yash.shah
We can get hwirq number of the gpio by its irq_data->hwirq so that we don't
need to add more macros for different platforms. This patch is tested in
SiFive Unleashed board and SiFive Unmatched board.
Signed-off-by: Greentime Hu <greentime.hu@sifive.com>
---
drivers/gpio/gpio-sifive.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/gpio/gpio-sifive.c b/drivers/gpio/gpio-sifive.c
index c54dd08f2cbf..bfb915bf5d78 100644
--- a/drivers/gpio/gpio-sifive.c
+++ b/drivers/gpio/gpio-sifive.c
@@ -29,7 +29,6 @@
#define SIFIVE_GPIO_OUTPUT_XOR 0x40
#define SIFIVE_GPIO_MAX 32
-#define SIFIVE_GPIO_IRQ_OFFSET 7
struct sifive_gpio {
void __iomem *base;
@@ -37,7 +36,7 @@ struct sifive_gpio {
struct regmap *regs;
unsigned long irq_state;
unsigned int trigger[SIFIVE_GPIO_MAX];
- unsigned int irq_parent[SIFIVE_GPIO_MAX];
+ unsigned int irq_number[SIFIVE_GPIO_MAX];
};
static void sifive_gpio_set_ie(struct sifive_gpio *chip, unsigned int offset)
@@ -144,8 +143,10 @@ static int sifive_gpio_child_to_parent_hwirq(struct gpio_chip *gc,
unsigned int *parent,
unsigned int *parent_type)
{
+ struct sifive_gpio *chip = gpiochip_get_data(gc);
+ struct irq_data *d = irq_get_irq_data(chip->irq_number[child]);
+ *parent = irqd_to_hwirq(d);
*parent_type = IRQ_TYPE_NONE;
- *parent = child + SIFIVE_GPIO_IRQ_OFFSET;
return 0;
}
@@ -165,7 +166,7 @@ static int sifive_gpio_probe(struct platform_device *pdev)
struct irq_domain *parent;
struct gpio_irq_chip *girq;
struct sifive_gpio *chip;
- int ret, ngpio;
+ int ret, ngpio, i;
chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
if (!chip)
@@ -200,6 +201,9 @@ static int sifive_gpio_probe(struct platform_device *pdev)
return -ENODEV;
}
+ for (i = 0; i < ngpio; i++)
+ chip->irq_number[i] = platform_get_irq(pdev, i);
+
ret = bgpio_init(&chip->gc, dev, 4,
chip->base + SIFIVE_GPIO_INPUT_VAL,
chip->base + SIFIVE_GPIO_OUTPUT_VAL,
--
2.29.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] gpio: sifive: To get gpio irq offset from device tree data
2020-11-09 7:57 [PATCH] gpio: sifive: To get gpio irq offset from device tree data Greentime Hu
@ 2020-11-10 9:54 ` Bartosz Golaszewski
0 siblings, 0 replies; 2+ messages in thread
From: Bartosz Golaszewski @ 2020-11-10 9:54 UTC (permalink / raw)
To: Greentime Hu
Cc: LKML, Linus Walleij, linux-gpio, linux-riscv, Palmer Dabbelt,
Paul Walmsley, Andy Shevchenko, Yash Shah
On Mon, Nov 9, 2020 at 8:57 AM Greentime Hu <greentime.hu@sifive.com> wrote:
>
> We can get hwirq number of the gpio by its irq_data->hwirq so that we don't
> need to add more macros for different platforms. This patch is tested in
> SiFive Unleashed board and SiFive Unmatched board.
>
> Signed-off-by: Greentime Hu <greentime.hu@sifive.com>
> ---
> drivers/gpio/gpio-sifive.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpio/gpio-sifive.c b/drivers/gpio/gpio-sifive.c
> index c54dd08f2cbf..bfb915bf5d78 100644
> --- a/drivers/gpio/gpio-sifive.c
> +++ b/drivers/gpio/gpio-sifive.c
> @@ -29,7 +29,6 @@
> #define SIFIVE_GPIO_OUTPUT_XOR 0x40
>
> #define SIFIVE_GPIO_MAX 32
> -#define SIFIVE_GPIO_IRQ_OFFSET 7
>
> struct sifive_gpio {
> void __iomem *base;
> @@ -37,7 +36,7 @@ struct sifive_gpio {
> struct regmap *regs;
> unsigned long irq_state;
> unsigned int trigger[SIFIVE_GPIO_MAX];
> - unsigned int irq_parent[SIFIVE_GPIO_MAX];
> + unsigned int irq_number[SIFIVE_GPIO_MAX];
> };
>
> static void sifive_gpio_set_ie(struct sifive_gpio *chip, unsigned int offset)
> @@ -144,8 +143,10 @@ static int sifive_gpio_child_to_parent_hwirq(struct gpio_chip *gc,
> unsigned int *parent,
> unsigned int *parent_type)
> {
> + struct sifive_gpio *chip = gpiochip_get_data(gc);
> + struct irq_data *d = irq_get_irq_data(chip->irq_number[child]);
Please add a newline here.
> + *parent = irqd_to_hwirq(d);
> *parent_type = IRQ_TYPE_NONE;
> - *parent = child + SIFIVE_GPIO_IRQ_OFFSET;
And here while you're at it.
> return 0;
> }
>
> @@ -165,7 +166,7 @@ static int sifive_gpio_probe(struct platform_device *pdev)
> struct irq_domain *parent;
> struct gpio_irq_chip *girq;
> struct sifive_gpio *chip;
> - int ret, ngpio;
> + int ret, ngpio, i;
>
> chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
> if (!chip)
> @@ -200,6 +201,9 @@ static int sifive_gpio_probe(struct platform_device *pdev)
> return -ENODEV;
> }
>
> + for (i = 0; i < ngpio; i++)
> + chip->irq_number[i] = platform_get_irq(pdev, i);
> +
> ret = bgpio_init(&chip->gc, dev, 4,
> chip->base + SIFIVE_GPIO_INPUT_VAL,
> chip->base + SIFIVE_GPIO_OUTPUT_VAL,
> --
> 2.29.2
>
Bartosz
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-10 9:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-09 7:57 [PATCH] gpio: sifive: To get gpio irq offset from device tree data Greentime Hu
2020-11-10 9:54 ` Bartosz Golaszewski
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).