summaryrefslogtreecommitdiffstats
path: root/dts/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-02-09 08:42:12 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-02-11 09:50:08 +0100
commite85ff327c2aeaa7ea5d53e308b4b4d0aef8dddd4 (patch)
treecb0a6ea5bc45dd9e689b5d53cde01ed7f0621424 /dts/include
parentc61cf95d46c8e6596e92b28e277eb7828d3797c9 (diff)
downloadbarebox-e85ff327c2aeaa7ea5d53e308b4b4d0aef8dddd4.tar.gz
barebox-e85ff327c2aeaa7ea5d53e308b4b4d0aef8dddd4.tar.xz
dts: update to v3.18-rc5
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/include')
-rw-r--r--dts/include/dt-bindings/pinctrl/dra.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/dts/include/dt-bindings/pinctrl/dra.h b/dts/include/dt-bindings/pinctrl/dra.h
index 3d33794e4f..7448edff47 100644
--- a/dts/include/dt-bindings/pinctrl/dra.h
+++ b/dts/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)