Commit 3c68e90f authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'gpio-fixes-for-v5.9-rc4' of... 

Merge tag 'gpio-fixes-for-v5.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into fixes

gpio fixes for v5.9-rc4

- fix warnings if PM is enabled in gpio-omap
- clear interrupt when setting the type as edge in gpio-sprd
parents d012a719 5fcface6

drivers/gpio/gpio-omap.c

+2 −2
Original line number Diff line number Diff line
@@ -1516,7 +1516,7 @@ static int __maybe_unused omap_gpio_runtime_resume(struct device *dev) 
	return 0;

}



static int omap_gpio_suspend(struct device *dev)

static int __maybe_unused omap_gpio_suspend(struct device *dev)

{

	struct gpio_bank *bank = dev_get_drvdata(dev);
@@ -1528,7 +1528,7 @@ static int omap_gpio_suspend(struct device *dev) 
	return omap_gpio_runtime_suspend(dev);

}



static int omap_gpio_resume(struct device *dev)

static int __maybe_unused omap_gpio_resume(struct device *dev)

{

	struct gpio_bank *bank = dev_get_drvdata(dev);

drivers/gpio/gpio-sprd.c

+3 −0
Original line number Diff line number Diff line
@@ -149,17 +149,20 @@ static int sprd_gpio_irq_set_type(struct irq_data *data, 
		sprd_gpio_update(chip, offset, SPRD_GPIO_IS, 0);

		sprd_gpio_update(chip, offset, SPRD_GPIO_IBE, 0);

		sprd_gpio_update(chip, offset, SPRD_GPIO_IEV, 1);

		sprd_gpio_update(chip, offset, SPRD_GPIO_IC, 1);

		irq_set_handler_locked(data, handle_edge_irq);

		break;

	case IRQ_TYPE_EDGE_FALLING:

		sprd_gpio_update(chip, offset, SPRD_GPIO_IS, 0);

		sprd_gpio_update(chip, offset, SPRD_GPIO_IBE, 0);

		sprd_gpio_update(chip, offset, SPRD_GPIO_IEV, 0);

		sprd_gpio_update(chip, offset, SPRD_GPIO_IC, 1);

		irq_set_handler_locked(data, handle_edge_irq);

		break;

	case IRQ_TYPE_EDGE_BOTH:

		sprd_gpio_update(chip, offset, SPRD_GPIO_IS, 0);

		sprd_gpio_update(chip, offset, SPRD_GPIO_IBE, 1);

		sprd_gpio_update(chip, offset, SPRD_GPIO_IC, 1);

		irq_set_handler_locked(data, handle_edge_irq);

		break;

	case IRQ_TYPE_LEVEL_HIGH:

CRA Git | Maintained and supported by SUSTech CRA and CCSE