diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 14:32:21 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 14:32:21 +1100 |
commit | 2edf2b0ec804fb66250e5998a75c8e43df329ac8 (patch) | |
tree | 251be7fdd8c16aa13bbed428a5b81ded3da194be /include | |
parent | d5f1dc97dbf3a671ca8d19a4a2ade2bc4f4616ac (diff) | |
parent | 2039834c86f3b1e1eb6b1484d9f3b29857bf6adf (diff) |
Merge remote-tracking branch 'pinctrl/for-next'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pinctrl/pinctrl.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h index a42e57da270d..8ce2d87a238b 100644 --- a/include/linux/pinctrl/pinctrl.h +++ b/include/linux/pinctrl/pinctrl.h @@ -141,12 +141,27 @@ struct pinctrl_desc { }; /* External interface to pin controller */ + +extern int pinctrl_register_and_init(struct pinctrl_desc *pctldesc, + struct device *dev, void *driver_data, + struct pinctrl_dev **pctldev); + +/* Please use pinctrl_register_and_init() instead */ extern struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, struct device *dev, void *driver_data); + extern void pinctrl_unregister(struct pinctrl_dev *pctldev); + +extern int devm_pinctrl_register_and_init(struct device *dev, + struct pinctrl_desc *pctldesc, + void *driver_data, + struct pinctrl_dev **pctldev); + +/* Please use devm_pinctrl_register_and_init() instead */ extern struct pinctrl_dev *devm_pinctrl_register(struct device *dev, struct pinctrl_desc *pctldesc, void *driver_data); + extern void devm_pinctrl_unregister(struct device *dev, struct pinctrl_dev *pctldev); |