Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+31
-9
+3
-3
drivers/gpio/gpio-bd70528.c
+3
-3
drivers/gpio/gpio-bd70528.c
···
25
25
case 0:
26
26
val = BD70528_DEBOUNCE_DISABLE;
27
27
break;
28
-
case 1 ... 15:
28
+
case 1 ... 15000:
29
29
val = BD70528_DEBOUNCE_15MS;
30
30
break;
31
-
case 16 ... 30:
31
+
case 15001 ... 30000:
32
32
val = BD70528_DEBOUNCE_30MS;
33
33
break;
34
-
case 31 ... 50:
34
+
case 30001 ... 50000:
35
35
val = BD70528_DEBOUNCE_50MS;
36
36
break;
37
37
default:
+3
-3
drivers/gpio/gpio-max77620.c
+3
-3
drivers/gpio/gpio-max77620.c
···
192
192
case 0:
193
193
val = MAX77620_CNFG_GPIO_DBNC_None;
194
194
break;
195
-
case 1000 ... 8000:
195
+
case 1 ... 8000:
196
196
val = MAX77620_CNFG_GPIO_DBNC_8ms;
197
197
break;
198
-
case 9000 ... 16000:
198
+
case 8001 ... 16000:
199
199
val = MAX77620_CNFG_GPIO_DBNC_16ms;
200
200
break;
201
-
case 17000 ... 32000:
201
+
case 16001 ... 32000:
202
202
val = MAX77620_CNFG_GPIO_DBNC_32ms;
203
203
break;
204
204
default:
+17
drivers/gpio/gpiolib-acpi.c
+17
drivers/gpio/gpiolib-acpi.c
···
1304
1304
1305
1305
static const struct dmi_system_id run_edge_events_on_boot_blacklist[] = {
1306
1306
{
1307
+
/*
1308
+
* The Minix Neo Z83-4 has a micro-USB-B id-pin handler for
1309
+
* a non existing micro-USB-B connector which puts the HDMI
1310
+
* DDC pins in GPIO mode, breaking HDMI support.
1311
+
*/
1307
1312
.matches = {
1308
1313
DMI_MATCH(DMI_SYS_VENDOR, "MINIX"),
1309
1314
DMI_MATCH(DMI_PRODUCT_NAME, "Z83-4"),
1315
+
}
1316
+
},
1317
+
{
1318
+
/*
1319
+
* The Terra Pad 1061 has a micro-USB-B id-pin handler, which
1320
+
* instead of controlling the actual micro-USB-B turns the 5V
1321
+
* boost for its USB-A connector off. The actual micro-USB-B
1322
+
* connector is wired for charging only.
1323
+
*/
1324
+
.matches = {
1325
+
DMI_MATCH(DMI_SYS_VENDOR, "Wortmann_AG"),
1326
+
DMI_MATCH(DMI_PRODUCT_NAME, "TERRA_PAD_1061"),
1310
1327
}
1311
1328
},
1312
1329
{} /* Terminating entry */
+1
tools/gpio/Build
+1
tools/gpio/Build
+7
-3
tools/gpio/Makefile
+7
-3
tools/gpio/Makefile
···
35
35
36
36
prepare: $(OUTPUT)include/linux/gpio.h
37
37
38
+
GPIO_UTILS_IN := $(output)gpio-utils-in.o
39
+
$(GPIO_UTILS_IN): prepare FORCE
40
+
$(Q)$(MAKE) $(build)=gpio-utils
41
+
38
42
#
39
43
# lsgpio
40
44
#
41
45
LSGPIO_IN := $(OUTPUT)lsgpio-in.o
42
-
$(LSGPIO_IN): prepare FORCE
46
+
$(LSGPIO_IN): prepare FORCE $(OUTPUT)gpio-utils-in.o
43
47
$(Q)$(MAKE) $(build)=lsgpio
44
48
$(OUTPUT)lsgpio: $(LSGPIO_IN)
45
49
$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
···
52
48
# gpio-hammer
53
49
#
54
50
GPIO_HAMMER_IN := $(OUTPUT)gpio-hammer-in.o
55
-
$(GPIO_HAMMER_IN): prepare FORCE
51
+
$(GPIO_HAMMER_IN): prepare FORCE $(OUTPUT)gpio-utils-in.o
56
52
$(Q)$(MAKE) $(build)=gpio-hammer
57
53
$(OUTPUT)gpio-hammer: $(GPIO_HAMMER_IN)
58
54
$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
···
61
57
# gpio-event-mon
62
58
#
63
59
GPIO_EVENT_MON_IN := $(OUTPUT)gpio-event-mon-in.o
64
-
$(GPIO_EVENT_MON_IN): prepare FORCE
60
+
$(GPIO_EVENT_MON_IN): prepare FORCE $(OUTPUT)gpio-utils-in.o
65
61
$(Q)$(MAKE) $(build)=gpio-event-mon
66
62
$(OUTPUT)gpio-event-mon: $(GPIO_EVENT_MON_IN)
67
63
$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@