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

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

Pull gpio fixes from Bartosz Golaszewski:
 "Another round of driver one-liners from the GPIO subsystem:

   - disable pin control on MMP GPIOs in gpio-pxa

   - fix the GPIO number passed to one of the pinctrl callbacks in
     gpio-aspeed"

* tag 'gpio-fixes-for-v6.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config()
  gpio: pxa: disable pinctrl calls for MMP_GPIO
parents 8fea9f8f f9315f17

drivers/gpio/gpio-aspeed.c

+1 −1
Original line number Diff line number Diff line
@@ -973,7 +973,7 @@ static int aspeed_gpio_set_config(struct gpio_chip *chip, unsigned int offset, 
	else if (param == PIN_CONFIG_BIAS_DISABLE ||

			param == PIN_CONFIG_BIAS_PULL_DOWN ||

			param == PIN_CONFIG_DRIVE_STRENGTH)

		return pinctrl_gpio_set_config(offset, config);

		return pinctrl_gpio_set_config(chip->base + offset, config);

	else if (param == PIN_CONFIG_DRIVE_OPEN_DRAIN ||

			param == PIN_CONFIG_DRIVE_OPEN_SOURCE)

		/* Return -ENOTSUPP to trigger emulation, as per datasheet */

drivers/gpio/gpio-pxa.c

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ static bool pxa_gpio_has_pinctrl(void) 
	switch (gpio_type) {

	case PXA3XX_GPIO:

	case MMP2_GPIO:

	case MMP_GPIO:

		return false;



	default: