From b6a1bb246995c75b78dd9850766efb5a182d0f4a Mon Sep 17 00:00:00 2001 From: Lin shenghuan <410860423@qq.com> Date: Fri, 27 Nov 2020 11:52:05 +0800 Subject: [PATCH] ODROID-COMMON: BACKPORT: add amlogic gpio to irq FROM: https://patchwork.kernel.org/project/linux-arm-kernel/patch/tencent_CF204C2A172AA4207DADEEB243A75474B10A@qq.com/ Signed-off-by: Dongjin Kim Change-Id: Id20016e76ae3040fb70d0abf554640d7cddf6d0e --- drivers/pinctrl/meson/pinctrl-meson.c | 36 +++++++++++++++++++++++++++ drivers/pinctrl/meson/pinctrl-meson.h | 2 ++ 2 files changed, 38 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 524424ee6c4e..c2fe7add57bd 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -51,6 +51,7 @@ #include #include #include +#include #include "../core.h" #include "../pinctrl-utils.h" @@ -601,6 +602,34 @@ 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; + 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; @@ -616,6 +645,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; @@ -679,6 +709,12 @@ 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..c5adcbb591e6 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.h +++ b/drivers/pinctrl/meson/pinctrl-meson.h @@ -134,6 +134,8 @@ struct meson_pinctrl { struct regmap *reg_ds; struct gpio_chip chip; struct fwnode_handle *fwnode; + struct device_node *of_node; + struct device_node *of_irq; }; #define FUNCTION(fn) \