aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Novotny <tomas@novotny.cz>2014-03-10 14:12:50 -0400
committerLee Jones <lee.jones@linaro.org>2014-03-19 04:58:43 -0400
commit56816b700c8c773270f3aaf4c92be53e359a03fd (patch)
tree135bbca24ba3eca8aa2432b7f1558d40cadefe16
parent2d5d366a08f428aa2b26fca4478c510c89bc41f2 (diff)
mfd: twl-core: Fix accessibility of some twl4030 audio registers
There are some unused registers in twl4030 at I2C address 0x49 and function twl4030_49_nop_reg() is used to check accessibility of that registers. These registers are written in decimal format but the values are correct in hexadecimal format. (It can be checked few lines above the patched code - these registers are marked as unused there.) As a consequence three registers of audio submodule are treated as inaccessible (preamplifier carkit right and both handsfree registers). Cc: stable@vger.kernel.org Signed-off-by: Tomas Novotny <tomas@novotny.cz> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/twl-core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index ed718328eff1..e87140bef667 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -282,11 +282,11 @@ static struct reg_default twl4030_49_defaults[] = {
282static bool twl4030_49_nop_reg(struct device *dev, unsigned int reg) 282static bool twl4030_49_nop_reg(struct device *dev, unsigned int reg)
283{ 283{
284 switch (reg) { 284 switch (reg) {
285 case 0: 285 case 0x00:
286 case 3: 286 case 0x03:
287 case 40: 287 case 0x40:
288 case 41: 288 case 0x41:
289 case 42: 289 case 0x42:
290 return false; 290 return false;
291 default: 291 default:
292 return true; 292 return true;