Merge tag 'drm-next-2020-01-30' of git://anongit.freedesktop.org/drm/drm

[linux.git] / drivers / gpio / gpio-mvebu.c

diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
index 993bbeb3c0067f0f5c156ec5009d0799c36914e3..d2b999c7987f11f6075cbcc35d186a0ba5f4b10c 100644 (file)
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@ -46,7 +46,6 @@
 #include <linux/irqdomain.h>
 #include <linux/mfd/syscon.h>
 #include <linux/of_device.h>
-#include <linux/of_irq.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
@@ -432,6 +431,7 @@ static void mvebu_gpio_edge_irq_unmask(struct irq_data *d)
        u32 mask = d->mask;
 
        irq_gc_lock(gc);
+       mvebu_gpio_write_edge_cause(mvchip, ~mask);
        ct->mask_cache_priv |= mask;
        mvebu_gpio_write_edge_mask(mvchip, ct->mask_cache_priv);
        irq_gc_unlock(gc);
@@ -1102,7 +1102,11 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
                soc_variant = MVEBU_GPIO_SOC_VARIANT_ORION;
 
        /* Some gpio controllers do not provide irq support */
-       have_irqs = of_irq_count(np) != 0;
+       err = platform_irq_count(pdev);
+       if (err < 0)
+               return err;
+
+       have_irqs = err != 0;
 
        mvchip = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_gpio_chip),
                              GFP_KERNEL);