Merge tag 'gpio-fixes-for-v5.6-rc2' of... (dee7c111) · Commits · 戴 / test

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/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);

Admin message