Commit aa318c48 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c9797dba 7b75c470

drivers/gpio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ config GPIO_GENERIC 
	tristate



config GPIO_REGMAP

	depends on REGMAP

	select REGMAP

	tristate



# put drivers in the right section, in alphabetical order

drivers/gpio/gpio-davinci.c

+1 −4
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static struct irq_chip gpio_irqchip = { 
	.irq_enable	= gpio_irq_enable,

	.irq_disable	= gpio_irq_disable,

	.irq_set_type	= gpio_irq_type,

	.flags		= IRQCHIP_SET_TYPE_MASKED,

	.flags		= IRQCHIP_SET_TYPE_MASKED | IRQCHIP_SKIP_SET_WAKE,

};



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

	}



	/* Clear Bank interrupt enable bit */

	writel_relaxed(0, base + BINTEN);



	/* Clear all interrupt status registers */

	writel_relaxed(GENMASK(31, 0), &g->intstat);

}