Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / wm831x-gpio.c

diff --git a/drivers/gpio/wm831x-gpio.c b/drivers/gpio/wm831x-gpio.c
index c92751694eb04b85ab767197e76e0ea7ef523370..0aadbb63c35946bb83905025b3943acaa2ee6277 100755 (executable)
--- a/drivers/gpio/wm831x-gpio.c
+++ b/drivers/gpio/wm831x-gpio.c
@@ -293,6 +293,17 @@ static int __devinit wm831x_gpio_probe(struct platform_device *pdev)
                goto err;
        }
 
+#ifdef CONFIG_PLAT_RK
+       if (pdata && pdata->pin_type_init) {
+               ret = pdata->pin_type_init(wm831x);
+               if (ret != 0) {
+                       dev_err(wm831x->dev, "pin_type_init() failed: %d\n", ret);
+                       WARN_ON(gpiochip_remove(&wm831x_gpio->gpio_chip));
+                       goto err;
+               }
+       }
+#endif
+
        platform_set_drvdata(pdev, wm831x_gpio);
 
        return ret;