1 files changed, 14 insertions, 1 deletions

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index b9e2cbd2ea7b..401fc96f577e 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -1364,9 +1364,10 @@ static int __devinit at91_gpio_probe(struct platform_device *pdev)
         struct gpio_chip *chip;
         struct pinctrl_gpio_range *range;
         int ret = 0;
-        int irq;
+        int irq, i;
         int alias_idx = of_alias_get_id(np, "gpio");
         uint32_t ngpio;
+        char **names;
 
         BUG_ON(alias_idx >= ARRAY_SIZE(gpio_chips));
         if (gpio_chips[alias_idx]) {
@@ -1436,6 +1437,18 @@ static int __devinit at91_gpio_probe(struct platform_device *pdev)
                         chip->ngpio = ngpio;
         }
 
+        names = devm_kzalloc(&pdev->dev, sizeof(char*) * chip->ngpio, GFP_KERNEL);
+
+        if (!names) {
+                ret = -ENOMEM;
+                goto clk_err;
+        }
+
+        for (i = 0; i < chip->ngpio; i++)
+                names[i] = kasprintf(GFP_KERNEL, "pio%c%d", alias_idx + 'A', i);
+
+        chip->names = (const char*const*)names;
+
         range = &at91_chip->range;
         range->name = chip->label;
         range->id = alias_idx;