diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-04 12:18:50 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-04 12:18:50 -0800 |
| commit | fa22f66b82de3576aa1c35f116a8b3824ed9e123 (patch) | |
| tree | aafa84003d2ee5a4f04dfed8b7ca44bbc979faac /drivers/gpio | |
| parent | 3843114856728075d0a80e7151197c19fb3a9e08 (diff) | |
| parent | e462f1f5174893f3f5efd03a31ca014b02120f9a (diff) | |
| download | blackbird-obmc-linux-fa22f66b82de3576aa1c35f116a8b3824ed9e123.tar.gz blackbird-obmc-linux-fa22f66b82de3576aa1c35f116a8b3824ed9e123.zip | |
Merge tag 'davinci-fixes-for-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
From Sekhar Nori:
This pull request contains a fixe for broken unbanked
GPIO IRQ support and a fix for some random memory
corruption. The bugs were introduced during v3.13
merge window.
* tag 'davinci-fixes-for-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: fix number of resources passed to davinci_gpio_register()
gpio: davinci: fix check for unbanked gpio
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-davinci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c index 8847adf392b7..84be70157ad6 100644 --- a/drivers/gpio/gpio-davinci.c +++ b/drivers/gpio/gpio-davinci.c @@ -327,7 +327,7 @@ static int gpio_to_irq_unbanked(struct gpio_chip *chip, unsigned offset) * NOTE: we assume for now that only irqs in the first gpio_chip * can provide direct-mapped IRQs to AINTC (up to 32 GPIOs). */ - if (offset < d->irq_base) + if (offset < d->gpio_unbanked) return d->gpio_irq + offset; else return -ENODEV; @@ -419,6 +419,8 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) /* pass "bank 0" GPIO IRQs to AINTC */ chips[0].chip.to_irq = gpio_to_irq_unbanked; + chips[0].gpio_irq = bank_irq; + chips[0].gpio_unbanked = pdata->gpio_unbanked; binten = BIT(0); /* AINTC handles mask/unmask; GPIO handles triggering */ |
