diff options
Diffstat (limited to 'include/linux/pinctrl/pinmux.h')
-rw-r--r-- | include/linux/pinctrl/pinmux.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/pinctrl/pinmux.h b/include/linux/pinctrl/pinmux.h index 3097aafbeb24..511bda9ed4bf 100644 --- a/include/linux/pinctrl/pinmux.h +++ b/include/linux/pinctrl/pinmux.h | |||
@@ -39,13 +39,12 @@ struct pinctrl_dev; | |||
39 | * name can be used with the generic @pinctrl_ops to retrieve the | 39 | * name can be used with the generic @pinctrl_ops to retrieve the |
40 | * actual pins affected. The applicable groups will be returned in | 40 | * actual pins affected. The applicable groups will be returned in |
41 | * @groups and the number of groups in @num_groups | 41 | * @groups and the number of groups in @num_groups |
42 | * @enable: enable a certain muxing function with a certain pin group. The | 42 | * @set_mux: enable a certain muxing function with a certain pin group. The |
43 | * driver does not need to figure out whether enabling this function | 43 | * driver does not need to figure out whether enabling this function |
44 | * conflicts some other use of the pins in that group, such collisions | 44 | * conflicts some other use of the pins in that group, such collisions |
45 | * are handled by the pinmux subsystem. The @func_selector selects a | 45 | * are handled by the pinmux subsystem. The @func_selector selects a |
46 | * certain function whereas @group_selector selects a certain set of pins | 46 | * certain function whereas @group_selector selects a certain set of pins |
47 | * to be used. On simple controllers the latter argument may be ignored | 47 | * to be used. On simple controllers the latter argument may be ignored |
48 | * @disable: disable a certain muxing selector with a certain pin group | ||
49 | * @gpio_request_enable: requests and enables GPIO on a certain pin. | 48 | * @gpio_request_enable: requests and enables GPIO on a certain pin. |
50 | * Implement this only if you can mux every pin individually as GPIO. The | 49 | * Implement this only if you can mux every pin individually as GPIO. The |
51 | * affected GPIO range is passed along with an offset(pin number) into that | 50 | * affected GPIO range is passed along with an offset(pin number) into that |
@@ -68,8 +67,8 @@ struct pinmux_ops { | |||
68 | unsigned selector, | 67 | unsigned selector, |
69 | const char * const **groups, | 68 | const char * const **groups, |
70 | unsigned * const num_groups); | 69 | unsigned * const num_groups); |
71 | int (*enable) (struct pinctrl_dev *pctldev, unsigned func_selector, | 70 | int (*set_mux) (struct pinctrl_dev *pctldev, unsigned func_selector, |
72 | unsigned group_selector); | 71 | unsigned group_selector); |
73 | int (*gpio_request_enable) (struct pinctrl_dev *pctldev, | 72 | int (*gpio_request_enable) (struct pinctrl_dev *pctldev, |
74 | struct pinctrl_gpio_range *range, | 73 | struct pinctrl_gpio_range *range, |
75 | unsigned offset); | 74 | unsigned offset); |