Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'gpio-v5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "The patch hitting the MMC/SD subsystem is fixing up my own mess when
  moving semantics from MMC/SD over to gpiolib. Ulf is on vacation but I
  managed to reach him on chat and obtain his ACK.

  The other two are early-rc fixes that are not super serious but pretty
  annoying so I'd like to get rid of them.

  Summary:

   - Get rid of some WARN_ON() from the ACPI code

   - Staticize a symbol

   - Fix MMC polarity detection"

* tag 'gpio-v5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  mmc: core: don't override the CD GPIO level when "cd-inverted" is set
  gpio: pca953x: Make symbol 'pca953x_i2c_regmap' static
  gpiolib-acpi: Remove unnecessary WARN_ON from acpi_gpiochip_free_interrupts
parents 9deb9e16 e3e4767b

drivers/gpio/gpio-pca953x.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static bool pca953x_volatile_register(struct device *dev, unsigned int reg) 
	return pca953x_check_register(chip, reg, bank);

}



const struct regmap_config pca953x_i2c_regmap = {

static const struct regmap_config pca953x_i2c_regmap = {

	.reg_bits = 8,

	.val_bits = 8,

drivers/gpio/gpiolib-acpi.c

+1 −6
Original line number Diff line number Diff line
@@ -357,8 +357,6 @@ void acpi_gpiochip_free_interrupts(struct gpio_chip *chip) 
	mutex_unlock(&acpi_gpio_deferred_req_irqs_lock);



	list_for_each_entry_safe_reverse(event, ep, &acpi_gpio->events, node) {

		struct gpio_desc *desc;



		if (event->irq_requested) {

			if (event->irq_is_wake)

				disable_irq_wake(event->irq);
@@ -366,11 +364,8 @@ void acpi_gpiochip_free_interrupts(struct gpio_chip *chip) 
			free_irq(event->irq, event);

		}



		desc = event->desc;

		if (WARN_ON(IS_ERR(desc)))

			continue;

		gpiochip_unlock_as_irq(chip, event->pin);

		gpiochip_free_own_desc(desc);

		gpiochip_free_own_desc(event->desc);

		list_del(&event->node);

		kfree(event);

	}

drivers/mmc/core/host.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ int mmc_of_parse(struct mmc_host *host) 
		if (device_property_read_bool(dev, "broken-cd"))

			host->caps |= MMC_CAP_NEEDS_POLL;



		ret = mmc_gpiod_request_cd(host, "cd", 0, true,

		ret = mmc_gpiod_request_cd(host, "cd", 0, false,

					   cd_debounce_delay_ms * 1000,

					   &cd_gpio_invert);

		if (!ret)