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>
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt
index fa9163a..5e314ce 100644
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
@@ -781,19 +781,19 @@
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 @@
...
{
+ .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 @@
...
{
+ .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 @@
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