diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-02-14 08:45:22 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-02-14 08:45:22 +0100 |
| commit | 92de6bc3a82df2e745c46155e8334659f871ea6f (patch) | |
| tree | 7f447f88a325a52517317124cc0f8d4d391eebb7 /include | |
| parent | 5340f23df8fe27a270af3fa1a93cd07293d23dd9 (diff) | |
| parent | 15add06841a3b0b4734a72847a73c71fd09ebe52 (diff) | |
| download | cachepc-linux-92de6bc3a82df2e745c46155e8334659f871ea6f.tar.gz cachepc-linux-92de6bc3a82df2e745c46155e8334659f871ea6f.zip | |
Merge branch 'ib-pca953x-config' into devel
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/gpio/gpio.h | 6 | ||||
| -rw-r--r-- | include/linux/gpio/machine.h | 2 | ||||
| -rw-r--r-- | include/linux/of_gpio.h | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/include/dt-bindings/gpio/gpio.h b/include/dt-bindings/gpio/gpio.h index 2cc10ae4bbb7..c029467e828b 100644 --- a/include/dt-bindings/gpio/gpio.h +++ b/include/dt-bindings/gpio/gpio.h @@ -33,4 +33,10 @@ #define GPIO_PERSISTENT 0 #define GPIO_TRANSITORY 8 +/* Bit 4 express pull up */ +#define GPIO_PULL_UP 16 + +/* Bit 5 express pull down */ +#define GPIO_PULL_DOWN 32 + #endif diff --git a/include/linux/gpio/machine.h b/include/linux/gpio/machine.h index daa44eac9241..69673be10213 100644 --- 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), }; /** diff --git a/include/linux/of_gpio.h b/include/linux/of_gpio.h index 163b79ecd01a..f9737dea9d1f 100644 --- a/include/linux/of_gpio.h +++ b/include/linux/of_gpio.h @@ -28,6 +28,8 @@ enum of_gpio_flags { OF_GPIO_SINGLE_ENDED = 0x2, OF_GPIO_OPEN_DRAIN = 0x4, OF_GPIO_TRANSITORY = 0x8, + OF_GPIO_PULL_UP = 0x10, + OF_GPIO_PULL_DOWN = 0x20, }; #ifdef CONFIG_OF_GPIO |