Commit cbdaa5e7 authored by Linus Walleij's avatar Linus Walleij

Merge tag 'gpio-v5.4-rc8-fixes-for-linus' of...

Merge tag 'gpio-v5.4-rc8-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into fixes

gpio fixes for v5.4-rc8

- fix debounce times in max776520 and bd70528
- fix parallel build of gpio tools
parents 2727315d 0161a94e
...@@ -25,13 +25,13 @@ static int bd70528_set_debounce(struct bd70528_gpio *bdgpio, ...@@ -25,13 +25,13 @@ static int bd70528_set_debounce(struct bd70528_gpio *bdgpio,
case 0: case 0:
val = BD70528_DEBOUNCE_DISABLE; val = BD70528_DEBOUNCE_DISABLE;
break; break;
case 1 ... 15: case 1 ... 15000:
val = BD70528_DEBOUNCE_15MS; val = BD70528_DEBOUNCE_15MS;
break; break;
case 16 ... 30: case 15001 ... 30000:
val = BD70528_DEBOUNCE_30MS; val = BD70528_DEBOUNCE_30MS;
break; break;
case 31 ... 50: case 30001 ... 50000:
val = BD70528_DEBOUNCE_50MS; val = BD70528_DEBOUNCE_50MS;
break; break;
default: default:
......
...@@ -192,13 +192,13 @@ static int max77620_gpio_set_debounce(struct max77620_gpio *mgpio, ...@@ -192,13 +192,13 @@ static int max77620_gpio_set_debounce(struct max77620_gpio *mgpio,
case 0: case 0:
val = MAX77620_CNFG_GPIO_DBNC_None; val = MAX77620_CNFG_GPIO_DBNC_None;
break; break;
case 1000 ... 8000: case 1 ... 8000:
val = MAX77620_CNFG_GPIO_DBNC_8ms; val = MAX77620_CNFG_GPIO_DBNC_8ms;
break; break;
case 9000 ... 16000: case 8001 ... 16000:
val = MAX77620_CNFG_GPIO_DBNC_16ms; val = MAX77620_CNFG_GPIO_DBNC_16ms;
break; break;
case 17000 ... 32000: case 16001 ... 32000:
val = MAX77620_CNFG_GPIO_DBNC_32ms; val = MAX77620_CNFG_GPIO_DBNC_32ms;
break; break;
default: default:
......
gpio-utils-y += gpio-utils.o
lsgpio-y += lsgpio.o gpio-utils.o lsgpio-y += lsgpio.o gpio-utils.o
gpio-hammer-y += gpio-hammer.o gpio-utils.o gpio-hammer-y += gpio-hammer.o gpio-utils.o
gpio-event-mon-y += gpio-event-mon.o gpio-utils.o gpio-event-mon-y += gpio-event-mon.o gpio-utils.o
...@@ -35,11 +35,15 @@ $(OUTPUT)include/linux/gpio.h: ../../include/uapi/linux/gpio.h ...@@ -35,11 +35,15 @@ $(OUTPUT)include/linux/gpio.h: ../../include/uapi/linux/gpio.h
prepare: $(OUTPUT)include/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
# #
LSGPIO_IN := $(OUTPUT)lsgpio-in.o LSGPIO_IN := $(OUTPUT)lsgpio-in.o
$(LSGPIO_IN): prepare FORCE $(LSGPIO_IN): prepare FORCE $(OUTPUT)gpio-utils-in.o
$(Q)$(MAKE) $(build)=lsgpio $(Q)$(MAKE) $(build)=lsgpio
$(OUTPUT)lsgpio: $(LSGPIO_IN) $(OUTPUT)lsgpio: $(LSGPIO_IN)
$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
...@@ -48,7 +52,7 @@ $(OUTPUT)lsgpio: $(LSGPIO_IN) ...@@ -48,7 +52,7 @@ $(OUTPUT)lsgpio: $(LSGPIO_IN)
# gpio-hammer # gpio-hammer
# #
GPIO_HAMMER_IN := $(OUTPUT)gpio-hammer-in.o 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 $(Q)$(MAKE) $(build)=gpio-hammer
$(OUTPUT)gpio-hammer: $(GPIO_HAMMER_IN) $(OUTPUT)gpio-hammer: $(GPIO_HAMMER_IN)
$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
...@@ -57,7 +61,7 @@ $(OUTPUT)gpio-hammer: $(GPIO_HAMMER_IN) ...@@ -57,7 +61,7 @@ $(OUTPUT)gpio-hammer: $(GPIO_HAMMER_IN)
# gpio-event-mon # gpio-event-mon
# #
GPIO_EVENT_MON_IN := $(OUTPUT)gpio-event-mon-in.o 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 $(Q)$(MAKE) $(build)=gpio-event-mon
$(OUTPUT)gpio-event-mon: $(GPIO_EVENT_MON_IN) $(OUTPUT)gpio-event-mon: $(GPIO_EVENT_MON_IN)
$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment