summaryrefslogtreecommitdiffstats
path: root/dts/include/dt-bindings
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-08-04 21:23:05 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-08-04 21:23:05 +0200
commite8ee06fe59e468dcd7404b8eed75d78af9c02593 (patch)
tree9fa40833523239ccb546a82cc9e530d511ed5fa2 /dts/include/dt-bindings
parent9f0942c873dc7bf20a74062fd1a0c903eeacbb5f (diff)
downloadbarebox-e8ee06fe59e468dcd7404b8eed75d78af9c02593.tar.gz
barebox-e8ee06fe59e468dcd7404b8eed75d78af9c02593.tar.xz
dts: update to v3.16
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/include/dt-bindings')
-rw-r--r--dts/include/dt-bindings/pinctrl/dra.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/dts/include/dt-bindings/pinctrl/dra.h b/dts/include/dt-bindings/pinctrl/dra.h
index 002a2855c0..3d33794e4f 100644
--- a/dts/include/dt-bindings/pinctrl/dra.h
+++ b/dts/include/dt-bindings/pinctrl/dra.h
@@ -30,7 +30,8 @@
#define MUX_MODE14 0xe
#define MUX_MODE15 0xf
-#define PULL_ENA (1 << 16)
+#define PULL_ENA (0 << 16)
+#define PULL_DIS (1 << 16)
#define PULL_UP (1 << 17)
#define INPUT_EN (1 << 18)
#define SLEWCONTROL (1 << 19)
@@ -38,10 +39,10 @@
#define WAKEUP_EVENT (1 << 25)
/* Active pin states */
-#define PIN_OUTPUT 0
+#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_INPUT INPUT_EN
+#define PIN_INPUT (INPUT_EN | PULL_DIS)
#define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL)
#define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP)
#define PIN_INPUT_PULLDOWN (PULL_ENA | INPUT_EN)