Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penber...

[karo-tx-linux.git] / drivers / mfd / wm8994-regmap.c

diff --git a/drivers/mfd/wm8994-regmap.c b/drivers/mfd/wm8994-regmap.c
index bfd25af6ecb106e75eddb4cdc0afad561238506f..2fbce9c5950b5fb9657c3589f77e3b5fe5cf5726 100644 (file)
--- a/drivers/mfd/wm8994-regmap.c
+++ b/drivers/mfd/wm8994-regmap.c
@@ -1122,7 +1122,6 @@ static bool wm8994_volatile_register(struct device *dev, unsigned int reg)
        case WM8994_RATE_STATUS:
        case WM8958_MIC_DETECT_3:
        case WM8994_DC_SERVO_4E:
-       case WM8994_CHIP_REVISION:
        case WM8994_INTERRUPT_STATUS_1:
        case WM8994_INTERRUPT_STATUS_2:
                return true;
@@ -1137,7 +1136,7 @@ static bool wm1811_volatile_register(struct device *dev, unsigned int reg)
 
        switch (reg) {
        case WM8994_GPIO_6:
-               if (wm8994->revision > 1)
+               if (wm8994->cust_id > 1 || wm8994->revision > 1)
                        return true;
                else
                        return false;