summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-23 16:47:52 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-14 09:52:11 +0200
commit1de74cfd69077c06507f444d7192aefc17784ab5 (patch)
tree0093a88cac782bf8ae41736849c71141d1757f5a /drivers/mfd
parentmfd: arizona: Suppress needless calls to the primary IRQ (diff)
downloadlinux-1de74cfd69077c06507f444d7192aefc17784ab5.tar.xz
linux-1de74cfd69077c06507f444d7192aefc17784ab5.zip
mfd: wm8994: Implement support for WM1811 devices with higher cust_ids
Higher cust_ids have had the device revision field reset so need different handling of GPIO6. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/wm8994-regmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/wm8994-regmap.c b/drivers/mfd/wm8994-regmap.c
index 52e9e2944940..2fbce9c5950b 100644
--- a/drivers/mfd/wm8994-regmap.c
+++ b/drivers/mfd/wm8994-regmap.c
@@ -1136,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;