Commit 4277c2a2 authored by Mark Brown's avatar Mark Brown

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

parents 106c386a 939dc51b
...@@ -761,6 +761,8 @@ static bool wm2000_readable_reg(struct device *dev, unsigned int reg) ...@@ -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 = { ...@@ -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,
}; };
......
...@@ -30,6 +30,8 @@ ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment