Commit 1d40890a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull GPIO fixes from Linus Walleij:

 - Revert two patches to gpio_do_set_config() and implement the proper
   solution that works, also drop an unecessary call in set_config()

 - Fix up the lockdep class for hierarchical IRQ domains.

 - Remove some bridge code for line directions.

 - Fix a register access bug in the Xilinx driver.

* tag 'gpio-v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: sifive: fix static checker warning
  spmi: pmic-arb: Set lockdep class for hierarchical irq domains
  gpio: xilinx: Fix bug where the wrong GPIO register is written to
  gpiolib: remove unnecessary argument from set_config call
  gpio: bd71828: Remove unneeded defines for GPIO_LINE_DIRECTION_IN/OUT
  MAINTAINERS: Sort entries in database for GPIO
  gpiolib: fix gpio_do_set_config()
  Revert "gpiolib: remove set but not used variable 'config'"
  Revert "gpiolib: Remove duplicated function gpio_do_set_config()"
parents 64ae1342 a924eae7

MAINTAINERS

+14 −14
Original line number Diff line number Diff line
@@ -2796,11 +2796,11 @@ F: drivers/block/aoe/ 














ATHEROS 71XX/9XXX GPIO DRIVER















M:	Alban Bedel <albeu@free.fr>













S:	Maintained















W:	https://github.com/AlbanBedel/linux















T:	git git://github.com/AlbanBedel/linux













S:	Maintained













F:	drivers/gpio/gpio-ath79.c















F:	Documentation/devicetree/bindings/gpio/gpio-ath79.txt













F:	drivers/gpio/gpio-ath79.c





























ATHEROS 71XX/9XXX USB PHY DRIVER















M:	Alban Bedel <albeu@free.fr>










@@ -3422,8 +3422,8 @@ BROADCOM BRCMSTB GPIO DRIVER













M:	Gregory Fong <gregory.0xf0@gmail.com>















L:	bcm-kernel-feedback-list@broadcom.com















S:	Supported













F:	drivers/gpio/gpio-brcmstb.c















F:	Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt













F:	drivers/gpio/gpio-brcmstb.c





























BROADCOM BRCMSTB I2C DRIVER















M:	Kamal Dasu <kdasu.kdev@gmail.com>










@@ -3481,8 +3481,8 @@ BROADCOM KONA GPIO DRIVER













M:	Ray Jui <rjui@broadcom.com>















L:	bcm-kernel-feedback-list@broadcom.com















S:	Supported













F:	drivers/gpio/gpio-bcm-kona.c















F:	Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt













F:	drivers/gpio/gpio-bcm-kona.c





























BROADCOM NETXTREME-E ROCE DRIVER















M:	Selvin Xavier <selvin.xavier@broadcom.com>










@@ -3597,8 +3597,8 @@ F:	sound/pci/bt87x.c



























BT8XXGPIO DRIVER















M:	Michael Buesch <m@bues.ch>













W:	http://bu3sch.de/btgpio.php















S:	Maintained













W:	http://bu3sch.de/btgpio.php















F:	drivers/gpio/gpio-bt8xx.c





























BTRFS FILE SYSTEM










@@ -7143,18 +7143,18 @@ GPIO SUBSYSTEM













M:	Linus Walleij <linus.walleij@linaro.org>















M:	Bartosz Golaszewski <bgolaszewski@baylibre.com>















L:	linux-gpio@vger.kernel.org













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git















S:	Maintained













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git













F:	Documentation/ABI/obsolete/sysfs-gpio













F:	Documentation/ABI/testing/gpio-cdev













F:	Documentation/admin-guide/gpio/















F:	Documentation/devicetree/bindings/gpio/















F:	Documentation/driver-api/gpio/













F:	Documentation/admin-guide/gpio/













F:	Documentation/ABI/testing/gpio-cdev













F:	Documentation/ABI/obsolete/sysfs-gpio















F:	drivers/gpio/













F:	include/asm-generic/gpio.h















