aa3d60f57e
* mvebu-dev: refresh all patches with quilt Cleaned up based on kernel 5.9.12. Signed-off-by: Rosen Penev <rosenp@gmail.com> * mvebu-current: refresh patches with quilt Based on kernel version 5.9.12 Signed-off-by: Rosen Penev <rosenp@gmail.com> * mvebu-legacy: refresh patches with quilt Based on kernel 4.19.161 Signed-off-by: Rosen Penev <rosenp@gmail.com> * mvebu-legacy: remove custom helios4 dts file This is already added upstream. No need to have it here. Continued refreshing the other patches. Signed-off-by: Rosen Penev <rosenp@gmail.com>
89 lines
2.9 KiB
Diff
89 lines
2.9 KiB
Diff
--- a/drivers/gpio/gpio-mvebu.c
|
|
+++ b/drivers/gpio/gpio-mvebu.c
|
|
@@ -40,6 +40,7 @@
|
|
#include <linux/gpio/consumer.h>
|
|
#include <linux/gpio/machine.h>
|
|
#include <linux/init.h>
|
|
+#include <linux/interrupt.h>
|
|
#include <linux/io.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/irqchip/chained_irq.h>
|
|
@@ -111,7 +112,7 @@ struct mvebu_gpio_chip {
|
|
struct regmap *regs;
|
|
u32 offset;
|
|
struct regmap *percpu_regs;
|
|
- int irqbase;
|
|
+ int bank_irq[4];
|
|
struct irq_domain *domain;
|
|
int soc_variant;
|
|
|
|
@@ -601,6 +602,33 @@ static void mvebu_gpio_irq_handler(struc
|
|
}
|
|
|
|
/*
|
|
+ * Set interrupt number "irq" in the GPIO as a wake-up source.
|
|
+ * While system is running, all registered GPIO interrupts need to have
|
|
+ * wake-up enabled. When system is suspended, only selected GPIO interrupts
|
|
+ * need to have wake-up enabled.
|
|
+ * @param irq interrupt source number
|
|
+ * @param enable enable as wake-up if equal to non-zero
|
|
+ * @return This function returns 0 on success.
|
|
+ */
|
|
+static int mvebu_gpio_set_wake_irq(struct irq_data *d, unsigned int enable)
|
|
+{
|
|
+ struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
|
|
+ struct mvebu_gpio_chip *mvchip = gc->private;
|
|
+ int irq;
|
|
+ int bank;
|
|
+
|
|
+ bank = d->hwirq % 8;
|
|
+ irq = mvchip->bank_irq[bank];
|
|
+
|
|
+ if (enable)
|
|
+ enable_irq_wake(irq);
|
|
+ else
|
|
+ disable_irq_wake(irq);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+/*
|
|
* Functions implementing the pwm_chip methods
|
|
*/
|
|
static struct mvebu_pwm *to_mvebu_pwm(struct pwm_chip *chip)
|
|
@@ -1211,7 +1239,7 @@ static int mvebu_gpio_probe(struct platf
|
|
|
|
err = irq_alloc_domain_generic_chips(
|
|
mvchip->domain, ngpios, 2, np->name, handle_level_irq,
|
|
- IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_LEVEL, 0, 0);
|
|
+ IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_LEVEL, 0, IRQ_GC_INIT_NESTED_LOCK);
|
|
if (err) {
|
|
dev_err(&pdev->dev, "couldn't allocate irq chips %s (DT).\n",
|
|
mvchip->chip.label);
|
|
@@ -1229,6 +1257,8 @@ static int mvebu_gpio_probe(struct platf
|
|
ct->chip.irq_mask = mvebu_gpio_level_irq_mask;
|
|
ct->chip.irq_unmask = mvebu_gpio_level_irq_unmask;
|
|
ct->chip.irq_set_type = mvebu_gpio_irq_set_type;
|
|
+ ct->chip.irq_set_wake = mvebu_gpio_set_wake_irq;
|
|
+ ct->chip.flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_MASK_ON_SUSPEND;
|
|
ct->chip.name = mvchip->chip.label;
|
|
|
|
ct = &gc->chip_types[1];
|
|
@@ -1237,6 +1267,8 @@ static int mvebu_gpio_probe(struct platf
|
|
ct->chip.irq_mask = mvebu_gpio_edge_irq_mask;
|
|
ct->chip.irq_unmask = mvebu_gpio_edge_irq_unmask;
|
|
ct->chip.irq_set_type = mvebu_gpio_irq_set_type;
|
|
+ ct->chip.irq_set_wake = mvebu_gpio_set_wake_irq;
|
|
+ ct->chip.flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_MASK_ON_SUSPEND;
|
|
ct->handler = handle_edge_irq;
|
|
ct->chip.name = mvchip->chip.label;
|
|
|
|
@@ -1252,6 +1284,7 @@ static int mvebu_gpio_probe(struct platf
|
|
continue;
|
|
irq_set_chained_handler_and_data(irq, mvebu_gpio_irq_handler,
|
|
mvchip);
|
|
+ mvchip->bank_irq[i] = irq;
|
|
}
|
|
|
|
/* Some MVEBU SoCs have simple PWM support for GPIO lines */
|