In the QE, a few GPIOs have an associated IRQ to notify changes.
Add IRQ support to QE GPIO.
As not all GPIOs have an associated IRQ, the driver needs to know
to which GPIO corresponds each provided IRQ. This is provided via
multiple compatible properties:
compatible = "fsl,mpc8323-qe-pario-bank-a"
compatible = "fsl,mpc8323-qe-pario-bank-b"
compatible = "fsl,mpc8323-qe-pario-bank-c"
compatible = "fsl,mpc8360-qe-pario-bank-a"
compatible = "fsl,mpc8360-qe-pario-bank-b"
compatible = "fsl,mpc8360-qe-pario-bank-c"
compatible = "fsl,mpc8360-qe-pario-bank-d"
compatible = "fsl,mpc8360-qe-pario-bank-e"
compatible = "fsl,mpc8360-qe-pario-bank-f"
compatible = "fsl,mpc8360-qe-pario-bank-g"
compatible = "fsl,mpc8568-qe-pario-bank-a"
compatible = "fsl,mpc8568-qe-pario-bank-b"
compatible = "fsl,mpc8568-qe-pario-bank-c"
compatible = "fsl,mpc8568-qe-pario-bank-d"
compatible = "fsl,mpc8568-qe-pario-bank-e"
compatible = "fsl,mpc8568-qe-pario-bank-f"
When not using IRQ and for banks having no IRQ (like bank D on mpc8323)
the origin compatible = "fsl,mpc8323-qe-pario-bank" is sufficient.
Here is an exemple for port B of mpc8323 which has IRQs for
GPIOs PB7, PB9, PB25 and PB27.
qe_pio_b: gpio-controller@1418 {
compatible = "fsl,mpc8323-qe-pario-bank-b";
reg = <0x1418 0x18>;
interrupts = <4 5 6 7>;
interrupt-parent = <&qepic>;
gpio-controller;
#gpio-cells = <2>;
};
Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszew...@linaro.org>
---
v5: Provide the mask via the compatible data instead of adding a property in
device tree
---
drivers/soc/fsl/qe/gpio.c | 72 +++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/drivers/soc/fsl/qe/gpio.c b/drivers/soc/fsl/qe/gpio.c
index c54154b404df..8632b0d37255 100644
--- a/drivers/soc/fsl/qe/gpio.c
+++ b/drivers/soc/fsl/qe/gpio.c
@@ -12,6 +12,7 @@
#include <linux/spinlock.h>
#include <linux/err.h>
#include <linux/io.h>
+#include <linux/of_irq.h>
#include <linux/gpio/consumer.h>
#include <linux/gpio/driver.h>
#include <linux/slab.h>
@@ -32,6 +33,8 @@ struct qe_gpio_chip {
/* saved_regs used to restore dedicated functions */
struct qe_pio_regs saved_regs;
+
+ int irq[QE_PIO_PINS];
};
static void qe_gpio_save_regs(struct qe_gpio_chip *qe_gc)
@@ -135,6 +138,13 @@ static int qe_gpio_dir_out(struct gpio_chip *gc, unsigned
int gpio, int val)
return 0;
}
+static int qe_gpio_to_irq(struct gpio_chip *gc, unsigned int gpio)
+{
+ struct qe_gpio_chip *qe_gc = gpiochip_get_data(gc);
+
+ return qe_gc->irq[gpio] ? : -ENXIO;
+}
+
struct qe_pin {
/*
* The qe_gpio_chip name is unfortunate, we should change that to
@@ -295,6 +305,7 @@ static int qe_gpio_probe(struct platform_device *ofdev)
struct device_node *np = dev->of_node;
struct qe_gpio_chip *qe_gc;
struct gpio_chip *gc;
+ u32 mask;
qe_gc = devm_kzalloc(dev, sizeof(*qe_gc), GFP_KERNEL);
if (!qe_gc)
@@ -302,6 +313,15 @@ static int qe_gpio_probe(struct platform_device *ofdev)
spin_lock_init(&qe_gc->lock);
+ mask = (u32)of_device_get_match_data(dev);
+ if (mask) {
+ int i, j;
+
+ for (i = 0, j = 0; i < ARRAY_SIZE(qe_gc->irq); i++)
+ if (mask & PIN_MASK(i))
+ qe_gc->irq[i] = irq_of_parse_and_map(np, j++);
+ }
+
gc = &qe_gc->gc;
gc->base = -1;
@@ -311,6 +331,7 @@ static int qe_gpio_probe(struct platform_device *ofdev)
gc->get = qe_gpio_get;
gc->set = qe_gpio_set;
gc->set_multiple = qe_gpio_set_multiple;
+ gc->to_irq = qe_gpio_to_irq;
gc->parent = dev;
gc->owner = THIS_MODULE;
@@ -330,6 +351,57 @@ static int qe_gpio_probe(struct platform_device *ofdev)
static const struct of_device_id qe_gpio_match[] = {
{
.compatible = "fsl,mpc8323-qe-pario-bank",
+ }, {
+ .compatible = "fsl,mpc8323-qe-pario-bank-a",
+ .data = (void *)(PIN_MASK(8) | PIN_MASK(10) | PIN_MASK(26) |
PIN_MASK(28)),
+ }, {
+ .compatible = "fsl,mpc8323-qe-pario-bank-b",
+ .data = (void *)(PIN_MASK(7) | PIN_MASK(9) | PIN_MASK(25) |
PIN_MASK(27)),
+ }, {
+ .compatible = "fsl,mpc8323-qe-pario-bank-c",
+ .data = (void *)(PIN_MASK(24) | PIN_MASK(29)),
+ }, {
+ .compatible = "fsl,mpc8360-qe-pario-bank-a",
+ .data = (void *)(PIN_MASK(15) | PIN_MASK(16) | PIN_MASK(29) |
PIN_MASK(30)),
+ }, {
+ .compatible = "fsl,mpc8360-qe-pario-bank-b",
+ .data = (void *)(PIN_MASK(3) | PIN_MASK(5) | PIN_MASK(12) |
PIN_MASK(13) |
+ PIN_MASK(26) | PIN_MASK(27)),
+ }, {
+ .compatible = "fsl,mpc8360-qe-pario-bank-c",
+ .data = (void *)(PIN_MASK(27) | PIN_MASK(28) | PIN_MASK(29)),
+ }, {
+ .compatible = "fsl,mpc8360-qe-pario-bank-d",
+ .data = (void *)(PIN_MASK(12) | PIN_MASK(13) | PIN_MASK(16) |
PIN_MASK(17) |
+ PIN_MASK(26) | PIN_MASK(27)),
+ }, {
+ .compatible = "fsl,mpc8360-qe-pario-bank-e",
+ .data = (void *)(PIN_MASK(12) | PIN_MASK(13) | PIN_MASK(24) |
PIN_MASK(25) |
+ PIN_MASK(26) | PIN_MASK(27) | PIN_MASK(31)),
+ }, {
+ .compatible = "fsl,mpc8360-qe-pario-bank-f",
+ .data = (void *)(PIN_MASK(20)),
+ }, {
+ .compatible = "fsl,mpc8360-qe-pario-bank-g",
+ .data = (void *)(PIN_MASK(31)),
+ }, {
+ .compatible = "fsl,mpc8568-qe-pario-bank-a",
+ .data = (void *)(PIN_MASK(22) | PIN_MASK(23)),
+ }, {
+ .compatible = "fsl,mpc8568-qe-pario-bank-b",
+ .data = (void *)(PIN_MASK(12) | PIN_MASK(13) | PIN_MASK(28) |
PIN_MASK(29)),
+ }, {
+ .compatible = "fsl,mpc8568-qe-pario-bank-c",
+ .data = (void *)(PIN_MASK(16) | PIN_MASK(17) | PIN_MASK(25) |
PIN_MASK(26)),
+ }, {
+ .compatible = "fsl,mpc8568-qe-pario-bank-d",
+ .data = (void *)(PIN_MASK(18) | PIN_MASK(19)),
+ }, {
+ .compatible = "fsl,mpc8568-qe-pario-bank-e",
+ .data = (void *)(PIN_MASK(12) | PIN_MASK(16) | PIN_MASK(30)),
+ }, {
+ .compatible = "fsl,mpc8568-qe-pario-bank-f",
+ .data = (void *)(PIN_MASK(12) | PIN_MASK(16) | PIN_MASK(30)),
},
{},
};
--
2.49.0