F:	include/linux/gpio/















F:	include/linux/gpio.h















F:	include/linux/of_gpio.h













F:	include/asm-generic/gpio.h















F:	include/uapi/linux/gpio.h















F:	tools/gpio/
























@@ -8055,8 +8055,8 @@ F:	drivers/scsi/ips.*













ICH LPC AND GPIO DRIVER















M:	Peter Tyser <ptyser@xes-inc.com>















S:	Maintained













F:	drivers/mfd/lpc_ich.c















F:	drivers/gpio/gpio-ich.c













F:	drivers/mfd/lpc_ich.c





























ICY I2C DRIVER















M:	Max Staudt <max@enpas.org>










@@ -16075,8 +16075,8 @@ F:	Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt













SYNOPSYS CREG GPIO DRIVER















M:	Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>















S:	Maintained













F:	drivers/gpio/gpio-creg-snps.c















F:	Documentation/devicetree/bindings/gpio/snps,creg-gpio.txt













F:	drivers/gpio/gpio-creg-snps.c





























SYNOPSYS DESIGNWARE 8250 UART DRIVER















R:	Andy Shevchenko <andriy.shevchenko@linux.intel.com>









@@ -16087,8 +16087,8 @@ SYNOPSYS DESIGNWARE APB GPIO DRIVER













M:	Hoan Tran <hoan@os.amperecomputing.com>















L:	linux-gpio@vger.kernel.org















S:	Maintained













F:	drivers/gpio/gpio-dwapb.c















F:	Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt













F:	drivers/gpio/gpio-dwapb.c





























SYNOPSYS DESIGNWARE AXI DMAC DRIVER















M:	Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>










@@ -18414,8 +18414,8 @@ M:	Nandor Han <nandor.han@ge.com>













M:	Semi Malinen <semi.malinen@ge.com>















L:	linux-gpio@vger.kernel.org















S:	Maintained













F:	drivers/gpio/gpio-xra1403.c















F:	Documentation/devicetree/bindings/gpio/gpio-xra1403.txt













F:	drivers/gpio/gpio-xra1403.c





























XTENSA XTFPGA PLATFORM SUPPORT















M:	Max Filippov <jcmvbkbc@gmail.com>

























drivers/gpio/gpio-bd71828.c



+0
−10






























Original line number
Diff line number
Diff line








@@ -10,16 +10,6 @@













#define GPIO_OUT_REG(off) (BD71828_REG_GPIO_CTRL1 + (off))















#define HALL_GPIO_OFFSET 3





























/*













 * These defines can be removed when













 * "gpio: Add definition for GPIO direction"













 * (9208b1e77d6e8e9776f34f46ef4079ecac9c3c25 in GPIO tree) gets merged,













 */













#ifndef GPIO_LINE_DIRECTION_IN













	#define GPIO_LINE_DIRECTION_IN 1













	#define GPIO_LINE_DIRECTION_OUT 0













#endif





























struct bd71828_gpio {















	struct rohm_regmap_dev chip;















	struct gpio_chip gpio;

































drivers/gpio/gpio-sifive.c



+3
−3






























Original line number
Diff line number
Diff line








@@ -35,7 +35,7 @@ struct sifive_gpio {













	void __iomem		*base;















	struct gpio_chip	gc;















	struct regmap		*regs;













	u32			irq_state;













	unsigned long		irq_state;















	unsigned int		trigger[SIFIVE_GPIO_MAX];















	unsigned int		irq_parent[SIFIVE_GPIO_MAX];















};










@@ -94,7 +94,7 @@ static void sifive_gpio_irq_enable(struct irq_data *d)













	spin_unlock_irqrestore(&gc->bgpio_lock, flags);































	/* Enable interrupts */













	assign_bit(offset, (unsigned long *)&chip->irq_state, 1);













	assign_bit(offset, &chip->irq_state, 1);















	sifive_gpio_set_ie(chip, offset);















}

























