tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull gpio fixes from Bartosz Golaszewski:

- fix wake-up interrupt support on gpio-mxc

- zero the padding bytes in a structure passed to user-space in the
GPIO character device

- require HAS_IOPORT_MAP in two drivers that need it to fix a Kbuild
issue

* tag 'gpio-fixes-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
gpio: AMD8111 and TQMX86 require HAS_IOPORT_MAP
gpiolib: cdev: zero padding during conversion to gpioline_info_changed
gpio: mxc: Fix disabled interrupt wake-up support

Linus Torvalds c13e3021 e41fc7c8

+4 -1
+2
drivers/gpio/Kconfig
··· 1383 1383 config GPIO_TQMX86 1384 1384 tristate "TQ-Systems QTMX86 GPIO" 1385 1385 depends on MFD_TQMX86 || COMPILE_TEST 1386 + depends on HAS_IOPORT_MAP 1386 1387 select GPIOLIB_IRQCHIP 1387 1388 help 1388 1389 This driver supports GPIO on the TQMX86 IO controller. ··· 1451 1450 config GPIO_AMD8111 1452 1451 tristate "AMD 8111 GPIO driver" 1453 1452 depends on X86 || COMPILE_TEST 1453 + depends on HAS_IOPORT_MAP 1454 1454 help 1455 1455 The AMD 8111 south bridge contains 32 GPIO pins which can be used. 1456 1456
+1 -1
drivers/gpio/gpio-mxc.c
··· 334 334 ct->chip.irq_unmask = irq_gc_mask_set_bit; 335 335 ct->chip.irq_set_type = gpio_set_irq_type; 336 336 ct->chip.irq_set_wake = gpio_set_wake_irq; 337 - ct->chip.flags = IRQCHIP_MASK_ON_SUSPEND; 337 + ct->chip.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND; 338 338 ct->regs.ack = GPIO_ISR; 339 339 ct->regs.mask = GPIO_IMR; 340 340
+1
drivers/gpio/gpiolib-cdev.c
··· 1880 1880 struct gpio_v2_line_info_changed *lic_v2, 1881 1881 struct gpioline_info_changed *lic_v1) 1882 1882 { 1883 + memset(lic_v1, 0, sizeof(*lic_v1)); 1883 1884 gpio_v2_line_info_to_v1(&lic_v2->info, &lic_v1->info); 1884 1885 lic_v1->timestamp = lic_v2->timestamp_ns; 1885 1886 lic_v1->event_type = lic_v2->event_type;