diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-30 12:02:52 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-30 12:02:52 +0800 |
| commit | f83b09c3edc03ebcb59e65d6c37bc1bdb49b8210 (patch) | |
| tree | 4617c279cb52c31774284c0bde1ab4fce7efb482 /include/dt-bindings/pinctrl/omap.h | |
| parent | c19848defd4890f84d733c14b73dcbc87ea180a4 (diff) | |
| parent | eddc563b9850ce692c6040ef0f4575aea2396d33 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rtlsk-v4.4-17.11-rt
Diffstat (limited to 'include/dt-bindings/pinctrl/omap.h')
| -rw-r--r-- | include/dt-bindings/pinctrl/omap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h index 13949259705a..0d4fe32b3ae2 100644 --- a/include/dt-bindings/pinctrl/omap.h +++ b/include/dt-bindings/pinctrl/omap.h @@ -45,8 +45,8 @@ #define PIN_OFF_NONE 0 #define PIN_OFF_OUTPUT_HIGH (OFF_EN | OFFOUT_EN | OFFOUT_VAL) #define PIN_OFF_OUTPUT_LOW (OFF_EN | OFFOUT_EN) -#define PIN_OFF_INPUT_PULLUP (OFF_EN | OFF_PULL_EN | OFF_PULL_UP) -#define PIN_OFF_INPUT_PULLDOWN (OFF_EN | OFF_PULL_EN) +#define PIN_OFF_INPUT_PULLUP (OFF_EN | OFFOUT_EN | OFF_PULL_EN | OFF_PULL_UP) +#define PIN_OFF_INPUT_PULLDOWN (OFF_EN | OFFOUT_EN | OFF_PULL_EN) #define PIN_OFF_WAKEUPENABLE WAKEUP_EN /* |