Commit d537ae43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - fix interrupt handling in suspend and wakeup in gpio-vf610

 - fix a bug on setting direction to output in gpio-vf610

 - add a missing memset() in gpio ACPI code

* tag 'gpio-fixes-for-v6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpiolib: acpi: Add missing memset(0) to acpi_get_gpiod_from_data()
  gpio: vf610: set value before the direction to avoid a glitch
  gpio: vf610: mask the gpio irq in system suspend and support wakeup
parents 03027aa3 479ac419

drivers/gpio/gpio-vf610.c

+4 −3
Original line number Diff line number Diff line
@@ -126,14 +126,14 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, 
	unsigned long mask = BIT(gpio);

	u32 val;



	vf610_gpio_set(chip, gpio, value);



	if (port->sdata && port->sdata->have_paddr) {

		val = vf610_gpio_readl(port->gpio_base + GPIO_PDDR);

		val |= mask;

		vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);

	}



	vf610_gpio_set(chip, gpio, value);



	return pinctrl_gpio_direction_output(chip->base + gpio);

}
@@ -246,7 +246,8 @@ static const struct irq_chip vf610_irqchip = { 
	.irq_unmask = vf610_gpio_irq_unmask,

	.irq_set_type = vf610_gpio_irq_set_type,

	.irq_set_wake = vf610_gpio_irq_set_wake,

	.flags = IRQCHIP_IMMUTABLE,

	.flags = IRQCHIP_IMMUTABLE | IRQCHIP_MASK_ON_SUSPEND

			| IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND,

	GPIOCHIP_IRQ_RESOURCE_HELPERS,

};

drivers/gpio/gpiolib-acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -951,6 +951,7 @@ static struct gpio_desc *acpi_get_gpiod_from_data(struct fwnode_handle *fwnode, 
	if (!propname)

		return ERR_PTR(-EINVAL);



	memset(&lookup, 0, sizeof(lookup));

	lookup.index = index;



	ret = acpi_gpio_property_lookup(fwnode, propname, index, &lookup);