@@ -104,7 +104,7 @@ static void sifive_gpio_irq_disable(struct irq_data *d)













	struct sifive_gpio *chip = gpiochip_get_data(gc);















	int offset = irqd_to_hwirq(d) % SIFIVE_GPIO_MAX;





























	assign_bit(offset, (unsigned long *)&chip->irq_state, 0);













	assign_bit(offset, &chip->irq_state, 0);















	sifive_gpio_set_ie(chip, offset);















	irq_chip_disable_parent(d);















}

































drivers/gpio/gpio-xilinx.c



+3
−2






























Original line number
Diff line number
Diff line








@@ -147,9 +147,10 @@ static void xgpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,













	for (i = 0; i < gc->ngpio; i++) {















		if (*mask == 0)















			break;













		/* Once finished with an index write it out to the register */















		if (index !=  xgpio_index(chip, i)) {















			xgpio_writereg(chip->regs + XGPIO_DATA_OFFSET +













				       xgpio_regoffset(chip, i),













				       index * XGPIO_CHANNEL_OFFSET,















				       chip->gpio_state[index]);















			spin_unlock_irqrestore(&chip->gpio_lock[index], flags);















			index =  xgpio_index(chip, i);









@@ -165,7 +166,7 @@ static void xgpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,













	}































	xgpio_writereg(chip->regs + XGPIO_DATA_OFFSET +













		       xgpio_regoffset(chip, i), chip->gpio_state[index]);













		       index * XGPIO_CHANNEL_OFFSET, chip->gpio_state[index]);































	spin_unlock_irqrestore(&chip->gpio_lock[index], flags);















}

































drivers/gpio/gpiolib.c



+25
−5






























Original line number
Diff line number
Diff line








@@ -3035,13 +3035,33 @@ EXPORT_SYMBOL_GPL(gpiochip_free_own_desc);













 * rely on gpio_request() having been called beforehand.















 */





























static int gpio_set_config(struct gpio_chip *gc, unsigned int offset,













			   enum pin_config_param mode)













static int gpio_do_set_config(struct gpio_chip *gc, unsigned int offset,













			      unsigned long config)















{















	if (!gc->set_config)















		return -ENOTSUPP;





























	return gc->set_config(gc, offset, mode);













	return gc->set_config(gc, offset, config);













}



























static int gpio_set_config(struct gpio_chip *gc, unsigned int offset,













			   enum pin_config_param mode)













{













	unsigned long config;













	unsigned arg;



























	switch (mode) {













	case PIN_CONFIG_BIAS_PULL_DOWN:













	case PIN_CONFIG_BIAS_PULL_UP:













		arg = 1;













		break;



























	default:













		arg = 0;













	}



























	config = PIN_CONF_PACKED(mode, arg);













	return gpio_do_set_config(gc, offset, config);















}































static int gpio_set_bias(struct gpio_chip *chip, struct gpio_desc *desc)










@@ -3277,7 +3297,7 @@ int gpiod_set_debounce(struct gpio_desc *desc, unsigned debounce)













	chip = desc->gdev->chip;































	config = pinconf_to_config_packed(PIN_CONFIG_INPUT_DEBOUNCE, debounce);













	return gpio_set_config(chip, gpio_chip_hwgpio(desc), config);













	return gpio_do_set_config(chip, gpio_chip_hwgpio(desc), config);















}















EXPORT_SYMBOL_GPL(gpiod_set_debounce);


























@@ -3311,7 +3331,7 @@ int gpiod_set_transitory(struct gpio_desc *desc, bool transitory)













	packed = pinconf_to_config_packed(PIN_CONFIG_PERSIST_STATE,















					  !transitory);















	gpio = gpio_chip_hwgpio(desc);













	rc = gpio_set_config(chip, gpio, packed);













	rc = gpio_do_set_config(chip, gpio, packed);















	if (rc == -ENOTSUPP) {















		dev_dbg(&desc->gdev->dev, "Persistence not supported for GPIO %d\n",















				gpio);









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE