4 files changed, 39 insertions, 5 deletions

diff --git a/drivers/gpio/wm831x-gpio.c b/drivers/gpio/wm831x-gpio.c
index 2554180534a1..5b8dc098d80f 100644
--- a/drivers/gpio/wm831x-gpio.c
+++ b/drivers/gpio/wm831x-gpio.c
@@ -38,10 +38,13 @@ static int wm831x_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
 {
         struct wm831x_gpio *wm831x_gpio = to_wm831x_gpio(chip);
         struct wm831x *wm831x = wm831x_gpio->wm831x;
+        int val = WM831X_GPN_DIR;
+
+        if (wm831x->has_gpio_ena)
+                val |= WM831X_GPN_TRI;
 
         return wm831x_set_bits(wm831x, WM831X_GPIO1_CONTROL + offset,
-                               WM831X_GPN_DIR | WM831X_GPN_TRI,
-                               WM831X_GPN_DIR);
+                               WM831X_GPN_DIR | WM831X_GPN_TRI, val);
 }
 
 static int wm831x_gpio_get(struct gpio_chip *chip, unsigned offset)
@@ -74,10 +77,14 @@ static int wm831x_gpio_direction_out(struct gpio_chip *chip,
 {
         struct wm831x_gpio *wm831x_gpio = to_wm831x_gpio(chip);
         struct wm831x *wm831x = wm831x_gpio->wm831x;
+        int val = 0;
         int ret;
 
+        if (wm831x->has_gpio_ena)
+                val |= WM831X_GPN_TRI;
+
         ret = wm831x_set_bits(wm831x, WM831X_GPIO1_CONTROL + offset,
-                              WM831X_GPN_DIR | WM831X_GPN_TRI, 0);
+                              WM831X_GPN_DIR | WM831X_GPN_TRI, val);
         if (ret < 0)
                 return ret;
 
@@ -103,7 +110,7 @@ static void wm831x_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
 {
         struct wm831x_gpio *wm831x_gpio = to_wm831x_gpio(chip);
         struct wm831x *wm831x = wm831x_gpio->wm831x;
-        int i;
+        int i, tristated;
 
         for (i = 0; i < chip->ngpio; i++) {
                 int gpio = i + chip->base;
@@ -170,6 +177,10 @@ static void wm831x_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
                         break;
                 }
 
+                tristated = reg & WM831X_GPN_TRI;
+                if (wm831x->has_gpio_ena)
+                        tristated = !tristated;
+
                 seq_printf(s, " %s %s %s %s%s\n"
                            "                                  %s%s (0x%4x)\n",
                            reg & WM831X_GPN_DIR ? "in" : "out",
@@ -178,7 +189,7 @@ static void wm831x_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
                            powerdomain,
                            reg & WM831X_GPN_POL ? "" : " inverted",
                            reg & WM831X_GPN_OD ? "open-drain" : "CMOS",
-                           reg & WM831X_GPN_TRI ? " tristated" : "",
+                           tristated ? " tristated" : "",
                            reg);
         }
 }
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 4b2021af1d96..c428d9f918fc 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1449,18 +1449,33 @@ static int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
         case WM8310:
                 parent = WM8310;
                 wm831x->num_gpio = 16;
+                if (rev > 0) {
+                        wm831x->has_gpio_ena = 1;
+                        wm831x->has_cs_sts = 1;
+                }
+
                 dev_info(wm831x->dev, "WM8310 revision %c\n", 'A' + rev);
                 break;
 
         case WM8311:
                 parent = WM8311;
                 wm831x->num_gpio = 16;
+                if (rev > 0) {
+                        wm831x->has_gpio_ena = 1;
+                        wm831x->has_cs_sts = 1;
+                }
+
                 dev_info(wm831x->dev, "WM8311 revision %c\n", 'A' + rev);
                 break;
 
         case WM8312:
                 parent = WM8312;
                 wm831x->num_gpio = 16;
+                if (rev > 0) {
+                        wm831x->has_gpio_ena = 1;
+                        wm831x->has_cs_sts = 1;
+                }
+
                 dev_info(wm831x->dev, "WM8312 revision %c\n", 'A' + rev);
                 break;
 
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h
index 5184b79c700b..53580b592bc9 100644
--- a/include/linux/mfd/wm831x/core.h
+++ b/include/linux/mfd/wm831x/core.h
@@ -254,6 +254,10 @@ struct wm831x {
         int irq_masks_cur[WM831X_NUM_IRQ_REGS];   /* Currently active value */
         int irq_masks_cache[WM831X_NUM_IRQ_REGS]; /* Cached hardware value */
 
+        /* Chip revision based flags */
+        unsigned has_gpio_ena:1;  /* Has GPIO enable bit */
+        unsigned has_cs_sts:1;    /* Has current sink status bit */
+
         int num_gpio;
 
         struct mutex auxadc_lock;
diff --git a/include/linux/mfd/wm831x/gpio.h b/include/linux/mfd/wm831x/gpio.h
index 2835614af0e3..9b163c58865f 100644
--- a/include/linux/mfd/wm831x/gpio.h
+++ b/include/linux/mfd/wm831x/gpio.h
@@ -41,6 +41,10 @@
 #define WM831X_GPN_OD_MASK                      0x0200  /* GPN_OD */
 #define WM831X_GPN_OD_SHIFT                          9  /* GPN_OD */
 #define WM831X_GPN_OD_WIDTH                          1  /* GPN_OD */
+#define WM831X_GPN_ENA                          0x0080  /* GPN_ENA */
+#define WM831X_GPN_ENA_MASK                     0x0080  /* GPN_ENA */
+#define WM831X_GPN_ENA_SHIFT                         7  /* GPN_ENA */
+#define WM831X_GPN_ENA_WIDTH                         1  /* GPN_ENA */
 #define WM831X_GPN_TRI                          0x0080  /* GPN_TRI */
 #define WM831X_GPN_TRI_MASK                     0x0080  /* GPN_TRI */
 #define WM831X_GPN_TRI_SHIFT                         7  /* GPN_TRI */