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

Commit 2ffb57df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull GPIO fixes from Linus Walleij:
 "Just a smallish OF fix and a driver fix:

   - OF flag fix for special regulator flags

   - fix up the Uniphier IRQ callback"

* tag 'gpio-v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: uniphier: set legitimate irq trigger type in .to_irq hook
  gpio: of: Handle fixed regulator flags properly
parents 7648c446 bbfbf04c

drivers/gpio/gpio-uniphier.c

+5 −1
Original line number Diff line number Diff line
@@ -181,7 +181,11 @@ static int uniphier_gpio_to_irq(struct gpio_chip *chip, unsigned int offset) 
	fwspec.fwnode = of_node_to_fwnode(chip->parent->of_node);

	fwspec.param_count = 2;

	fwspec.param[0] = offset - UNIPHIER_GPIO_IRQ_OFFSET;

	fwspec.param[1] = IRQ_TYPE_NONE;

	/*

	 * IRQ_TYPE_NONE is rejected by the parent irq domain. Set LEVEL_HIGH

	 * temporarily. Anyway, ->irq_set_type() will override it later.

	 */

	fwspec.param[1] = IRQ_TYPE_LEVEL_HIGH;



	return irq_create_fwspec_mapping(&fwspec);

}

drivers/gpio/gpiolib-of.c

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ static void of_gpio_flags_quirks(struct device_node *np, 
	 * Note that active low is the default.

	 */

	if (IS_ENABLED(CONFIG_REGULATOR) &&

	    (of_device_is_compatible(np, "reg-fixed-voltage") ||

	    (of_device_is_compatible(np, "regulator-fixed") ||

	     of_device_is_compatible(np, "reg-fixed-voltage") ||

	     of_device_is_compatible(np, "regulator-gpio"))) {

		/*

		 * The regulator GPIO handles are specified such that the