UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAl9SYnEACgkQEacuoBRx
 13KQvxAA4OWyNzR0P9RlOyw4Fq7Fzf6DhDet2ZWQ6GT1Kdr8Iw3eXKr7dQtBbxXP
 SoNbw3eJnzo8NDxTyxRjCcTXVzw5aRQIrqbwgaOFrumntMn5T8O9POGdvjdJKxWG
 bdSUIxkCo4K3jSBKgvBdw//1xm+WrRYmxxnOcY40fLcb2xNXuGd7iYvukRvUvNgK
 Ybq6tJIwtiOgC2IT935nFKpAWA0mOHF4xPgYjXgI0G+Wr6QphnZ/WG1UCRbAIsbS
 Q+M6oQ4bzw7tM17pRV/HtfQ9fRrQh6UjiNxKTdLAiUUQKIRW9efbPuDyUwNdmDb9
 kHiiN+lte0G8SjmSxCXJ+Ck3zTur+9ODo6dMZNp7QBKxuntfyF35ASdcfmUDjuLE
 zbQ/vq3gbjjRj+fkVXdoEMYjPkBGppeSkZlXaVw1Q+NRe3u7zxOP++AiDEHEbl1f
 3j7UPqM6G+Dxy03YG4shn0XvZ3lvMSd/4qKhBdEaP8V4p1bIGcKzzOwrp6J/NIGt
 nA/+BHslY0nf7c1lwB1VaCCX3k2QggQYtE2aZ7PsMo4281bgiZXUTilREsd/z+Gq
 /JEnWJnAHd9UnUWAcrdsoxeQPuUOvYoJgpROdMPya6KCuuHHpa1PlSBgD0RXmY3i
 RBg0G3FDtS5750F3gqgMSv2qTcgUx2Gh+IGBBQF47wij8z8IW7I=
 =6ty9
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Walleij 2020-09-12 13:13:58 +02:00
parent d012a7190f 5fcface659
commit 3c68e90fdb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpio/gpio-omap.c
View File

@ -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);

3
drivers/gpio/gpio-sprd.c
View File

@ -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: