summaryrefslogtreecommitdiff
path: root/Documentation/pinctrl.txt
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-02-23 17:04:39 -0700
committerLinus Walleij <linus.walleij@linaro.org>2012-02-29 19:10:55 +0100
commit806d314325812fb8ffe7059bd84a23d334350c21 (patch)
treece904d5ddab97e25b71b547f7b20844d507b9529 /Documentation/pinctrl.txt
parent1cf94c45ca31c0ad563e72b095782346cba26b6c (diff)
downloadlinux-3.10-806d314325812fb8ffe7059bd84a23d334350c21.tar.gz
linux-3.10-806d314325812fb8ffe7059bd84a23d334350c21.tar.bz2
linux-3.10-806d314325812fb8ffe7059bd84a23d334350c21.zip
pinctrl: re-order struct pinctrl_map
The lookup key in struct pinctrl_map is (.dev_name, .name). Re-order the struct definition to put the lookup key fields first, and the result values afterwards. To me at least, this slightly better reflects the lookup process. Update the documentation in a similar fashion. Note: PIN_MAP*() macros aren't updated; I plan to update this once later when enhancing the mapping table format to support pin config to reduce churn. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Dong Aisheng <dong.aisheng@linaro.org> [Rebased for cherry-picking] Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'Documentation/pinctrl.txt')
-rw-r--r--Documentation/pinctrl.txt24
1 files changed, 12 insertions, 12 deletions
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt
index fa9163af34f..5e314cecab7 100644
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
@@ -781,19 +781,19 @@ spi on the second function mapping:
static const struct pinctrl_map __initdata mapping[] = {
{
+ .dev_name = "foo-spi.0",
.ctrl_dev_name = "pinctrl-foo",
.function = "spi0",
- .dev_name = "foo-spi.0",
},
{
+ .dev_name = "foo-i2c.0",
.ctrl_dev_name = "pinctrl-foo",
.function = "i2c0",
- .dev_name = "foo-i2c.0",
},
{
+ .dev_name = "foo-mmc.0",
.ctrl_dev_name = "pinctrl-foo",
.function = "mmc0",
- .dev_name = "foo-mmc.0",
},
};
@@ -826,18 +826,18 @@ As it is possible to map a function to different groups of pins an optional
...
{
+ .dev_name = "foo-spi.0",
.name = "spi0-pos-A",
.ctrl_dev_name = "pinctrl-foo",
.function = "spi0",
.group = "spi0_0_grp",
- .dev_name = "foo-spi.0",
},
{
+ .dev_name = "foo-spi.0",
.name = "spi0-pos-B",
.ctrl_dev_name = "pinctrl-foo",
.function = "spi0",
.group = "spi0_1_grp",
- .dev_name = "foo-spi.0",
},
...
@@ -852,45 +852,45 @@ case), we define a mapping like this:
...
{
+ .dev_name = "foo-mmc.0",
.name = "2bit"
.ctrl_dev_name = "pinctrl-foo",
.function = "mmc0",
.group = "mmc0_1_grp",
- .dev_name = "foo-mmc.0",
},
{
+ .dev_name = "foo-mmc.0",
.name = "4bit"
.ctrl_dev_name = "pinctrl-foo",
.function = "mmc0",
.group = "mmc0_1_grp",
- .dev_name = "foo-mmc.0",
},
{
+ .dev_name = "foo-mmc.0",
.name = "4bit"
.ctrl_dev_name = "pinctrl-foo",
.function = "mmc0",
.group = "mmc0_2_grp",
- .dev_name = "foo-mmc.0",
},
{
+ .dev_name = "foo-mmc.0",
.name = "8bit"
.ctrl_dev_name = "pinctrl-foo",
.group = "mmc0_1_grp",
- .dev_name = "foo-mmc.0",
},
{
+ .dev_name = "foo-mmc.0",
.name = "8bit"
.ctrl_dev_name = "pinctrl-foo",
.function = "mmc0",
.group = "mmc0_2_grp",
- .dev_name = "foo-mmc.0",
},
{
+ .dev_name = "foo-mmc.0",
.name = "8bit"
.ctrl_dev_name = "pinctrl-foo",
.function = "mmc0",
.group = "mmc0_3_grp",
- .dev_name = "foo-mmc.0",
},
...
@@ -988,10 +988,10 @@ This is enabled by simply setting the .dev_name field in the map to the name
of the pin controller itself, like this:
{
+ .dev_name = "pinctrl-foo",
.name = "POWERMAP"
.ctrl_dev_name = "pinctrl-foo",
.function = "power_func",
- .dev_name = "pinctrl-foo",
},
Since it may be common to request the core to hog a few always-applicable