hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-next

This commit is contained in:
Mark Brown 2013-04-12 13:57:27 +01:00
parent 106c386ad5 939dc51bdd
commit 4277c2a2a7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/codecs/wm2000.c
View File

@ -761,6 +761,8 @@ static bool wm2000_readable_reg(struct device *dev, unsigned int reg)
case WM2000_REG_SYS_CTL2: case WM2000_REG_SYS_CTL2:
case WM2000_REG_ANC_STAT: case WM2000_REG_ANC_STAT:
case WM2000_REG_IF_CTL: case WM2000_REG_IF_CTL:
case WM2000_REG_ANA_MIC_CTL:
case WM2000_REG_SPK_CTL:
return true; return true;
default: default:
return false; return false;
@ -771,7 +773,7 @@ static const struct regmap_config wm2000_regmap = {
.reg_bits = 16, .reg_bits = 16,
.val_bits = 8, .val_bits = 8,
.max_register = WM2000_REG_IF_CTL, .max_register = WM2000_REG_SPK_CTL,
.readable_reg = wm2000_readable_reg, .readable_reg = wm2000_readable_reg,
}; };

2
sound/soc/codecs/wm2000.h
View File

@ -30,6 +30,8 @@
#define WM2000_REG_SYS_CTL2 0xf004 #define WM2000_REG_SYS_CTL2 0xf004
#define WM2000_REG_ANC_STAT 0xf005 #define WM2000_REG_ANC_STAT 0xf005
#define WM2000_REG_IF_CTL 0xf006 #define WM2000_REG_IF_CTL 0xf006
#define WM2000_REG_ANA_MIC_CTL 0xf028
#define WM2000_REG_SPK_CTL 0xf034
/* SPEECH_CLARITY */ /* SPEECH_CLARITY */
#define WM2000_SPEECH_CLARITY 0x01 #define WM2000_SPEECH_CLARITY 0x01