* [PATCH v4 1/7] pinctrl: bcm2835: add pull defines to dt bindings [not found] <1474274603-24215-1-git-send-email-kraxel@redhat.com> @ 2016-09-19 8:43 ` Gerd Hoffmann 2016-09-19 10:07 ` Eric Anholt 0 siblings, 1 reply; 3+ messages in thread From: Gerd Hoffmann @ 2016-09-19 8:43 UTC (permalink / raw) To: linux-rpi-kernel, devicetree, linux-arm-kernel Cc: eric, swarren, bcm-kernel-feedback-list, Gerd Hoffmann, Linus Walleij, Lee Jones, Florian Fainelli, Ray Jui, Scott Branden, Rob Herring, Mark Rutland, open list:PIN CONTROL SUBSYSTEM, open list Also delete (unused) private enum from driver. The pull defines can be used instead if needed. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 ------ include/dt-bindings/pinctrl/bcm2835.h | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index fa77165..4cf612b 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -76,12 +76,6 @@ enum bcm2835_pinconf_param { BCM2835_PINCONF_PARAM_PULL, }; -enum bcm2835_pinconf_pull { - BCM2835_PINCONFIG_PULL_NONE, - BCM2835_PINCONFIG_PULL_DOWN, - BCM2835_PINCONFIG_PULL_UP, -}; - #define BCM2835_PINCONF_PACK(_param_, _arg_) ((_param_) << 16 | (_arg_)) #define BCM2835_PINCONF_UNPACK_PARAM(_conf_) ((_conf_) >> 16) #define BCM2835_PINCONF_UNPACK_ARG(_conf_) ((_conf_) & 0xffff) diff --git a/include/dt-bindings/pinctrl/bcm2835.h b/include/dt-bindings/pinctrl/bcm2835.h index 6f0bc37..e4e4fdf 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__ */ -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v4 1/7] pinctrl: bcm2835: add pull defines to dt bindings 2016-09-19 8:43 ` [PATCH v4 1/7] pinctrl: bcm2835: add pull defines to dt bindings Gerd Hoffmann @ 2016-09-19 10:07 ` Eric Anholt 2016-09-23 8:53 ` Linus Walleij 0 siblings, 1 reply; 3+ messages in thread From: Eric Anholt @ 2016-09-19 10:07 UTC (permalink / raw) To: linux-rpi-kernel, devicetree, linux-arm-kernel Cc: swarren, bcm-kernel-feedback-list, Gerd Hoffmann, Linus Walleij, Lee Jones, Florian Fainelli, Ray Jui, Scott Branden, Rob Herring, Mark Rutland, open list:PIN CONTROL SUBSYSTEM, open list [-- Attachment #1: Type: text/plain, Size: 333 bytes --] Gerd Hoffmann <kraxel@redhat.com> writes: > Also delete (unused) private enum from driver. > The pull defines can be used instead if needed. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Acked-by: Eric Anholt <eric@anholt.net> gpio maintainers, could I pull this through my dt tree? Or does this need to be split in two? [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 800 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v4 1/7] pinctrl: bcm2835: add pull defines to dt bindings 2016-09-19 10:07 ` Eric Anholt @ 2016-09-23 8:53 ` Linus Walleij 0 siblings, 0 replies; 3+ messages in thread From: Linus Walleij @ 2016-09-23 8:53 UTC (permalink / raw) To: Eric Anholt Cc: Gerd Hoffmann, linux-rpi-kernel, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stephen Warren, bcm-kernel-feedback-list, Lee Jones, Florian Fainelli, Ray Jui, Scott Branden, Rob Herring, Mark Rutland, open list:PIN CONTROL SUBSYSTEM, open list On Mon, Sep 19, 2016 at 12:07 PM, Eric Anholt <eric@anholt.net> wrote: > Gerd Hoffmann <kraxel@redhat.com> writes: > >> Also delete (unused) private enum from driver. >> The pull defines can be used instead if needed. >> >> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > Acked-by: Eric Anholt <eric@anholt.net> > > gpio maintainers, could I pull this through my dt tree? Or does this > need to be split in two? You can take it. The bcm2835 driver is not seeing any conflicting changes in this merge window. Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-23 8:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1474274603-24215-1-git-send-email-kraxel@redhat.com>
2016-09-19 8:43 ` [PATCH v4 1/7] pinctrl: bcm2835: add pull defines to dt bindings Gerd Hoffmann
2016-09-19 10:07 ` Eric Anholt
2016-09-23 8:53 ` Linus Walleij
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).