diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2016-11-21 21:03:18 -0800 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2016-11-21 21:03:18 -0800 |
| commit | 509f8342993be7ce2938edacec05b6e8d780c83e (patch) | |
| tree | 1cfdb1f9537f3e9d01b700a426827ea8f05807e8 /drivers/pinctrl | |
| parent | 1480986d68ce32706ff08586e111dcb769dd3962 (diff) | |
| parent | 3a1689ea752436917c5ce4487527ed6c444630ee (diff) | |
| download | linux-509f8342993be7ce2938edacec05b6e8d780c83e.tar.gz linux-509f8342993be7ce2938edacec05b6e8d780c83e.tar.bz2 linux-509f8342993be7ce2938edacec05b6e8d780c83e.zip | |
Merge tag 'bcm2835-dt-next-2016-11-18' into devicetree/next
This pull request brings in DT changes for BCM2835: pinctrl setup
cleanups, GPIO line naming, and the node for the new thermal driver.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index fa77165fab2c..4cf612bcfdfa 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) |