Merge tag 'for-4.21' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux-2.6-block.git] / drivers / gpio / gpio-mxs.c

diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index ea874fd033a5e2da19b4d3d8e6fb02afd598180d..5e5437a2c607ee9c4817a36040431b5e7ac08a20 100644 (file)
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -84,7 +84,7 @@ static int mxs_gpio_set_irq_type(struct irq_data *d, unsigned int type)
        port->both_edges &= ~pin_mask;
        switch (type) {
        case IRQ_TYPE_EDGE_BOTH:
-               val = port->gc.get(&port->gc, d->hwirq);
+               val = readl(port->base + PINCTRL_DIN(port)) & pin_mask;
                if (val)
                        edge = GPIO_INT_FALL_EDGE;
                else