summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2016-11-22 08:09:19 +0300
committerFlorian Fainelli <f.fainelli@gmail.com>2016-11-22 08:09:19 +0300
commite687607116bc45afcbbcd0097129573f9729ff21 (patch)
treed0bd833220950b03e2cd4edbda7a35184614e559 /include
parent7af371a70139d2e18350365d8685d4fc1cc67973 (diff)
parenta44e87b47148c6ee6b78509f47e6a15c0fae890a (diff)
downloadlinux-e687607116bc45afcbbcd0097129573f9729ff21.tar.xz
Merge tag 'bcm2835-dt-64-next-2016-11-18' into devicetree-arm64/next
This pull request brings thermal support to the BCM2837 DT, and a few other fixes. In order to get the thermal node that we're adjusting the compatible string on, we have to merge in the bcm2835-dt-next branch. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/dt-bindings/pinctrl/bcm2835.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/dt-bindings/pinctrl/bcm2835.h b/include/dt-bindings/pinctrl/bcm2835.h
index 6f0bc37af39c..e4e4fdf5d38f 100644
--- a/include/dt-bindings/pinctrl/bcm2835.h
+++ b/include/dt-bindings/pinctrl/bcm2835.h
@@ -24,4 +24,9 @@
#define BCM2835_FSEL_ALT2 6
#define BCM2835_FSEL_ALT3 7
+/* brcm,pull property */
+#define BCM2835_PUD_OFF 0
+#define BCM2835_PUD_DOWN 1
+#define BCM2835_PUD_UP 2
+
#endif /* __DT_BINDINGS_PINCTRL_BCM2835_H__ */