From f6a25fd1f3bcc92cc666dde16668c8b541e3a38d Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 11 Dec 2012 16:51:39 +0900 Subject: [PATCH] --- yaml --- r: 357571 b: refs/heads/master c: 025d982079502b1d6c7c428504eb64c5059a2e80 h: refs/heads/master i: 357569: 507082e454c0efac8c4a43d83c80a6d548815f1c 357567: ebe494fc0552037b721bdca22b7a7850296b2f56 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/wm5102-tables.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4a83c559eda7..7e6c000d09aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0101e53cbb1c653738de8dfddc80c0faa5a4fd39 +refs/heads/master: 025d982079502b1d6c7c428504eb64c5059a2e80 diff --git a/trunk/drivers/mfd/wm5102-tables.c b/trunk/drivers/mfd/wm5102-tables.c index 1133a64c2dc9..ee0a109f5ce9 100644 --- a/trunk/drivers/mfd/wm5102-tables.c +++ b/trunk/drivers/mfd/wm5102-tables.c @@ -1831,9 +1831,6 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg) static bool wm5102_volatile_register(struct device *dev, unsigned int reg) { - if (reg > 0xffff) - return true; - switch (reg) { case ARIZONA_SOFTWARE_RESET: case ARIZONA_DEVICE_REVISION: @@ -1878,7 +1875,13 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg) case ARIZONA_MIC_DETECT_3: return true; default: - return false; + if ((reg >= 0x100000 && reg < 0x106000) || + (reg >= 0x180000 && reg < 0x180800) || + (reg >= 0x190000 && reg < 0x194800) || + (reg >= 0x1a8000 && reg < 0x1a9800)) + return true; + else + return false; } }