Skip to content

Commit c13e302

Browse files
committed
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
2 parents e41fc7c + c6414e1 commit c13e302

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

drivers/gpio/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,6 +1383,7 @@ config GPIO_TPS68470
13831383
config GPIO_TQMX86
13841384
tristate "TQ-Systems QTMX86 GPIO"
13851385
depends on MFD_TQMX86 || COMPILE_TEST
1386+
depends on HAS_IOPORT_MAP
13861387
select GPIOLIB_IRQCHIP
13871388
help
13881389
This driver supports GPIO on the TQMX86 IO controller.
@@ -1450,6 +1451,7 @@ menu "PCI GPIO expanders"
14501451
config GPIO_AMD8111
14511452
tristate "AMD 8111 GPIO driver"
14521453
depends on X86 || COMPILE_TEST
1454+
depends on HAS_IOPORT_MAP
14531455
help
14541456
The AMD 8111 south bridge contains 32 GPIO pins which can be used.
14551457

drivers/gpio/gpio-mxc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ static int mxc_gpio_init_gc(struct mxc_gpio_port *port, int irq_base)
334334
ct->chip.irq_unmask = irq_gc_mask_set_bit;
335335
ct->chip.irq_set_type = gpio_set_irq_type;
336336
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;
338338
ct->regs.ack = GPIO_ISR;
339339
ct->regs.mask = GPIO_IMR;
340340

drivers/gpio/gpiolib-cdev.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1880,6 +1880,7 @@ static void gpio_v2_line_info_changed_to_v1(
18801880
struct gpio_v2_line_info_changed *lic_v2,
18811881
struct gpioline_info_changed *lic_v1)
18821882
{
1883+
memset(lic_v1, 0, sizeof(*lic_v1));
18831884
gpio_v2_line_info_to_v1(&lic_v2->info, &lic_v1->info);
18841885
lic_v1->timestamp = lic_v2->timestamp_ns;
18851886
lic_v1->event_type = lic_v2->event_type;

0 commit comments

Comments
 (0)