Merge branch 'ib-pca953x-config' into devel

2019-02-14 08:45:22 +01:00
parent 5340f23df8 15add06841
commit 92de6bc3a8
8 changed files with 127 additions and 18 deletions
--- a/include/linux/gpio/machine.h
+++ b/include/linux/gpio/machine.h
@@ -12,6 +12,8 @@ enum gpio_lookup_flags {
 	GPIO_OPEN_SOURCE = (1 << 2),
 	GPIO_PERSISTENT = (0 << 3),
 	GPIO_TRANSITORY = (1 << 3),
+	GPIO_PULL_UP = (1 << 4),
+	GPIO_PULL_DOWN = (1 << 5),
 };

 /**