From 15aa6d23b8ec0d250c48fda3208e52edc91c82c1 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 8 Jan 2015 20:26:13 +0000 Subject: ramips: Fix for gpio falling interrupt mask This patch fixes a wrong mask operation for the rt2880-compatible ralink devices. The mask operation reads the actual flags and then logical combines it with the pin flag it want to set. Unfortunally, for rising as for falling interrupt flags the actual flag status of the rising interrupts was used. That caused a problem if you want to use more than one falling GPIO interrupt. Now the correct (seperated) actual status is used for both, falling and rising. Signed-off-by: Jonas Arndt Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43882 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/patches-3.14/999-gpi_irq.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 target/linux/ramips/patches-3.14/999-gpi_irq.patch (limited to 'target/linux') diff --git a/target/linux/ramips/patches-3.14/999-gpi_irq.patch b/target/linux/ramips/patches-3.14/999-gpi_irq.patch new file mode 100644 index 0000000000..a421570672 --- /dev/null +++ b/target/linux/ramips/patches-3.14/999-gpi_irq.patch @@ -0,0 +1,42 @@ +--- a/drivers/gpio/gpio-ralink.c ++++ b/drivers/gpio/gpio-ralink.c +@@ -148,14 +148,15 @@ + { + struct ralink_gpio_chip *rg; + unsigned long flags; +- u32 val; ++ u32 rise, fall; + + rg = (struct ralink_gpio_chip *) d->domain->host_data; +- val = rt_gpio_r32(rg, GPIO_REG_RENA); ++ rise = rt_gpio_r32(rg, GPIO_REG_RENA); ++ fall = rt_gpio_r32(rg, GPIO_REG_FENA); + + spin_lock_irqsave(&rg->lock, flags); +- rt_gpio_w32(rg, GPIO_REG_RENA, val | (BIT(d->hwirq) & rg->rising)); +- rt_gpio_w32(rg, GPIO_REG_FENA, val | (BIT(d->hwirq) & rg->falling)); ++ rt_gpio_w32(rg, GPIO_REG_RENA, rise | (BIT(d->hwirq) & rg->rising)); ++ rt_gpio_w32(rg, GPIO_REG_FENA, fall | (BIT(d->hwirq) & rg->falling)); + spin_unlock_irqrestore(&rg->lock, flags); + } + +@@ -163,14 +164,15 @@ + { + struct ralink_gpio_chip *rg; + unsigned long flags; +- u32 val; ++ u32 rise, fall; + + rg = (struct ralink_gpio_chip *) d->domain->host_data; +- val = rt_gpio_r32(rg, GPIO_REG_RENA); ++ rise = rt_gpio_r32(rg, GPIO_REG_RENA); ++ fall = rt_gpio_r32(rg, GPIO_REG_FENA); + + spin_lock_irqsave(&rg->lock, flags); +- rt_gpio_w32(rg, GPIO_REG_FENA, val & ~BIT(d->hwirq)); +- rt_gpio_w32(rg, GPIO_REG_RENA, val & ~BIT(d->hwirq)); ++ rt_gpio_w32(rg, GPIO_REG_FENA, fall & ~BIT(d->hwirq)); ++ rt_gpio_w32(rg, GPIO_REG_RENA, rise & ~BIT(d->hwirq)); + spin_unlock_irqrestore(&rg->lock, flags); + } + -- cgit v1.2.3