Skip to content

Commit aa318c4

Browse files
committed
Merge tag 'gpio-fixes-for-v6.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski: - fix irq handling in gpio-davinci - fix Kconfig dependencies for gpio-regmap * tag 'gpio-fixes-for-v6.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpio: davinci: Add irq chip flag to skip set wake gpio: davinci: Do not clear the bank intr enable bit in save_context gpio: GPIO_REGMAP: select REGMAP instead of depending on it
2 parents c9797db + 7b75c47 commit aa318c4

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

drivers/gpio/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ config GPIO_GENERIC
100100
tristate
101101

102102
config GPIO_REGMAP
103-
depends on REGMAP
103+
select REGMAP
104104
tristate
105105

106106
# put drivers in the right section, in alphabetical order

drivers/gpio/gpio-davinci.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ static struct irq_chip gpio_irqchip = {
324324
.irq_enable = gpio_irq_enable,
325325
.irq_disable = gpio_irq_disable,
326326
.irq_set_type = gpio_irq_type,
327-
.flags = IRQCHIP_SET_TYPE_MASKED,
327+
.flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_SKIP_SET_WAKE,
328328
};
329329

330330
static void gpio_irq_handler(struct irq_desc *desc)
@@ -641,9 +641,6 @@ static void davinci_gpio_save_context(struct davinci_gpio_controller *chips,
641641
context->set_falling = readl_relaxed(&g->set_falling);
642642
}
643643

644-
/* Clear Bank interrupt enable bit */
645-
writel_relaxed(0, base + BINTEN);
646-
647644
/* Clear all interrupt status registers */
648645
writel_relaxed(GENMASK(31, 0), &g->intstat);
649646
}

0 commit comments

Comments
 (0)