summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2015-03-08 10:51:46 +0200
committerZefan Li <lizefan@huawei.com>2015-09-18 09:20:24 +0800
commit5cee91e968a1da2c06e3e8555c5ff47d80b87c8b (patch)
treec05f24e875a720109c06b34ffc9ade0748a0c8b2
parented53cbd0af77a73171d92cda1d379b02332e355e (diff)
downloadlwn-5cee91e968a1da2c06e3e8555c5ff47d80b87c8b.tar.gz
lwn-5cee91e968a1da2c06e3e8555c5ff47d80b87c8b.zip
pinctrl: remove doc mention of the enable/disable API
commit b18104c00089c73f2b70790765d40424a4f9b65f upstream. This API has changed in commit 6e5e959dde0 (pinctrl: API changes to support multiple states per device). Fixes: 6e5e959dde0 ('pinctrl: API changes to support multiple states per device') Cc: Stephen Warren <swarren@nvidia.com> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Zefan Li <lizefan@huawei.com>
-rw-r--r--Documentation/pinctrl.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt
index 89432d5ae9f1..f8c29eddfb9e 100644
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
@@ -1042,7 +1042,7 @@ The semantics of the pinctrl APIs are:
Usually the pin control core handled the get/put pair and call out to the
device drivers bookkeeping operations, like checking available functions and
-the associated pins, whereas the enable/disable pass on to the pin controller
+the associated pins, whereas select_state pass on to the pin controller
driver which takes care of activating and/or deactivating the mux setting by
quickly poking some registers.
@@ -1088,8 +1088,9 @@ function, but with different named in the mapping as described under
"Advanced mapping" above. So that for an SPI device, we have two states named
"pos-A" and "pos-B".
-This snippet first muxes the function in the pins defined by group A, enables
-it, disables and releases it, and muxes it in on the pins defined by group B:
+This snippet first initializes a state object for both groups (in foo_probe()),
+then muxes the function in the pins defined by group A, and finally muxes it in
+on the pins defined by group B:
#include <linux/pinctrl/consumer.h>