pinctrl: msm: Make number of functions variable

The various pins may have different number of functions defined, so make this
number definable per pin instead of just increasing it to the largest one for
all of the platforms.

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/pinctrl/pinctrl-msm8x74.c b/drivers/pinctrl/pinctrl-msm8x74.c
index dde5529807aa..57766d56e257 100644
--- a/drivers/pinctrl/pinctrl-msm8x74.c
+++ b/drivers/pinctrl/pinctrl-msm8x74.c
@@ -341,7 +341,7 @@ static const unsigned int sdc2_data_pins[] = { 151 };
                 .name = "gpio" #id,                     \
                 .pins = gpio##id##_pins,                \
                 .npins = ARRAY_SIZE(gpio##id##_pins),   \
-                .funcs = {                              \
+                .funcs = (int[]){                       \
                         MSM_MUX_NA, /* gpio mode */     \
                         MSM_MUX_##f1,                   \
                         MSM_MUX_##f2,                   \
@@ -351,6 +351,7 @@ static const unsigned int sdc2_data_pins[] = { 151 };
                         MSM_MUX_##f6,                   \
                         MSM_MUX_##f7                    \
                 },                                      \
+                .nfuncs = 8,                            \
                 .ctl_reg = 0x1000 + 0x10 * id,          \
                 .io_reg = 0x1004 + 0x10 * id,           \
                 .intr_cfg_reg = 0x1008 + 0x10 * id,     \