101 lines
3.2 KiB
Diff
101 lines
3.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: usera <adeep@lexina.in>
|
||
|
|
Date: Mon, 12 Apr 2021 16:16:42 +0200
|
||
|
|
Subject: Fix:meson64: add gpio irq (patch from
|
||
|
|
https://lkml.org/lkml/2020/11/27/8)
|
||
|
|
|
||
|
|
Signed-off-by: Vyacheslav Bocharov <devel@lexina.in>
|
||
|
|
---
|
||
|
|
drivers/pinctrl/meson/pinctrl-meson.c | 41 ++++++++++
|
||
|
|
drivers/pinctrl/meson/pinctrl-meson.h | 1 +
|
||
|
|
2 files changed, 42 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
|
||
|
|
index 530f3f934e19..690832c48f79 100644
|
||
|
|
--- a/drivers/pinctrl/meson/pinctrl-meson.c
|
||
|
|
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
|
||
|
|
@@ -52,6 +52,7 @@
|
||
|
|
#include <linux/property.h>
|
||
|
|
#include <linux/regmap.h>
|
||
|
|
#include <linux/seq_file.h>
|
||
|
|
+#include <linux/of_irq.h>
|
||
|
|
|
||
|
|
#include "../core.h"
|
||
|
|
#include "../pinctrl-utils.h"
|
||
|
|
@@ -602,6 +603,40 @@ static int meson_gpio_get(struct gpio_chip *chip, unsigned gpio)
|
||
|
|
return !!(val & BIT(bit));
|
||
|
|
}
|
||
|
|
|
||
|
|
+static int meson_gpio_to_irq(struct gpio_chip *chip, unsigned int gpio)
|
||
|
|
+{
|
||
|
|
+ struct meson_pinctrl *pc = gpiochip_get_data(chip);
|
||
|
|
+ struct meson_bank *bank;
|
||
|
|
+ struct irq_fwspec fwspec;
|
||
|
|
+ int hwirq;
|
||
|
|
+
|
||
|
|
+ if (meson_get_bank(pc, gpio, &bank))
|
||
|
|
+ return -EINVAL;
|
||
|
|
+
|
||
|
|
+ if (bank->irq_first < 0) {
|
||
|
|
+ dev_warn(pc->dev, "no support irq for pin[%d]\n", gpio);
|
||
|
|
+ return -EINVAL;
|
||
|
|
+ }
|
||
|
|
+ if (!pc->of_irq) {
|
||
|
|
+ dev_err(pc->dev, "invalid device node of gpio INTC\n");
|
||
|
|
+ return -EINVAL;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ hwirq = gpio - bank->first + bank->irq_first;
|
||
|
|
+ printk("gpio irq setup: hwirq: 0x%X irqfirst: 0x%X irqlast: 0x%X pin[%d]\n", hwirq, bank->irq_first, bank->irq_last, gpio);
|
||
|
|
+ if (hwirq > bank->irq_last)
|
||
|
|
+ {
|
||
|
|
+ dev_warn(pc->dev, "no more irq for pin[%d]\n", gpio);
|
||
|
|
+ return -EINVAL;
|
||
|
|
+ }
|
||
|
|
+ fwspec.fwnode = of_node_to_fwnode(pc->of_irq);
|
||
|
|
+ fwspec.param_count = 2;
|
||
|
|
+ fwspec.param[0] = hwirq;
|
||
|
|
+ fwspec.param[1] = IRQ_TYPE_NONE;
|
||
|
|
+
|
||
|
|
+ return irq_create_fwspec_mapping(&fwspec);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static int meson_gpiolib_register(struct meson_pinctrl *pc)
|
||
|
|
{
|
||
|
|
int ret;
|
||
|
|
@@ -617,6 +652,7 @@ static int meson_gpiolib_register(struct meson_pinctrl *pc)
|
||
|
|
pc->chip.direction_output = meson_gpio_direction_output;
|
||
|
|
pc->chip.get = meson_gpio_get;
|
||
|
|
pc->chip.set = meson_gpio_set;
|
||
|
|
+ pc->chip.to_irq = meson_gpio_to_irq;
|
||
|
|
pc->chip.base = -1;
|
||
|
|
pc->chip.ngpio = pc->data->num_pins;
|
||
|
|
pc->chip.can_sleep = false;
|
||
|
|
@@ -680,6 +716,11 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc)
|
||
|
|
pc->fwnode = gpiochip_node_get_first(pc->dev);
|
||
|
|
gpio_np = to_of_node(pc->fwnode);
|
||
|
|
|
||
|
|
+ pc->of_irq = of_find_compatible_node(NULL,
|
||
|
|
+ NULL, "amlogic,meson-gpio-intc");
|
||
|
|
+ if (!pc->of_irq)
|
||
|
|
+ pc->of_irq = of_find_compatible_node(NULL,
|
||
|
|
+ NULL, "amlogic,meson-gpio-intc-ext");
|
||
|
|
pc->reg_mux = meson_map_resource(pc, gpio_np, "mux");
|
||
|
|
if (IS_ERR_OR_NULL(pc->reg_mux)) {
|
||
|
|
dev_err(pc->dev, "mux registers not found\n");
|
||
|
|
diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
|
||
|
|
index 34fc4e8612e4..0f9fa04513ea 100644
|
||
|
|
--- a/drivers/pinctrl/meson/pinctrl-meson.h
|
||
|
|
+++ b/drivers/pinctrl/meson/pinctrl-meson.h
|
||
|
|
@@ -134,6 +134,7 @@ struct meson_pinctrl {
|
||
|
|
struct regmap *reg_ds;
|
||
|
|
struct gpio_chip chip;
|
||
|
|
struct fwnode_handle *fwnode;
|
||
|
|
+ struct device_node *of_irq;
|
||
|
|
};
|
||
|
|
|
||
|
|
#define FUNCTION(fn) \
|
||
|
|
--
|
||
|
|
Armbian
|
||
|
|
|