diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-22 11:07:49 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-22 11:07:49 +0000 |
| commit | 7280e4222be4e88e2e8dd3cf797f093ffaebfb8b (patch) | |
| tree | 0c70042dff00ef136c449ae922e48b660b17c272 /include/dt-bindings/pinctrl/dra.h | |
| parent | 3070bdc3c302c80996502639e03a2e550571e152 (diff) | |
| parent | 1f0f80ecae848b0ca2ca632e94568721494f09f0 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-android-14.11
Diffstat (limited to 'include/dt-bindings/pinctrl/dra.h')
| -rw-r--r-- | include/dt-bindings/pinctrl/dra.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/dt-bindings/pinctrl/dra.h b/include/dt-bindings/pinctrl/dra.h index 3d33794e4f3e..7448edff4723 100644 --- a/include/dt-bindings/pinctrl/dra.h +++ b/include/dt-bindings/pinctrl/dra.h @@ -40,8 +40,8 @@ /* Active pin states */ #define PIN_OUTPUT (0 | PULL_DIS) -#define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP) -#define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA) +#define PIN_OUTPUT_PULLUP (PULL_UP) +#define PIN_OUTPUT_PULLDOWN (0) #define PIN_INPUT (INPUT_EN | PULL_DIS) #define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL) #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP) |