diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-09-03 07:02:56 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-09-04 04:05:07 -0400 |
| commit | 03e9f0cac5da6af85758276cb4624caf5911f2b9 (patch) | |
| tree | ce79c1a080347a615b82f2805296f3e3091c01c1 /Documentation/pinctrl.txt | |
| parent | 327455817a92522e669d2d11367e42af5956a8ed (diff) | |
pinctrl: clean up after enable refactoring
commit 2243a87d90b42eb38bc281957df3e57c712b5e56
"pinctrl: avoid duplicated calling enable_pinmux_setting for a pin"
removed the .disable callback from the struct pinmux_ops,
making the .enable() callback the only remaining callback.
However .enable() is a bad name as it seems to imply that a
muxing can also be disabled. Rename the callback to .set_mux()
and also take this opportunity to clean out any remaining
mentions of .disable() from the documentation.
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Acked-by: Fan Wu <fwu@marvell.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'Documentation/pinctrl.txt')
| -rw-r--r-- | Documentation/pinctrl.txt | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt index 23f1590f49fe..b8f2147b96dd 100644 --- a/Documentation/pinctrl.txt +++ b/Documentation/pinctrl.txt | |||
| @@ -702,7 +702,7 @@ static int foo_get_groups(struct pinctrl_dev *pctldev, unsigned selector, | |||
| 702 | return 0; | 702 | return 0; |
| 703 | } | 703 | } |
| 704 | 704 | ||
| 705 | int foo_enable(struct pinctrl_dev *pctldev, unsigned selector, | 705 | int foo_set_mux(struct pinctrl_dev *pctldev, unsigned selector, |
| 706 | unsigned group) | 706 | unsigned group) |
| 707 | { | 707 | { |
| 708 | u8 regbit = (1 << selector + group); | 708 | u8 regbit = (1 << selector + group); |
| @@ -711,21 +711,11 @@ int foo_enable(struct pinctrl_dev *pctldev, unsigned selector, | |||
| 711 | return 0; | 711 | return 0; |
| 712 | } | 712 | } |
| 713 | 713 | ||
| 714 | void foo_disable(struct pinctrl_dev *pctldev, unsigned selector, | ||
| 715 | unsigned group) | ||
| 716 | { | ||
| 717 | u8 regbit = (1 << selector + group); | ||
| 718 | |||
| 719 | writeb((readb(MUX) & ~(regbit)), MUX) | ||
| 720 | return 0; | ||
| 721 | } | ||
| 722 | |||
| 723 | struct pinmux_ops foo_pmxops = { | 714 | struct pinmux_ops foo_pmxops = { |
| 724 | .get_functions_count = foo_get_functions_count, | 715 | .get_functions_count = foo_get_functions_count, |
| 725 | .get_function_name = foo_get_fname, | 716 | .get_function_name = foo_get_fname, |
| 726 | .get_function_groups = foo_get_groups, | 717 | .get_function_groups = foo_get_groups, |
| 727 | .enable = foo_enable, | 718 | .set_mux = foo_set_mux, |
| 728 | .disable = foo_disable, | ||
| 729 | }; | 719 | }; |
| 730 | 720 | ||
| 731 | /* Pinmux operations are handled by some pin controller */ | 721 | /* Pinmux operations are handled by some pin controller */ |