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

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

Pull gpio fixes from Bartosz Golaszewski:
 "Two OF lookup quirks and one fix for an issue in the generic gpio-mmio
  driver:

   - add two OF lookup quirks for TSC2005 and MIPS Lantiq

   - don't try to figure out bgpio_bits from the 'ngpios' property in
     gpio-mmio"

* tag 'gpio-fixes-for-v6.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpiolib: of: add polarity quirk for TSC2005
  gpio: mmio: do not calculate bgpio_bits via "ngpios"
  gpiolib: of: fix lookup quirk for MIPS Lantiq
parents 5cc46711 f8d76c2c

drivers/gpio/gpio-mmio.c

+0 −2
Original line number Diff line number Diff line
@@ -619,8 +619,6 @@ int bgpio_init(struct gpio_chip *gc, struct device *dev, 
	ret = gpiochip_get_ngpios(gc, dev);

	if (ret)

		gc->ngpio = gc->bgpio_bits;

	else

		gc->bgpio_bits = roundup_pow_of_two(round_up(gc->ngpio, 8));



	ret = bgpio_setup_io(gc, dat, set, clr, flags);

	if (ret)

drivers/gpio/gpiolib-of.c

+20 −2
Original line number Diff line number Diff line
@@ -202,6 +202,24 @@ static void of_gpio_try_fixup_polarity(const struct device_node *np, 
		 * helper, and be consistent with what other drivers do.

		 */

		{ "qi,lb60",		"rb-gpios",	true },

#endif

#if IS_ENABLED(CONFIG_PCI_LANTIQ)

		/*

		 * According to the PCI specification, the RST# pin is an

		 * active-low signal. However, most of the device trees that

		 * have been widely used for a long time incorrectly describe

		 * reset GPIO as active-high, and were also using wrong name

		 * for the property.

		 */

		{ "lantiq,pci-xway",	"gpio-reset",	false },

#endif

#if IS_ENABLED(CONFIG_TOUCHSCREEN_TSC2005)

		/*

		 * DTS for Nokia N900 incorrectly specified "active high"

		 * polarity for the reset line, while the chip actually

		 * treats it as "active low".

		 */

		{ "ti,tsc2005",		"reset-gpios",	false },

#endif

	};

	unsigned int i;
@@ -504,9 +522,9 @@ static struct gpio_desc *of_find_gpio_rename(struct device_node *np, 
		{ "reset",	"reset-n-io",	"marvell,nfc-uart" },

		{ "reset",	"reset-n-io",	"mrvl,nfc-uart" },

#endif

#if !IS_ENABLED(CONFIG_PCI_LANTIQ)

#if IS_ENABLED(CONFIG_PCI_LANTIQ)

		/* MIPS Lantiq PCI */

		{ "reset",	"gpios-reset",	"lantiq,pci-xway" },

		{ "reset",	"gpio-reset",	"lantiq,pci-xway" },

#endif



		/*