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

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

parents 106c386a 939dc51b

sound/soc/codecs/wm2000.c

+3 −1
Original line number Diff line number Diff line
@@ -761,6 +761,8 @@ static bool wm2000_readable_reg(struct device *dev, unsigned int reg) 
	case WM2000_REG_SYS_CTL2:

	case WM2000_REG_ANC_STAT:

	case WM2000_REG_IF_CTL:

	case WM2000_REG_ANA_MIC_CTL:

	case WM2000_REG_SPK_CTL:

		return true;

	default:

		return false;
@@ -771,7 +773,7 @@ static const struct regmap_config wm2000_regmap = { 
	.reg_bits = 16,

	.val_bits = 8,



	.max_register = WM2000_REG_IF_CTL,

	.max_register = WM2000_REG_SPK_CTL,

	.readable_reg = wm2000_readable_reg,

};

sound/soc/codecs/wm2000.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#define WM2000_REG_SYS_CTL2         0xf004

#define WM2000_REG_ANC_STAT         0xf005

#define WM2000_REG_IF_CTL           0xf006

#define WM2000_REG_ANA_MIC_CTL      0xf028

#define WM2000_REG_SPK_CTL          0xf034



/* SPEECH_CLARITY */

#define WM2000_SPEECH_CLARITY   0x01

CRA Git | Maintained and supported by SUSTech CRA and CCSE