1 From 396a3529800af0817c6af2eb65c542588a1f7fb7 Mon Sep 17 00:00:00 2001
2 From: Gerd Hoffmann <kraxel@redhat.com>
3 Date: Mon, 19 Sep 2016 10:43:17 +0200
4 Subject: [PATCH] pinctrl: bcm2835: add pull defines to dt bindings
6 Also delete (unused) private enum from driver.
7 The pull defines can be used instead if needed.
9 Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
10 Signed-off-by: Eric Anholt <eric@anholt.net>
11 Acked-by: Linus Walleij <linus.walleij@linaro.org>
12 Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
14 drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 ------
15 include/dt-bindings/pinctrl/bcm2835.h | 5 +++++
16 2 files changed, 5 insertions(+), 6 deletions(-)
18 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
19 +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
20 @@ -76,12 +76,6 @@ enum bcm2835_pinconf_param {
21 BCM2835_PINCONF_PARAM_PULL,
24 -enum bcm2835_pinconf_pull {
25 - BCM2835_PINCONFIG_PULL_NONE,
26 - BCM2835_PINCONFIG_PULL_DOWN,
27 - BCM2835_PINCONFIG_PULL_UP,
30 #define BCM2835_PINCONF_PACK(_param_, _arg_) ((_param_) << 16 | (_arg_))
31 #define BCM2835_PINCONF_UNPACK_PARAM(_conf_) ((_conf_) >> 16)
32 #define BCM2835_PINCONF_UNPACK_ARG(_conf_) ((_conf_) & 0xffff)
33 --- a/include/dt-bindings/pinctrl/bcm2835.h
34 +++ b/include/dt-bindings/pinctrl/bcm2835.h
36 #define BCM2835_FSEL_ALT2 6
37 #define BCM2835_FSEL_ALT3 7
39 +/* brcm,pull property */
40 +#define BCM2835_PUD_OFF 0
41 +#define BCM2835_PUD_DOWN 1
42 +#define BCM2835_PUD_UP 2
44 #endif /* __DT_BINDINGS_PINCTRL_BCM2835_H__ */