summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorTomas Novotny <tomas@novotny.cz>2014-03-10 19:12:50 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-06 07:59:26 -0700
commit53135e61923afaaa461bbca2b365767c39368ab2 (patch)
tree30b95dc02f5b8e992cd103b7e2b8a34e7908e552 /drivers/mfd
parent00834e4d81ffd1e58206d24ed096f8210958096f (diff)
mfd: twl-core: Fix accessibility of some twl4030 audio registers
commit 56816b700c8c773270f3aaf4c92be53e359a03fd upstream. 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). Signed-off-by: Tomas Novotny <tomas@novotny.cz> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mfd')
-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[] = {
static bool twl4030_49_nop_reg(struct device *dev, unsigned int reg)
{
switch (reg) {
- case 0:
- case 3:
- case 40:
- case 41:
- case 42:
+ case 0x00:
+ case 0x03:
+ case 0x40:
+ case 0x41:
+ case 0x42:
return false;
default:
return true;