korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-24 19:45:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

gpio fixes for v5.14-rc5

Browse Source 
- revert a patch intruducing breakage in interrupt handling in gpio-mpc8xxx
 - correctly handle missing IRQs in gpio-tqmx86 by really making them optional
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAmEKmacACgkQEacuoBRx
 13JHnxAApzU5tliDwvceJN7SLmlJza6f/s8jj5KtUxWvclkg8yoWBw6d0hanmOHO
 I26UCLlZjMOyLAZLLcxHNGu4ZSF97Hs2eu+i2M743NtdbwE4Auo/hmG1SVJFZZ/O
 UXSUvq2SVx7SYbLnejbQ3K44LCCtcaDSC/EPRHoL6grY0jLN2Q6MwfN/90wJ6eSx
 5DhZcY6wusYjyO2XnWZ2VM0qf7dzFDZxL+UlD5XTDVoLnTfIN2dyhq9tZZ28xAc8
 hmZEVgobDheKoViq7GpOFA9TRxQsPVfXiDDJSjjaUdSSN2QxzJgN/cL11myBOGfh
 Yb/eSKsXOZA8lENo1BdiJ5zO0OXBkcCSP/0+ySh8eEvhI03P7fl/n54CvLik+KUi
 1le8L7U+OLFPBh7LHKXnnR404iXuGg9viBCTNd2OzascIZY986XbZLT+8O9/N0Uo
 m6DYOysD2h4zQEX8iRTTEj8vOdgAHjEIcj01quS91qXTJ4gv4RCpFdbyeuDHgsA2
 f7eIGJsITORX49G6E5wCifsBeEkIDJxLi9lbit5ZdIqp4C+GjgAYSy/JZBmye9Zc
 nefdGVhFdzXcmKCG/52nwnhLWPPJDIrcIZX5R0nrUTfdjpKCCKtyyF8XB5VjAkIR
 32n8Aa9XOwxMCR1Jx1t/wo0r/4rAyFB1GJvLkyoKs/Zh9esrFZY=
 =6gja
 -----END PGP SIGNATURE-----

Merge tag 'gpio-updates-for-v5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux

Pull gpio fixes from Bartosz Golaszewski:

 - revert a patch intruducing breakage in interrupt handling in
   gpio-mpc8xxx

 - correctly handle missing IRQs in gpio-tqmx86 by really making them
   optional

* tag 'gpio-updates-for-v5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: tqmx86: really make IRQ optional
  Revert "gpio: mpc8xxx: change the gpio interrupt flags."
This commit is contained in:
Linus Torvalds 2021-08-04 12:31:53 -07:00
commit 0c2e31d2bd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpio/gpio-mpc8xxx.c
View File

@ -405,7 +405,7 @@ static int mpc8xxx_probe(struct platform_device *pdev)
ret = devm_request_irq(&pdev->dev, mpc8xxx_gc->irqn, ret = devm_request_irq(&pdev->dev, mpc8xxx_gc->irqn,
mpc8xxx_gpio_irq_cascade, mpc8xxx_gpio_irq_cascade,
IRQF_SHARED, "gpio-cascade", IRQF_NO_THREAD | IRQF_SHARED, "gpio-cascade",
mpc8xxx_gc); mpc8xxx_gc);
if (ret) { if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,

6
drivers/gpio/gpio-tqmx86.c
View File

@ -238,8 +238,8 @@ static int tqmx86_gpio_probe(struct platform_device *pdev)
struct resource *res; struct resource *res;
int ret, irq; int ret, irq;
irq = platform_get_irq(pdev, 0); irq = platform_get_irq_optional(pdev, 0);
if (irq < 0) if (irq < 0 && irq != -ENXIO)
return irq; return irq;
res = platform_get_resource(pdev, IORESOURCE_IO, 0); res = platform_get_resource(pdev, IORESOURCE_IO, 0);
@ -278,7 +278,7 @@ static int tqmx86_gpio_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
if (irq) { if (irq > 0) {
struct irq_chip *irq_chip = &gpio->irq_chip; struct irq_chip *irq_chip = &gpio->irq_chip;
u8 irq_status; u8 irq_status;