2 files changed, 16 insertions, 1 deletions

diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 3fe9a58fe6c7..265f75fc6a25 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1442,7 +1442,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
         struct wm831x_pdata *pdata = wm831x->dev->platform_data;
         int rev;
         enum wm831x_parent parent;
-        int ret;
+        int ret, i;
 
         mutex_init(&wm831x->io_lock);
         mutex_init(&wm831x->key_lock);
@@ -1581,6 +1581,17 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
                 }
         }
 
+        if (pdata) {
+                for (i = 0; i < ARRAY_SIZE(pdata->gpio_defaults); i++) {
+                        if (!pdata->gpio_defaults[i])
+                                continue;
+
+                        wm831x_reg_write(wm831x,
+                                         WM831X_GPIO1_CONTROL + i,
+                                         pdata->gpio_defaults[i] & 0xffff);
+                }
+        }
+
         ret = wm831x_irq_init(wm831x, irq);
         if (ret != 0)
                 goto err;
diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
index 632d1567a1b6..ff42d700293f 100644
--- a/include/linux/mfd/wm831x/pdata.h
+++ b/include/linux/mfd/wm831x/pdata.h
@@ -105,6 +105,9 @@ struct wm831x_watchdog_pdata {
 #define WM831X_MAX_LDO    11
 #define WM831X_MAX_ISINK  2
 
+#define WM831X_GPIO_CONFIGURE 0x10000
+#define WM831X_GPIO_NUM 16
+
 struct wm831x_pdata {
         /** Used to distinguish multiple WM831x chips */
         int wm831x_num;
@@ -119,6 +122,7 @@ struct wm831x_pdata {
 
         int irq_base;
         int gpio_base;
+        int gpio_defaults[WM831X_GPIO_NUM];
         struct wm831x_backlight_pdata *backlight;
         struct wm831x_backup_pdata *backup;
         struct wm831x_battery_pdata *battery;