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

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

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

Pull GPIO fixes from Linus Walleij:
 "A last set of small fixes for GPIO, this cycle was quite busy.

   - Fix debounce delays on the MAX77620 GPIO expander

   - Use the correct unit for debounce times on the BD70528 GPIO expander

   - Get proper deps for parallel builds of the GPIO tools

   - Add a specific ACPI quirk for the Terra Pad 1061"

* tag 'gpio-v5.4-5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpiolib: acpi: Add Terra Pad 1061 to the run_edge_events_on_boot_blacklist
  tools: gpio: Correctly add make dependencies for gpio_utils
  gpio: bd70528: Use correct unit for debounce times
  gpio: max77620: Fixup debounce delays
parents d324810a cbdaa5e7

drivers/gpio/gpio-bd70528.c

+3 −3
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ static int bd70528_set_debounce(struct bd70528_gpio *bdgpio, 
	case 0:

		val = BD70528_DEBOUNCE_DISABLE;

		break;

	case 1 ... 15:

	case 1 ... 15000:

		val = BD70528_DEBOUNCE_15MS;

		break;

	case 16 ... 30:

	case 15001 ... 30000:

		val = BD70528_DEBOUNCE_30MS;

		break;

	case 31 ... 50:

	case 30001 ... 50000:

		val = BD70528_DEBOUNCE_50MS;

		break;

	default:

drivers/gpio/gpio-max77620.c

+3 −3
Original line number Diff line number Diff line
@@ -192,13 +192,13 @@ static int max77620_gpio_set_debounce(struct max77620_gpio *mgpio, 
	case 0:

		val = MAX77620_CNFG_GPIO_DBNC_None;

		break;

	case 1000 ... 8000:

	case 1 ... 8000:

		val = MAX77620_CNFG_GPIO_DBNC_8ms;

		break;

	case 9000 ... 16000:

	case 8001 ... 16000:

		val = MAX77620_CNFG_GPIO_DBNC_16ms;

		break;

	case 17000 ... 32000:

	case 16001 ... 32000:

		val = MAX77620_CNFG_GPIO_DBNC_32ms;

		break;

	default:

drivers/gpio/gpiolib-acpi.c

+17 −0
Original line number Diff line number Diff line
@@ -1304,11 +1304,28 @@ late_initcall_sync(acpi_gpio_handle_deferred_request_irqs); 


static const struct dmi_system_id run_edge_events_on_boot_blacklist[] = {

	{

		/*

		 * The Minix Neo Z83-4 has a micro-USB-B id-pin handler for

		 * a non existing micro-USB-B connector which puts the HDMI

		 * DDC pins in GPIO mode, breaking HDMI support.

		 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "MINIX"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Z83-4"),

		}

	},

	{

		/*

		 * The Terra Pad 1061 has a micro-USB-B id-pin handler, which

		 * instead of controlling the actual micro-USB-B turns the 5V

		 * boost for its USB-A connector off. The actual micro-USB-B

		 * connector is wired for charging only.

		 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Wortmann_AG"),

			DMI_MATCH(DMI_PRODUCT_NAME, "TERRA_PAD_1061"),

		}

	},

	{} /* Terminating entry */

};

tools/gpio/Build

+1 −0
Original line number Diff line number Diff line 
gpio-utils-y += gpio-utils.o

lsgpio-y += lsgpio.o gpio-utils.o

gpio-hammer-y += gpio-hammer.o gpio-utils.o

gpio-event-mon-y += gpio-event-mon.o gpio-utils.o

tools/gpio/Makefile

+7 −3
Original line number Diff line number Diff line
@@ -35,11 +35,15 @@ $(OUTPUT)include/linux/gpio.h: ../../include/uapi/linux/gpio.h 


prepare: $(OUTPUT)include/linux/gpio.h



GPIO_UTILS_IN := $(output)gpio-utils-in.o

$(GPIO_UTILS_IN): prepare FORCE

	$(Q)$(MAKE) $(build)=gpio-utils



#

# lsgpio

#

LSGPIO_IN := $(OUTPUT)lsgpio-in.o

$(LSGPIO_IN): prepare FORCE

$(LSGPIO_IN): prepare FORCE $(OUTPUT)gpio-utils-in.o

	$(Q)$(MAKE) $(build)=lsgpio

$(OUTPUT)lsgpio: $(LSGPIO_IN)

	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
@@ -48,7 +52,7 @@ $(OUTPUT)lsgpio: $(LSGPIO_IN) 
# gpio-hammer

#

GPIO_HAMMER_IN := $(OUTPUT)gpio-hammer-in.o

$(GPIO_HAMMER_IN): prepare FORCE

$(GPIO_HAMMER_IN): prepare FORCE $(OUTPUT)gpio-utils-in.o

	$(Q)$(MAKE) $(build)=gpio-hammer

$(OUTPUT)gpio-hammer: $(GPIO_HAMMER_IN)

	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
@@ -57,7 +61,7 @@ $(OUTPUT)gpio-hammer: $(GPIO_HAMMER_IN) 
# gpio-event-mon

#

GPIO_EVENT_MON_IN := $(OUTPUT)gpio-event-mon-in.o

$(GPIO_EVENT_MON_IN): prepare FORCE

$(GPIO_EVENT_MON_IN): prepare FORCE $(OUTPUT)gpio-utils-in.o

	$(Q)$(MAKE) $(build)=gpio-event-mon

$(OUTPUT)gpio-event-mon: $(GPIO_EVENT_MON_IN)

	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@